From 46fb49ecd0730ff946a4fe6b9abeaa58016334cb Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 4 Mar 2023 14:14:43 +0800 Subject: [PATCH 001/131] [python-nextgen] Add pyproject.toml (#14861) * add pyproject.toml in python-nextgen client generator * minor fix --- .../languages/PythonNextgenClientCodegen.java | 1 + .../resources/python-nextgen/README.mustache | 4 +++ .../python-nextgen/pyproject.mustache | 36 +++++++++++++++++++ .../python-nextgen/.openapi-generator/FILES | 1 + .../client/echo_api/python-nextgen/README.md | 4 +++ .../echo_api/python-nextgen/pyproject.toml | 26 ++++++++++++++ .../.openapi-generator/FILES | 1 + .../petstore/python-nextgen-aiohttp/README.md | 4 +++ .../python-nextgen-aiohttp/pyproject.toml | 29 +++++++++++++++ .../python-nextgen/.openapi-generator/FILES | 1 + .../client/petstore/python-nextgen/README.md | 4 +++ .../petstore/python-nextgen/pyproject.toml | 28 +++++++++++++++ 12 files changed, 139 insertions(+) create mode 100644 modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache create mode 100644 samples/client/echo_api/python-nextgen/pyproject.toml create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml create mode 100644 samples/openapi3/client/petstore/python-nextgen/pyproject.toml diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java index 5f29c5c909a..b2bb11e4f37 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java @@ -321,6 +321,7 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements supportingFiles.add(new SupportingFile("github-workflow.mustache", ".github/workflows", "python.yml")); supportingFiles.add(new SupportingFile("gitlab-ci.mustache", "", ".gitlab-ci.yml")); supportingFiles.add(new SupportingFile("setup.mustache", "", "setup.py")); + supportingFiles.add(new SupportingFile("pyproject.mustache", "", "pyproject.toml")); } supportingFiles.add(new SupportingFile("configuration.mustache", packagePath(), "configuration.py")); supportingFiles.add(new SupportingFile("__init__package.mustache", packagePath(), "__init__.py")); diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/README.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/README.mustache index ae4af162a14..201df14f1b4 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/README.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/README.mustache @@ -48,6 +48,10 @@ Then import the package: import {{{packageName}}} ``` +### Tests + +Execute `pytest` to run the tests. + ## Getting Started Please follow the [installation procedure](#installation--usage) and then run the following: diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache new file mode 100644 index 00000000000..192ca581341 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache @@ -0,0 +1,36 @@ +[tool.poetry] +name = "{{{packageName}}}" +version = "{{{packageVersion}}}" +description = "{{{appName}}}" +authors = ["{{infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}"] +license = "{{{licenseInfo}}}{{^licenseInfo}}NoLicense{{/licenseInfo}}" +readme = "README.md" +repository = "https://github.com/{{{gitRepoId}}}/{{{gitUserId}}}" +keywords = ["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"] + +[tool.poetry.dependencies] +python = "^3.7" + +urllib3 = ">= 1.25.3" +python-dateutil = ">=2.8.2" +{{#asyncio}} +aiohttp = ">= 3.8.4" +{{/asyncio}} +{{#tornado}} +tornado = ">=4.2,<5" +{{/tornado}} +{{#hasHttpSignatureMethods}} +pem = ">= 19.3.0" +pycryptodome = ">= 3.9.0" +{{/hasHttpSignatureMethods}} +pydantic = ">= 1.10.5" +aenum = ">=3.1.11" + +[tool.poetry.dev-dependencies] +pytest = ">=7.2.1" +tox = ">=4.4.6" +flake8 = ">=6.0.0" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" diff --git a/samples/client/echo_api/python-nextgen/.openapi-generator/FILES b/samples/client/echo_api/python-nextgen/.openapi-generator/FILES index 134546f8564..82a301a4b1f 100644 --- a/samples/client/echo_api/python-nextgen/.openapi-generator/FILES +++ b/samples/client/echo_api/python-nextgen/.openapi-generator/FILES @@ -43,6 +43,7 @@ openapi_client/models/tag.py openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py openapi_client/rest.py +pyproject.toml requirements.txt setup.cfg setup.py diff --git a/samples/client/echo_api/python-nextgen/README.md b/samples/client/echo_api/python-nextgen/README.md index b945386e85c..0161a1364cd 100644 --- a/samples/client/echo_api/python-nextgen/README.md +++ b/samples/client/echo_api/python-nextgen/README.md @@ -40,6 +40,10 @@ Then import the package: import openapi_client ``` +### Tests + +Execute `pytest` to run the tests. + ## Getting Started Please follow the [installation procedure](#installation--usage) and then run the following: diff --git a/samples/client/echo_api/python-nextgen/pyproject.toml b/samples/client/echo_api/python-nextgen/pyproject.toml new file mode 100644 index 00000000000..a1ad217c190 --- /dev/null +++ b/samples/client/echo_api/python-nextgen/pyproject.toml @@ -0,0 +1,26 @@ +[tool.poetry] +name = "openapi_client" +version = "1.0.0" +description = "Echo Server API" +authors = ["team@openapitools.org"] +license = "Apache 2.0" +readme = "README.md" +repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID" +keywords = ["OpenAPI", "OpenAPI-Generator", "Echo Server API"] + +[tool.poetry.dependencies] +python = "^3.7" + +urllib3 = ">= 1.25.3" +python-dateutil = ">=2.8.2" +pydantic = ">= 1.10.5" +aenum = ">=3.1.11" + +[tool.poetry.dev-dependencies] +pytest = ">=7.2.1" +tox = ">=4.4.6" +flake8 = ">=6.0.0" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES index c2f43506f98..8e90f16b24f 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES @@ -144,6 +144,7 @@ petstore_api/models/user.py petstore_api/models/with_nested_one_of.py petstore_api/rest.py petstore_api/signing.py +pyproject.toml requirements.txt setup.cfg setup.py diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md index d9db0c5fce3..2a6511e7b74 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md @@ -40,6 +40,10 @@ Then import the package: import petstore_api ``` +### Tests + +Execute `pytest` to run the tests. + ## Getting Started Please follow the [installation procedure](#installation--usage) and then run the following: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml new file mode 100644 index 00000000000..3c1002a8445 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml @@ -0,0 +1,29 @@ +[tool.poetry] +name = "petstore_api" +version = "1.0.0" +description = "OpenAPI Petstore" +authors = ["team@openapitools.org"] +license = "Apache-2.0" +readme = "README.md" +repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID" +keywords = ["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"] + +[tool.poetry.dependencies] +python = "^3.7" + +urllib3 = ">= 1.25.3" +python-dateutil = ">=2.8.2" +aiohttp = ">= 3.8.4" +pem = ">= 19.3.0" +pycryptodome = ">= 3.9.0" +pydantic = ">= 1.10.5" +aenum = ">=3.1.11" + +[tool.poetry.dev-dependencies] +pytest = ">=7.2.1" +tox = ">=4.4.6" +flake8 = ">=6.0.0" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" diff --git a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES index f5e76be9e49..0bd7787dea2 100755 --- a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES @@ -144,6 +144,7 @@ petstore_api/models/user.py petstore_api/models/with_nested_one_of.py petstore_api/rest.py petstore_api/signing.py +pyproject.toml requirements.txt setup.cfg setup.py diff --git a/samples/openapi3/client/petstore/python-nextgen/README.md b/samples/openapi3/client/petstore/python-nextgen/README.md index 0f1d86506a4..00f4adf15c5 100755 --- a/samples/openapi3/client/petstore/python-nextgen/README.md +++ b/samples/openapi3/client/petstore/python-nextgen/README.md @@ -40,6 +40,10 @@ Then import the package: import petstore_api ``` +### Tests + +Execute `pytest` to run the tests. + ## Getting Started Please follow the [installation procedure](#installation--usage) and then run the following: diff --git a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml new file mode 100644 index 00000000000..d70b472207c --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml @@ -0,0 +1,28 @@ +[tool.poetry] +name = "petstore_api" +version = "1.0.0" +description = "OpenAPI Petstore" +authors = ["team@openapitools.org"] +license = "Apache-2.0" +readme = "README.md" +repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID" +keywords = ["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"] + +[tool.poetry.dependencies] +python = "^3.7" + +urllib3 = ">= 1.25.3" +python-dateutil = ">=2.8.2" +pem = ">= 19.3.0" +pycryptodome = ">= 3.9.0" +pydantic = ">= 1.10.5" +aenum = ">=3.1.11" + +[tool.poetry.dev-dependencies] +pytest = ">=7.2.1" +tox = ">=4.4.6" +flake8 = ">=6.0.0" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" From 2a9fb7b6e7460d6da5fb5bc172e2c58c0fb0cca8 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sat, 4 Mar 2023 21:09:57 -0500 Subject: [PATCH 002/131] removed double encoding (#14883) --- .../libraries/generichost/api.mustache | 4 +-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 30 +++++++++---------- .../src/Org.OpenAPITools/Api/PetApi.cs | 4 +-- .../src/Org.OpenAPITools/Api/UserApi.cs | 4 +-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 30 +++++++++---------- .../src/Org.OpenAPITools/Api/PetApi.cs | 4 +-- .../src/Org.OpenAPITools/Api/UserApi.cs | 4 +-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 30 +++++++++---------- .../src/Org.OpenAPITools/Api/PetApi.cs | 4 +-- .../src/Org.OpenAPITools/Api/UserApi.cs | 4 +-- 10 files changed, 59 insertions(+), 59 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache index ccd0091ea50..f884deda4e8 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache @@ -302,10 +302,10 @@ namespace {{packageName}}.{{apiPackage}} System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}{{/queryParams}}{{#queryParams}}{{#required}}{{#-first}} {{! all the redundant tags here are to get the spacing just right }} - {{/-first}}{{/required}}{{/queryParams}}{{#queryParams}}{{#required}}parseQueryString["{{baseName}}"] = Uri.EscapeDataString({{paramName}}.ToString(){{nrt!}}); + {{/-first}}{{/required}}{{/queryParams}}{{#queryParams}}{{#required}}parseQueryString["{{baseName}}"] = {{paramName}}.ToString(); {{/required}}{{/queryParams}}{{#queryParams}}{{#-first}} {{/-first}}{{/queryParams}}{{#queryParams}}{{^required}}if ({{paramName}} != null) - parseQueryString["{{baseName}}"] = Uri.EscapeDataString({{paramName}}.ToString(){{nrt!}}); + parseQueryString["{{baseName}}"] = {{paramName}}.ToString(); {{/required}}{{#-last}}uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs index 3398f5f8f42..28bec8edf86 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1405,7 +1405,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_uuid"] = Uri.EscapeDataString(requiredStringUuid.ToString()!); + parseQueryString["required_string_uuid"] = requiredStringUuid.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -1856,7 +1856,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["query"] = Uri.EscapeDataString(query.ToString()!); + parseQueryString["query"] = query.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -2516,16 +2516,16 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); if (enumQueryStringArray != null) - parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString()!); + parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString(); if (enumQueryDouble != null) - parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()!); + parseQueryString["enum_query_double"] = enumQueryDouble.ToString(); if (enumQueryInteger != null) - parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()!); + parseQueryString["enum_query_integer"] = enumQueryInteger.ToString(); if (enumQueryString != null) - parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString()!); + parseQueryString["enum_query_string"] = enumQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -2735,14 +2735,14 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_group"] = Uri.EscapeDataString(requiredStringGroup.ToString()!); - parseQueryString["required_int64_group"] = Uri.EscapeDataString(requiredInt64Group.ToString()!); + parseQueryString["required_string_group"] = requiredStringGroup.ToString(); + parseQueryString["required_int64_group"] = requiredInt64Group.ToString(); if (stringGroup != null) - parseQueryString["string_group"] = Uri.EscapeDataString(stringGroup.ToString()!); + parseQueryString["string_group"] = stringGroup.ToString(); if (int64Group != null) - parseQueryString["int64_group"] = Uri.EscapeDataString(int64Group.ToString()!); + parseQueryString["int64_group"] = int64Group.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -3257,11 +3257,11 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["pipe"] = Uri.EscapeDataString(pipe.ToString()!); - parseQueryString["ioutil"] = Uri.EscapeDataString(ioutil.ToString()!); - parseQueryString["http"] = Uri.EscapeDataString(http.ToString()!); - parseQueryString["url"] = Uri.EscapeDataString(url.ToString()!); - parseQueryString["context"] = Uri.EscapeDataString(context.ToString()!); + parseQueryString["pipe"] = pipe.ToString(); + parseQueryString["ioutil"] = ioutil.ToString(); + parseQueryString["http"] = http.ToString(); + parseQueryString["url"] = url.ToString(); + parseQueryString["context"] = context.ToString(); uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs index 75c71e51628..575efbe6b09 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs @@ -873,7 +873,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["status"] = Uri.EscapeDataString(status.ToString()!); + parseQueryString["status"] = status.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -1046,7 +1046,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["tags"] = Uri.EscapeDataString(tags.ToString()!); + parseQueryString["tags"] = tags.ToString(); uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs index a570b8d3112..ec937c3be30 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs @@ -1227,8 +1227,8 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["username"] = Uri.EscapeDataString(username.ToString()!); - parseQueryString["password"] = Uri.EscapeDataString(password.ToString()!); + parseQueryString["username"] = username.ToString(); + parseQueryString["password"] = password.ToString(); uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs index 5edf723c365..4902407d15b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1144,7 +1144,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_uuid"] = Uri.EscapeDataString(requiredStringUuid.ToString()); + parseQueryString["required_string_uuid"] = requiredStringUuid.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -1595,7 +1595,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["query"] = Uri.EscapeDataString(query.ToString()); + parseQueryString["query"] = query.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -2255,16 +2255,16 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); if (enumQueryStringArray != null) - parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString()); + parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString(); if (enumQueryDouble != null) - parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()); + parseQueryString["enum_query_double"] = enumQueryDouble.ToString(); if (enumQueryInteger != null) - parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()); + parseQueryString["enum_query_integer"] = enumQueryInteger.ToString(); if (enumQueryString != null) - parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString()); + parseQueryString["enum_query_string"] = enumQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -2474,14 +2474,14 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_group"] = Uri.EscapeDataString(requiredStringGroup.ToString()); - parseQueryString["required_int64_group"] = Uri.EscapeDataString(requiredInt64Group.ToString()); + parseQueryString["required_string_group"] = requiredStringGroup.ToString(); + parseQueryString["required_int64_group"] = requiredInt64Group.ToString(); if (stringGroup != null) - parseQueryString["string_group"] = Uri.EscapeDataString(stringGroup.ToString()); + parseQueryString["string_group"] = stringGroup.ToString(); if (int64Group != null) - parseQueryString["int64_group"] = Uri.EscapeDataString(int64Group.ToString()); + parseQueryString["int64_group"] = int64Group.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -2996,11 +2996,11 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["pipe"] = Uri.EscapeDataString(pipe.ToString()); - parseQueryString["ioutil"] = Uri.EscapeDataString(ioutil.ToString()); - parseQueryString["http"] = Uri.EscapeDataString(http.ToString()); - parseQueryString["url"] = Uri.EscapeDataString(url.ToString()); - parseQueryString["context"] = Uri.EscapeDataString(context.ToString()); + parseQueryString["pipe"] = pipe.ToString(); + parseQueryString["ioutil"] = ioutil.ToString(); + parseQueryString["http"] = http.ToString(); + parseQueryString["url"] = url.ToString(); + parseQueryString["context"] = context.ToString(); uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs index 75a4ad92111..ab2a938dda5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs @@ -765,7 +765,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["status"] = Uri.EscapeDataString(status.ToString()); + parseQueryString["status"] = status.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -938,7 +938,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["tags"] = Uri.EscapeDataString(tags.ToString()); + parseQueryString["tags"] = tags.ToString(); uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs index 53c8bc1bac6..84f89c5c9d4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs @@ -1114,8 +1114,8 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["username"] = Uri.EscapeDataString(username.ToString()); - parseQueryString["password"] = Uri.EscapeDataString(password.ToString()); + parseQueryString["username"] = username.ToString(); + parseQueryString["password"] = password.ToString(); uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs index 3673e78cdb9..33d7fee317d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs @@ -1144,7 +1144,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_uuid"] = Uri.EscapeDataString(requiredStringUuid.ToString()); + parseQueryString["required_string_uuid"] = requiredStringUuid.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -1595,7 +1595,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["query"] = Uri.EscapeDataString(query.ToString()); + parseQueryString["query"] = query.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -2255,16 +2255,16 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); if (enumQueryStringArray != null) - parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString()); + parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString(); if (enumQueryDouble != null) - parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()); + parseQueryString["enum_query_double"] = enumQueryDouble.ToString(); if (enumQueryInteger != null) - parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()); + parseQueryString["enum_query_integer"] = enumQueryInteger.ToString(); if (enumQueryString != null) - parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString()); + parseQueryString["enum_query_string"] = enumQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -2474,14 +2474,14 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_group"] = Uri.EscapeDataString(requiredStringGroup.ToString()); - parseQueryString["required_int64_group"] = Uri.EscapeDataString(requiredInt64Group.ToString()); + parseQueryString["required_string_group"] = requiredStringGroup.ToString(); + parseQueryString["required_int64_group"] = requiredInt64Group.ToString(); if (stringGroup != null) - parseQueryString["string_group"] = Uri.EscapeDataString(stringGroup.ToString()); + parseQueryString["string_group"] = stringGroup.ToString(); if (int64Group != null) - parseQueryString["int64_group"] = Uri.EscapeDataString(int64Group.ToString()); + parseQueryString["int64_group"] = int64Group.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -2996,11 +2996,11 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["pipe"] = Uri.EscapeDataString(pipe.ToString()); - parseQueryString["ioutil"] = Uri.EscapeDataString(ioutil.ToString()); - parseQueryString["http"] = Uri.EscapeDataString(http.ToString()); - parseQueryString["url"] = Uri.EscapeDataString(url.ToString()); - parseQueryString["context"] = Uri.EscapeDataString(context.ToString()); + parseQueryString["pipe"] = pipe.ToString(); + parseQueryString["ioutil"] = ioutil.ToString(); + parseQueryString["http"] = http.ToString(); + parseQueryString["url"] = url.ToString(); + parseQueryString["context"] = context.ToString(); uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs index ef93a735adb..b67aa8423b9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs @@ -765,7 +765,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["status"] = Uri.EscapeDataString(status.ToString()); + parseQueryString["status"] = status.ToString(); uriBuilder.Query = parseQueryString.ToString(); @@ -938,7 +938,7 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["tags"] = Uri.EscapeDataString(tags.ToString()); + parseQueryString["tags"] = tags.ToString(); uriBuilder.Query = parseQueryString.ToString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs index 306be612b3d..052ed169feb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs @@ -1114,8 +1114,8 @@ namespace Org.OpenAPITools.Api System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["username"] = Uri.EscapeDataString(username.ToString()); - parseQueryString["password"] = Uri.EscapeDataString(password.ToString()); + parseQueryString["username"] = username.ToString(); + parseQueryString["password"] = password.ToString(); uriBuilder.Query = parseQueryString.ToString(); From 8ede021ec542d55a997b2fa432d21d044d746773 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 6 Mar 2023 16:29:40 +0800 Subject: [PATCH 003/131] remove api import from model tests in csharp-netcore client (#14889) --- .../src/main/resources/csharp-netcore/model_test.mustache | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/model_test.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/model_test.mustache index 347c2c35a25..65767faa34b 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/model_test.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/model_test.mustache @@ -6,7 +6,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using {{packageName}}.{{apiPackage}}; using {{packageName}}.{{modelPackage}}; using {{packageName}}.{{clientPackage}}; using System.Reflection; From d497c3d087b85ecebf8839a732fc572ae794fc45 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 6 Mar 2023 21:22:43 +0800 Subject: [PATCH 004/131] [python-nextgen] Better docstring/documentation (#14880) * better docstring/documentation in python nextgen client * update instruction in test files --- .../main/resources/python-nextgen/api_client.mustache | 4 ---- .../resources/python-nextgen/configuration.mustache | 6 +----- .../resources/python-nextgen/model_anyof.mustache | 7 +++---- .../main/resources/python-nextgen/model_enum.mustache | 8 +++----- .../resources/python-nextgen/model_generic.mustache | 8 +++----- .../resources/python-nextgen/model_oneof.mustache | 6 ++---- .../resources/python-nextgen/partial_header.mustache | 8 +++++--- .../main/resources/python-nextgen/signing.mustache | 5 ----- .../python-nextgen/openapi_client/__init__.py | 4 +++- .../python-nextgen/openapi_client/api/body_api.py | 4 +++- .../python-nextgen/openapi_client/api/form_api.py | 4 +++- .../python-nextgen/openapi_client/api/header_api.py | 4 +++- .../python-nextgen/openapi_client/api/path_api.py | 4 +++- .../python-nextgen/openapi_client/api/query_api.py | 4 +++- .../python-nextgen/openapi_client/api_client.py | 8 +++----- .../python-nextgen/openapi_client/configuration.py | 10 ++++------ .../python-nextgen/openapi_client/exceptions.py | 4 +++- .../python-nextgen/openapi_client/models/__init__.py | 4 +++- .../python-nextgen/openapi_client/models/bird.py | 10 +++++----- .../python-nextgen/openapi_client/models/category.py | 10 +++++----- .../openapi_client/models/data_query.py | 10 +++++----- .../openapi_client/models/data_query_all_of.py | 10 +++++----- .../openapi_client/models/default_value.py | 10 +++++----- .../python-nextgen/openapi_client/models/pet.py | 10 +++++----- .../python-nextgen/openapi_client/models/query.py | 10 +++++----- .../openapi_client/models/string_enum_ref.py | 11 +++++------ .../python-nextgen/openapi_client/models/tag.py | 10 +++++----- ...plode_true_object_all_of_query_object_parameter.py | 10 +++++----- ...xplode_true_array_string_query_object_parameter.py | 10 +++++----- .../echo_api/python-nextgen/openapi_client/rest.py | 4 +++- samples/client/echo_api/python-nextgen/setup.py | 4 +++- .../python-nextgen-aiohttp/petstore_api/__init__.py | 4 +++- .../petstore_api/api/another_fake_api.py | 4 +++- .../petstore_api/api/default_api.py | 4 +++- .../petstore_api/api/fake_api.py | 4 +++- .../petstore_api/api/fake_classname_tags123_api.py | 4 +++- .../petstore_api/api/pet_api.py | 4 +++- .../petstore_api/api/store_api.py | 4 +++- .../petstore_api/api/user_api.py | 4 +++- .../python-nextgen-aiohttp/petstore_api/api_client.py | 8 +++----- .../petstore_api/configuration.py | 10 ++++------ .../python-nextgen-aiohttp/petstore_api/exceptions.py | 4 +++- .../petstore_api/models/__init__.py | 4 +++- .../models/additional_properties_class.py | 10 +++++----- .../petstore_api/models/all_of_with_single_ref.py | 10 +++++----- .../petstore_api/models/animal.py | 10 +++++----- .../petstore_api/models/any_of_color.py | 11 ++++++----- .../petstore_api/models/any_of_pig.py | 11 ++++++----- .../petstore_api/models/api_response.py | 10 +++++----- .../models/array_of_array_of_number_only.py | 10 +++++----- .../petstore_api/models/array_of_number_only.py | 10 +++++----- .../petstore_api/models/array_test.py | 10 +++++----- .../petstore_api/models/basque_pig.py | 10 +++++----- .../petstore_api/models/capitalization.py | 10 +++++----- .../python-nextgen-aiohttp/petstore_api/models/cat.py | 10 +++++----- .../petstore_api/models/cat_all_of.py | 10 +++++----- .../petstore_api/models/category.py | 10 +++++----- .../petstore_api/models/class_model.py | 10 +++++----- .../petstore_api/models/client.py | 10 +++++----- .../petstore_api/models/color.py | 10 +++++----- .../petstore_api/models/danish_pig.py | 10 +++++----- .../petstore_api/models/deprecated_object.py | 10 +++++----- .../python-nextgen-aiohttp/petstore_api/models/dog.py | 10 +++++----- .../petstore_api/models/dog_all_of.py | 10 +++++----- .../petstore_api/models/dummy_model.py | 10 +++++----- .../petstore_api/models/enum_arrays.py | 10 +++++----- .../petstore_api/models/enum_class.py | 11 +++++------ .../petstore_api/models/enum_test.py | 10 +++++----- .../petstore_api/models/file.py | 10 +++++----- .../petstore_api/models/file_schema_test_class.py | 10 +++++----- .../python-nextgen-aiohttp/petstore_api/models/foo.py | 10 +++++----- .../petstore_api/models/foo_get_default_response.py | 10 +++++----- .../petstore_api/models/format_test.py | 10 +++++----- .../petstore_api/models/has_only_read_only.py | 10 +++++----- .../petstore_api/models/health_check_result.py | 10 +++++----- .../petstore_api/models/list.py | 10 +++++----- .../petstore_api/models/map_test.py | 10 +++++----- ...ixed_properties_and_additional_properties_class.py | 10 +++++----- .../petstore_api/models/model200_response.py | 10 +++++----- .../petstore_api/models/model_return.py | 10 +++++----- .../petstore_api/models/name.py | 10 +++++----- .../petstore_api/models/nullable_class.py | 10 +++++----- .../petstore_api/models/number_only.py | 10 +++++----- .../models/object_with_deprecated_fields.py | 10 +++++----- .../petstore_api/models/order.py | 10 +++++----- .../petstore_api/models/outer_composite.py | 10 +++++----- .../petstore_api/models/outer_enum.py | 11 +++++------ .../petstore_api/models/outer_enum_default_value.py | 11 +++++------ .../petstore_api/models/outer_enum_integer.py | 11 +++++------ .../models/outer_enum_integer_default_value.py | 11 +++++------ .../models/outer_object_with_enum_property.py | 10 +++++----- .../python-nextgen-aiohttp/petstore_api/models/pet.py | 10 +++++----- .../python-nextgen-aiohttp/petstore_api/models/pig.py | 10 +++++----- .../petstore_api/models/read_only_first.py | 10 +++++----- .../petstore_api/models/self_reference_model.py | 10 +++++----- .../petstore_api/models/single_ref_type.py | 11 +++++------ .../petstore_api/models/special_character_enum.py | 11 +++++------ .../petstore_api/models/special_model_name.py | 10 +++++----- .../petstore_api/models/special_name.py | 10 +++++----- .../python-nextgen-aiohttp/petstore_api/models/tag.py | 10 +++++----- .../petstore_api/models/user.py | 10 +++++----- .../petstore_api/models/with_nested_one_of.py | 10 +++++----- .../python-nextgen-aiohttp/petstore_api/rest.py | 4 +++- .../python-nextgen-aiohttp/petstore_api/signing.py | 9 +++------ .../client/petstore/python-nextgen-aiohttp/setup.py | 4 +++- .../petstore/python-nextgen/petstore_api/__init__.py | 4 +++- .../petstore_api/api/another_fake_api.py | 4 +++- .../python-nextgen/petstore_api/api/default_api.py | 4 +++- .../python-nextgen/petstore_api/api/fake_api.py | 4 +++- .../petstore_api/api/fake_classname_tags123_api.py | 4 +++- .../python-nextgen/petstore_api/api/pet_api.py | 4 +++- .../python-nextgen/petstore_api/api/store_api.py | 4 +++- .../python-nextgen/petstore_api/api/user_api.py | 4 +++- .../python-nextgen/petstore_api/api_client.py | 8 +++----- .../python-nextgen/petstore_api/configuration.py | 10 ++++------ .../python-nextgen/petstore_api/exceptions.py | 4 +++- .../python-nextgen/petstore_api/models/__init__.py | 4 +++- .../models/additional_properties_class.py | 10 +++++----- .../petstore_api/models/all_of_with_single_ref.py | 10 +++++----- .../python-nextgen/petstore_api/models/animal.py | 10 +++++----- .../petstore_api/models/any_of_color.py | 11 ++++++----- .../python-nextgen/petstore_api/models/any_of_pig.py | 11 ++++++----- .../petstore_api/models/api_response.py | 10 +++++----- .../models/array_of_array_of_number_only.py | 10 +++++----- .../petstore_api/models/array_of_number_only.py | 10 +++++----- .../python-nextgen/petstore_api/models/array_test.py | 10 +++++----- .../python-nextgen/petstore_api/models/basque_pig.py | 10 +++++----- .../petstore_api/models/capitalization.py | 10 +++++----- .../python-nextgen/petstore_api/models/cat.py | 10 +++++----- .../python-nextgen/petstore_api/models/cat_all_of.py | 10 +++++----- .../python-nextgen/petstore_api/models/category.py | 10 +++++----- .../python-nextgen/petstore_api/models/class_model.py | 10 +++++----- .../python-nextgen/petstore_api/models/client.py | 10 +++++----- .../python-nextgen/petstore_api/models/color.py | 10 +++++----- .../python-nextgen/petstore_api/models/danish_pig.py | 10 +++++----- .../petstore_api/models/deprecated_object.py | 10 +++++----- .../python-nextgen/petstore_api/models/dog.py | 10 +++++----- .../python-nextgen/petstore_api/models/dog_all_of.py | 10 +++++----- .../python-nextgen/petstore_api/models/dummy_model.py | 10 +++++----- .../python-nextgen/petstore_api/models/enum_arrays.py | 10 +++++----- .../python-nextgen/petstore_api/models/enum_class.py | 11 +++++------ .../python-nextgen/petstore_api/models/enum_test.py | 10 +++++----- .../python-nextgen/petstore_api/models/file.py | 10 +++++----- .../petstore_api/models/file_schema_test_class.py | 10 +++++----- .../python-nextgen/petstore_api/models/foo.py | 10 +++++----- .../petstore_api/models/foo_get_default_response.py | 10 +++++----- .../python-nextgen/petstore_api/models/format_test.py | 10 +++++----- .../petstore_api/models/has_only_read_only.py | 10 +++++----- .../petstore_api/models/health_check_result.py | 10 +++++----- .../python-nextgen/petstore_api/models/list.py | 10 +++++----- .../python-nextgen/petstore_api/models/map_test.py | 10 +++++----- ...ixed_properties_and_additional_properties_class.py | 10 +++++----- .../petstore_api/models/model200_response.py | 10 +++++----- .../petstore_api/models/model_return.py | 10 +++++----- .../python-nextgen/petstore_api/models/name.py | 10 +++++----- .../petstore_api/models/nullable_class.py | 10 +++++----- .../python-nextgen/petstore_api/models/number_only.py | 10 +++++----- .../models/object_with_deprecated_fields.py | 10 +++++----- .../python-nextgen/petstore_api/models/order.py | 10 +++++----- .../petstore_api/models/outer_composite.py | 10 +++++----- .../python-nextgen/petstore_api/models/outer_enum.py | 11 +++++------ .../petstore_api/models/outer_enum_default_value.py | 11 +++++------ .../petstore_api/models/outer_enum_integer.py | 11 +++++------ .../models/outer_enum_integer_default_value.py | 11 +++++------ .../models/outer_object_with_enum_property.py | 10 +++++----- .../python-nextgen/petstore_api/models/pet.py | 10 +++++----- .../python-nextgen/petstore_api/models/pig.py | 10 +++++----- .../petstore_api/models/read_only_first.py | 10 +++++----- .../petstore_api/models/self_reference_model.py | 10 +++++----- .../petstore_api/models/single_ref_type.py | 11 +++++------ .../petstore_api/models/special_character_enum.py | 11 +++++------ .../petstore_api/models/special_model_name.py | 10 +++++----- .../petstore_api/models/special_name.py | 10 +++++----- .../python-nextgen/petstore_api/models/tag.py | 10 +++++----- .../python-nextgen/petstore_api/models/user.py | 10 +++++----- .../petstore_api/models/with_nested_one_of.py | 10 +++++----- .../petstore/python-nextgen/petstore_api/rest.py | 4 +++- .../petstore/python-nextgen/petstore_api/signing.py | 9 +++------ .../openapi3/client/petstore/python-nextgen/setup.py | 4 +++- .../petstore/python-nextgen/tests/test_api_client.py | 4 ++-- .../python-nextgen/tests/test_api_exception.py | 4 ++-- .../python-nextgen/tests/test_api_validation.py | 4 ++-- .../python-nextgen/tests/test_configuration.py | 4 ++-- .../python-nextgen/tests/test_deserialization.py | 4 ++-- .../petstore/python-nextgen/tests/test_map_test.py | 4 ++-- .../petstore/python-nextgen/tests/test_pet_api.py | 4 ++-- .../petstore/python-nextgen/tests/test_store_api.py | 4 ++-- 187 files changed, 811 insertions(+), 790 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache index 624c5ccb09c..fb7320b3317 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache @@ -31,10 +31,6 @@ class ApiClient(object): the methods and models for each application are generated from the OpenAPI templates. - NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - Do not edit the class manually. - :param configuration: .Configuration object for this client :param header_name: a header to pass when making calls to the API. :param header_value: a header value to pass when making calls to diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/configuration.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/configuration.mustache index b6fab6d7219..ab50e67ea61 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/configuration.mustache @@ -15,7 +15,6 @@ import urllib3 import http.client as httplib from {{packageName}}.exceptions import ApiValueError - JSON_SCHEMA_VALIDATION_KEYWORDS = { 'multipleOf', 'maximum', 'exclusiveMaximum', 'minimum', 'exclusiveMinimum', 'maxLength', @@ -23,10 +22,7 @@ JSON_SCHEMA_VALIDATION_KEYWORDS = { } class Configuration(object): - """NOTE: This class is auto generated by OpenAPI Generator - - Ref: https://openapi-generator.tech - Do not edit the class manually. + """This class contains various settings of the API client. :param host: Base url. :param api_key: Dict to store API key(s). diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_anyof.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_anyof.mustache index 8c926f284ce..f4687163d26 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_anyof.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_anyof.mustache @@ -15,11 +15,10 @@ from pydantic import StrictStr, Field {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ANY_OF_SCHEMAS = [{{#anyOf}}"{{.}}"{{^-last}}, {{/-last}}{{/anyOf}}] class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. """ + {{{description}}}{{^description}}{{{classname}}}{{/description}} + """ + {{#composedSchemas.anyOf}} # data type: {{{dataType}}} {{vendorExtensions.x-py-name}}: {{{vendorExtensions.x-py-typing}}} diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_enum.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_enum.mustache index e5b96967451..0e892dcc5bb 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_enum.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_enum.mustache @@ -8,21 +8,19 @@ from aenum import Enum, no_arg class {{classname}}({{vendorExtensions.x-py-enum-type}}, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + {{{description}}}{{^description}}{{{classname}}}{{/description}} """ """ allowed enum values """ - {{#allowableValues}} {{#enumVars}} {{{name}}} = {{{value}}} {{/enumVars}} {{#defaultValue}} + # @classmethod def _missing_value_(cls, value): diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache index 6c2b3432cfd..a503f6c6676 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache @@ -17,10 +17,8 @@ import {{{modelPackage}}} {{/vendorExtensions.x-py-model-imports}} class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + {{{description}}}{{^description}}{{{classname}}}{{/description}} """ {{#vars}} {{name}}: {{{vendorExtensions.x-py-typing}}} @@ -255,4 +253,4 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}} {{/isAdditionalPropertiesTrue}} return _obj - {{/hasChildren}} \ No newline at end of file + {{/hasChildren}} diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_oneof.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_oneof.mustache index 7e1b110e2b0..b65f784d1cc 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_oneof.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_oneof.mustache @@ -15,10 +15,8 @@ from pydantic import StrictStr, Field {{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ONE_OF_SCHEMAS = [{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}] class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + {{{description}}}{{^description}}{{{classname}}}{{/description}} """ {{#composedSchemas.oneOf}} # data type: {{{dataType}}} diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/partial_header.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/partial_header.mustache index dc3c8f3d8c8..d952d423503 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/partial_header.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/partial_header.mustache @@ -1,17 +1,19 @@ """ {{#appName}} {{{.}}} -{{/appName}} +{{/appName}} {{#appDescription}} {{{.}}} # noqa: E501 -{{/appDescription}} +{{/appDescription}} {{#version}} The version of the OpenAPI document: {{{.}}} {{/version}} {{#infoEmail}} Contact: {{{.}}} {{/infoEmail}} - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/signing.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/signing.mustache index 24889edbd6d..8dca7e2d1ff 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/signing.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/signing.mustache @@ -64,11 +64,6 @@ class HttpSigningConfiguration(object): and optionally the body of the HTTP request, then signing the hash value using a private key. The 'Authorization' header is added to outbound HTTP requests. - NOTE: This class is auto generated by OpenAPI Generator - - Ref: https://openapi-generator.tech - Do not edit the class manually. - :param key_id: A string value specifying the identifier of the cryptographic key, when signing HTTP requests. :param signing_scheme: A string value specifying the signature scheme, when diff --git a/samples/client/echo_api/python-nextgen/openapi_client/__init__.py b/samples/client/echo_api/python-nextgen/openapi_client/__init__.py index 347fdc2bf4e..e9e75706830 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/__init__.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/__init__.py @@ -9,7 +9,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py index f9da2fd048f..371e24d7302 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/form_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/form_api.py index 812ddd73aee..c1061ca2253 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/form_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/form_api.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/header_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/header_api.py index 2b16c49995f..9eaaaae02f5 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/header_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/header_api.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/path_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/path_api.py index 13e1cea9b6d..34d1b7c2abb 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/path_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/path_api.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py index db829799766..fd624a242e0 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api_client.py b/samples/client/echo_api/python-nextgen/openapi_client/api_client.py index 0eb5185bc9f..ee78378e9ce 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api_client.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api_client.py @@ -6,7 +6,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ from __future__ import absolute_import @@ -37,10 +39,6 @@ class ApiClient(object): the methods and models for each application are generated from the OpenAPI templates. - NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - Do not edit the class manually. - :param configuration: .Configuration object for this client :param header_name: a header to pass when making calls to the API. :param header_value: a header value to pass when making calls to diff --git a/samples/client/echo_api/python-nextgen/openapi_client/configuration.py b/samples/client/echo_api/python-nextgen/openapi_client/configuration.py index 059776291f5..629814b7054 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/configuration.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/configuration.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,7 +24,6 @@ import urllib3 import http.client as httplib from openapi_client.exceptions import ApiValueError - JSON_SCHEMA_VALIDATION_KEYWORDS = { 'multipleOf', 'maximum', 'exclusiveMaximum', 'minimum', 'exclusiveMinimum', 'maxLength', @@ -30,10 +31,7 @@ JSON_SCHEMA_VALIDATION_KEYWORDS = { } class Configuration(object): - """NOTE: This class is auto generated by OpenAPI Generator - - Ref: https://openapi-generator.tech - Do not edit the class manually. + """This class contains various settings of the API client. :param host: Base url. :param api_key: Dict to store API key(s). diff --git a/samples/client/echo_api/python-nextgen/openapi_client/exceptions.py b/samples/client/echo_api/python-nextgen/openapi_client/exceptions.py index 7b5a4e7446b..8851d062b9c 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/exceptions.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/exceptions.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py b/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py index 2fa4419a3ab..efec638ad0b 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py @@ -8,7 +8,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/bird.py b/samples/client/echo_api/python-nextgen/openapi_client/models/bird.py index a1700cddc00..2f8814af624 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/bird.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/bird.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class Bird(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Bird """ size: Optional[StrictStr] = None color: Optional[StrictStr] = None diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/category.py b/samples/client/echo_api/python-nextgen/openapi_client/models/category.py index 7092d0bdc24..20e8ef180c2 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/category.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/category.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class Category(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Category """ id: Optional[StrictInt] = None name: Optional[StrictStr] = None diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/data_query.py b/samples/client/echo_api/python-nextgen/openapi_client/models/data_query.py index f086e5fb828..500a087fe75 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/data_query.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/data_query.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -23,10 +25,8 @@ from pydantic import BaseModel, Field, StrictStr from openapi_client.models.query import Query class DataQuery(Query): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DataQuery """ suffix: Optional[StrictStr] = Field(None, description="test suffix") text: Optional[StrictStr] = Field(None, description="Some text containing white spaces") diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/data_query_all_of.py b/samples/client/echo_api/python-nextgen/openapi_client/models/data_query_all_of.py index 4db37807afd..b0fcf04d3f9 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/data_query_all_of.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/data_query_all_of.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class DataQueryAllOf(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DataQueryAllOf """ suffix: Optional[StrictStr] = Field(None, description="test suffix") text: Optional[StrictStr] = Field(None, description="Some text containing white spaces") diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py b/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py index 6ba3e69d2b9..92ecd2aba30 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -23,10 +25,8 @@ from pydantic import BaseModel, StrictInt, StrictStr, conlist, validator from openapi_client.models.string_enum_ref import StringEnumRef class DefaultValue(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + to test the default value of properties """ array_string_enum_ref_default: Optional[conlist(StringEnumRef)] = None array_string_enum_default: Optional[conlist(StrictStr)] = None diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/pet.py b/samples/client/echo_api/python-nextgen/openapi_client/models/pet.py index dffafa94de7..00eb3d7be1f 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/pet.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/pet.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -24,10 +26,8 @@ from openapi_client.models.category import Category from openapi_client.models.tag import Tag class Pet(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Pet """ id: Optional[StrictInt] = None name: StrictStr = ... diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/query.py b/samples/client/echo_api/python-nextgen/openapi_client/models/query.py index a62d59ce9a1..d52e87c6f50 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/query.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/query.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import List, Optional from pydantic import BaseModel, Field, StrictInt, StrictStr, conlist, validator class Query(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Query """ id: Optional[StrictInt] = Field(None, description="Query") outcomes: Optional[conlist(StrictStr)] = None diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/string_enum_ref.py b/samples/client/echo_api/python-nextgen/openapi_client/models/string_enum_ref.py index 27741fc9573..e48c86fb0b3 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/string_enum_ref.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/string_enum_ref.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,16 +23,13 @@ from aenum import Enum, no_arg class StringEnumRef(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + StringEnumRef """ """ allowed enum values """ - SUCCESS = 'success' FAILURE = 'failure' UNCLASSIFIED = 'unclassified' diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/tag.py b/samples/client/echo_api/python-nextgen/openapi_client/models/tag.py index 8c187b78386..430b70f4519 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/tag.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/tag.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class Tag(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Tag """ id: Optional[StrictInt] = None name: Optional[StrictStr] = None diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py b/samples/client/echo_api/python-nextgen/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py index 2a6f3271b26..e43c6fc5a81 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter """ size: Optional[StrictStr] = None color: Optional[StrictStr] = None diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py b/samples/client/echo_api/python-nextgen/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py index 955e3f61f95..f39267b5ac5 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import List, Optional from pydantic import BaseModel, StrictStr, conlist class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter """ values: Optional[conlist(StrictStr)] = None __properties = ["values"] diff --git a/samples/client/echo_api/python-nextgen/openapi_client/rest.py b/samples/client/echo_api/python-nextgen/openapi_client/rest.py index 10adb46f83e..b705cbcb849 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/rest.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/rest.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/client/echo_api/python-nextgen/setup.py b/samples/client/echo_api/python-nextgen/setup.py index 6e6629a0178..004666ab677 100644 --- a/samples/client/echo_api/python-nextgen/setup.py +++ b/samples/client/echo_api/python-nextgen/setup.py @@ -7,7 +7,9 @@ The version of the OpenAPI document: 0.1.0 Contact: team@openapitools.org - Generated by: https://openapi-generator.tech + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py index 2b6fe534d7b..4b74838606e 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py @@ -8,7 +8,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/another_fake_api.py index 07acb105845..b199686440b 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/another_fake_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/default_api.py index 4a3ef582a87..ed4f6708219 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/default_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py index 6d8084aa5e8..a705d5af6e7 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_classname_tags123_api.py index b3764536e1d..3e7d3df88d5 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_classname_tags123_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py index cf76764956f..9be3176520f 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/store_api.py index 1a68a5fd667..01fcb3a1a2b 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/store_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/user_api.py index 7a5e957f01b..3d4eab42ccc 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/user_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py index fb0ecb5301c..464928ee442 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py @@ -5,7 +5,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ from __future__ import absolute_import @@ -36,10 +38,6 @@ class ApiClient(object): the methods and models for each application are generated from the OpenAPI templates. - NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - Do not edit the class manually. - :param configuration: .Configuration object for this client :param header_name: a header to pass when making calls to the API. :param header_value: a header value to pass when making calls to diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/configuration.py index 12e9a7ef799..c468ea8296a 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/configuration.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,7 +22,6 @@ import urllib3 import http.client as httplib from petstore_api.exceptions import ApiValueError - JSON_SCHEMA_VALIDATION_KEYWORDS = { 'multipleOf', 'maximum', 'exclusiveMaximum', 'minimum', 'exclusiveMinimum', 'maxLength', @@ -28,10 +29,7 @@ JSON_SCHEMA_VALIDATION_KEYWORDS = { } class Configuration(object): - """NOTE: This class is auto generated by OpenAPI Generator - - Ref: https://openapi-generator.tech - Do not edit the class manually. + """This class contains various settings of the API client. :param host: Base url. :param api_key: Dict to store API key(s). diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/exceptions.py index b81fd7505ff..cb957db48b9 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/exceptions.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py index fe6f65f77ba..c1bd7823cfb 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py @@ -7,7 +7,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/additional_properties_class.py index 77d3e3ed178..34cead3a8a3 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/additional_properties_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Dict, Optional from pydantic import BaseModel, StrictStr class AdditionalPropertiesClass(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + AdditionalPropertiesClass """ map_property: Optional[Dict[str, StrictStr]] = None map_of_map_property: Optional[Dict[str, Dict[str, StrictStr]]] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/all_of_with_single_ref.py index 876a78a8f96..a68465d4aac 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/all_of_with_single_ref.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Any, Optional from pydantic import BaseModel, Field, StrictStr class AllOfWithSingleRef(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + AllOfWithSingleRef """ username: Optional[StrictStr] = None single_ref_type: Optional[Any] = Field(None, alias="SingleRefType") diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/animal.py index 582668b4f5f..5bdd2d93816 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/animal.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class Animal(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Animal """ class_name: StrictStr = Field(..., alias="className") color: Optional[StrictStr] = 'red' diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/any_of_color.py index 2a44d37581b..61dffbb4c50 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/any_of_color.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -24,11 +26,10 @@ from pydantic import StrictStr, Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] class AnyOfColor(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. """ + Any of RGB array, RGBA array, or hex string. + """ + # data type: List[int] anyof_schema_1_validator: Optional[conlist(conint(strict=True, le=255, ge=0), max_items=3, min_items=3)] = Field(None, description="RGB three element array with values 0-255.") # data type: List[int] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/any_of_pig.py index d96f44bfdf8..e9e97b7d404 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/any_of_pig.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -26,11 +28,10 @@ from pydantic import StrictStr, Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] class AnyOfPig(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. """ + AnyOfPig + """ + # data type: BasquePig anyof_schema_1_validator: Optional[BasquePig] = None # data type: DanishPig diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/api_response.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/api_response.py index 8b6ca41d617..26f3025fb3a 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/api_response.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/api_response.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class ApiResponse(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ApiResponse """ code: Optional[StrictInt] = None type: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_of_array_of_number_only.py index a023c9c0d0c..4593b477f59 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_of_array_of_number_only.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import List, Optional from pydantic import BaseModel, Field, conlist class ArrayOfArrayOfNumberOnly(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ArrayOfArrayOfNumberOnly """ array_array_number: Optional[conlist(conlist(float))] = Field(None, alias="ArrayArrayNumber") __properties = ["ArrayArrayNumber"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_of_number_only.py index ff80adc5878..9a03e3150aa 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_of_number_only.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import List, Optional from pydantic import BaseModel, Field, conlist class ArrayOfNumberOnly(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ArrayOfNumberOnly """ array_number: Optional[conlist(float)] = Field(None, alias="ArrayNumber") __properties = ["ArrayNumber"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_test.py index c526a25201a..021c38893c6 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/array_test.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, StrictInt, StrictStr, conlist from petstore_api.models.read_only_first import ReadOnlyFirst class ArrayTest(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ArrayTest """ array_of_string: Optional[conlist(StrictStr, max_items=3, min_items=0)] = None array_array_of_integer: Optional[conlist(conlist(StrictInt))] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/basque_pig.py index 18c8b241522..7a9bc1624e2 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/basque_pig.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ import json from pydantic import BaseModel, Field, StrictStr class BasquePig(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + BasquePig """ class_name: StrictStr = Field(..., alias="className") color: StrictStr = ... diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/capitalization.py index 800d22c2360..64518b99447 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/capitalization.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class Capitalization(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Capitalization """ small_camel: Optional[StrictStr] = Field(None, alias="smallCamel") capital_camel: Optional[StrictStr] = Field(None, alias="CapitalCamel") diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/cat.py index c9070f52b9b..0f1ece68548 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/cat.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, StrictBool from petstore_api.models.animal import Animal class Cat(Animal): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Cat """ declawed: Optional[StrictBool] = None __properties = ["className", "color", "declawed"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/cat_all_of.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/cat_all_of.py index f6de765293b..7fd50e58975 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/cat_all_of.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/cat_all_of.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictBool class CatAllOf(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + CatAllOf """ declawed: Optional[StrictBool] = None __properties = ["declawed"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/category.py index 226caf6c360..e738609efd5 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/category.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class Category(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Category """ id: Optional[StrictInt] = None name: StrictStr = ... diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/class_model.py index 5f40800b9c0..04cd03eb71f 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/class_model.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class ClassModel(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Model for testing model with \"_class\" property """ var_class: Optional[StrictStr] = Field(None, alias="_class") __properties = ["_class"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/client.py index cc651168676..793b26fab96 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/client.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class Client(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Client """ client: Optional[StrictStr] = None __properties = ["client"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/color.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/color.py index 45d2d0d8f43..2cc4abc9757 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/color.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -24,10 +26,8 @@ from pydantic import StrictStr, Field COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] class Color(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + RGB array, RGBA array, or hex string. """ # data type: List[int] oneof_schema_1_validator: Optional[conlist(conint(strict=True, le=255, ge=0), max_items=3, min_items=3)] = Field(None, description="RGB three element array with values 0-255.") diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/danish_pig.py index 8dd221a3d3c..1e79f3db26e 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/danish_pig.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ import json from pydantic import BaseModel, Field, StrictInt, StrictStr class DanishPig(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DanishPig """ class_name: StrictStr = Field(..., alias="className") size: StrictInt = ... diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/deprecated_object.py index 2d1ad0d9b7c..1b17a9aec47 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/deprecated_object.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class DeprecatedObject(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DeprecatedObject """ name: Optional[StrictStr] = None __properties = ["name"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dog.py index 11cc128ea9c..03b803d8788 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dog.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, StrictStr from petstore_api.models.animal import Animal class Dog(Animal): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Dog """ breed: Optional[StrictStr] = None __properties = ["className", "color", "breed"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dog_all_of.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dog_all_of.py index 8befb96f847..9fa8cea2d48 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dog_all_of.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dog_all_of.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class DogAllOf(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DogAllOf """ breed: Optional[StrictStr] = None __properties = ["breed"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dummy_model.py index b91cc8103b6..47cc18f1a12 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/dummy_model.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class DummyModel(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DummyModel """ category: Optional[StrictStr] = None self_ref: Optional[SelfReferenceModel] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py index 1421b202998..ce596ea3491 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import List, Optional from pydantic import BaseModel, StrictStr, conlist, validator class EnumArrays(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + EnumArrays """ just_symbol: Optional[StrictStr] = None array_enum: Optional[conlist(StrictStr)] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_class.py index 9fd2fcc13cd..8f013917f4c 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class EnumClass(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + EnumClass """ """ allowed enum values """ - ABC = '_abc' MINUS_EFG = '-efg' LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS = '(xyz)' diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py index c7cb02c5e52..e610ed2c1a0 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -25,10 +27,8 @@ from petstore_api.models.outer_enum_integer import OuterEnumInteger from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue class EnumTest(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + EnumTest """ enum_string: Optional[StrictStr] = None enum_string_required: StrictStr = ... diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/file.py index 547ac02231c..aae806f9515 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/file.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class File(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Must be named `File` for test. """ source_uri: Optional[StrictStr] = Field(None, alias="sourceURI", description="Test capitalization") __properties = ["sourceURI"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/file_schema_test_class.py index 0c9641aa66b..86c9b1bd46f 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/file_schema_test_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, conlist from petstore_api.models.file import File class FileSchemaTestClass(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + FileSchemaTestClass """ file: Optional[File] = None files: Optional[conlist(File)] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/foo.py index fdd55d3b587..c85ac8cec6c 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/foo.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class Foo(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Foo """ bar: Optional[StrictStr] = 'bar' __properties = ["bar"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/foo_get_default_response.py index 824cb819f96..1a8502a9eb6 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/foo_get_default_response.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel from petstore_api.models.foo import Foo class FooGetDefaultResponse(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + FooGetDefaultResponse """ string: Optional[Foo] = None __properties = ["string"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py index 2d71fcfca2a..3090369756a 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictBytes, StrictInt, StrictStr, condecimal, confloat, conint, constr, validator class FormatTest(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + FormatTest """ integer: Optional[conint(strict=True, le=100, ge=10)] = None int32: Optional[conint(strict=True, le=200, ge=20)] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/has_only_read_only.py index a894bea69c5..47345cc0a89 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/has_only_read_only.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class HasOnlyReadOnly(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + HasOnlyReadOnly """ bar: Optional[StrictStr] = None foo: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/health_check_result.py index 4894db223db..78ca4ed2852 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/health_check_result.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class HealthCheckResult(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. """ nullable_message: Optional[StrictStr] = Field(None, alias="NullableMessage") __properties = ["NullableMessage"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/list.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/list.py index 5e57dd7284a..e0a3f4b55e4 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/list.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/list.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class List(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + List """ var_123_list: Optional[StrictStr] = Field(None, alias="123-list") __properties = ["123-list"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py index 0f163673c83..14e866474e5 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Dict, Optional from pydantic import BaseModel, StrictBool, StrictStr, validator class MapTest(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + MapTest """ map_map_of_string: Optional[Dict[str, Dict[str, StrictStr]]] = None map_of_enum_string: Optional[Dict[str, StrictStr]] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py index 63cecf94a3c..01f82a8d827 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, Field, StrictStr from petstore_api.models.animal import Animal class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + MixedPropertiesAndAdditionalPropertiesClass """ uuid: Optional[StrictStr] = None date_time: Optional[datetime] = Field(None, alias="dateTime") diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/model200_response.py index 9e63ffc0f65..55ddbc2a050 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/model200_response.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt, StrictStr class Model200Response(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Model for testing model name starting with number """ name: Optional[StrictInt] = None var_class: Optional[StrictStr] = Field(None, alias="class") diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/model_return.py index a7906692c6c..527a4f5b47e 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/model_return.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt class ModelReturn(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Model for testing reserved words """ var_return: Optional[StrictInt] = Field(None, alias="return") __properties = ["return"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/name.py index 27f190d6fc3..2bd141055bb 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/name.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt, StrictStr class Name(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Model for testing model name same as property name """ name: StrictInt = ... snake_case: Optional[StrictInt] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/nullable_class.py index edf0ad22723..dcc98c94545 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/nullable_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Any, Dict, List, Optional from pydantic import BaseModel, StrictBool, StrictInt, StrictStr, conlist class NullableClass(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + NullableClass """ required_integer_prop: Optional[StrictInt] = ... integer_prop: Optional[StrictInt] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/number_only.py index c3a7dbaedde..c4a400a846c 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/number_only.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field class NumberOnly(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + NumberOnly """ just_number: Optional[float] = Field(None, alias="JustNumber") __properties = ["JustNumber"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/object_with_deprecated_fields.py index fd38ee7af4a..d056ce8778a 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/object_with_deprecated_fields.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, Field, StrictStr, conlist from petstore_api.models.deprecated_object import DeprecatedObject class ObjectWithDeprecatedFields(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ObjectWithDeprecatedFields """ uuid: Optional[StrictStr] = None id: Optional[float] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py index 7605ddaf569..cb8cb389940 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictBool, StrictInt, StrictStr, validator class Order(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Order """ id: Optional[StrictInt] = None pet_id: Optional[StrictInt] = Field(None, alias="petId") diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_composite.py index ee896ed54ab..7fce7797fee 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_composite.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictBool, StrictStr class OuterComposite(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterComposite """ my_number: Optional[float] = None my_string: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum.py index 179e822d35d..befbdfdaa67 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class OuterEnum(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterEnum """ """ allowed enum values """ - PLACED = 'placed' APPROVED = 'approved' DELIVERED = 'delivered' diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_default_value.py index 4a93cbda580..b8937b43c42 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_default_value.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class OuterEnumDefaultValue(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterEnumDefaultValue """ """ allowed enum values """ - PLACED = 'placed' APPROVED = 'approved' DELIVERED = 'delivered' diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_integer.py index 4a4347e3106..72aa99814d4 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_integer.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class OuterEnumInteger(int, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterEnumInteger """ """ allowed enum values """ - NUMBER_0 = 0 NUMBER_1 = 1 NUMBER_2 = 2 diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_integer_default_value.py index b0e86076d16..09a945f73c3 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_enum_integer_default_value.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class OuterEnumIntegerDefaultValue(int, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterEnumIntegerDefaultValue """ """ allowed enum values """ - NUMBER_0 = 0 NUMBER_1 = 1 NUMBER_2 = 2 diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_object_with_enum_property.py index c80429a190b..f41c127a780 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_object_with_enum_property.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -23,10 +25,8 @@ from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger class OuterObjectWithEnumProperty(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterObjectWithEnumProperty """ str_value: Optional[OuterEnum] = None value: OuterEnumInteger = ... diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py index bdff5742127..9967660b383 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -23,10 +25,8 @@ from petstore_api.models.category import Category from petstore_api.models.tag import Tag class Pet(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Pet """ id: Optional[StrictInt] = None category: Optional[Category] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pig.py index 77abb2d6703..baa32ba0c4a 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pig.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -26,10 +28,8 @@ from pydantic import StrictStr, Field PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] class Pig(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Pig """ # data type: BasquePig oneof_schema_1_validator: Optional[BasquePig] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/read_only_first.py index 4f8ca3b6eca..ac16280844b 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/read_only_first.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class ReadOnlyFirst(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ReadOnlyFirst """ bar: Optional[StrictStr] = None baz: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/self_reference_model.py index 39692b911ea..b8fa0dd875f 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/self_reference_model.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt class SelfReferenceModel(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SelfReferenceModel """ size: Optional[StrictInt] = None nested: Optional[DummyModel] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/single_ref_type.py index 67ae5e41be3..e5879e62968 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/single_ref_type.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class SingleRefType(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SingleRefType """ """ allowed enum values """ - ADMIN = 'admin' USER = 'user' diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_character_enum.py index 374ac242de6..8ecf8ac3d69 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_character_enum.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class SpecialCharacterEnum(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SpecialCharacterEnum """ """ allowed enum values """ - ENUM_456 = '456' ENUM_123ABC = '123abc' UNDERSCORE = '_' diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_model_name.py index f5f83a5f419..bc9f7b4cdaa 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_model_name.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt class SpecialModelName(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SpecialModelName """ special_property_name: Optional[StrictInt] = Field(None, alias="$special[property.name]") __properties = ["$special[property.name]"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py index 42d107844e2..372f43fe052 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, Field, StrictInt, StrictStr, validator from petstore_api.models.category import Category class SpecialName(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SpecialName """ var_property: Optional[StrictInt] = Field(None, alias="property") var_async: Optional[Category] = Field(None, alias="async") diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/tag.py index 310b8429843..80c683f5d95 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/tag.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class Tag(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Tag """ id: Optional[StrictInt] = None name: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/user.py index 65fd56849d1..77c6b277f01 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/user.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt, StrictStr class User(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + User """ id: Optional[StrictInt] = None username: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/with_nested_one_of.py index 1675a10bbfc..6690f8dd734 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/with_nested_one_of.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, StrictInt from petstore_api.models.pig import Pig class WithNestedOneOf(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + WithNestedOneOf """ size: Optional[StrictInt] = None nested_pig: Optional[Pig] = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/rest.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/rest.py index c128a2588f4..eee373266b6 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/rest.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/rest.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/signing.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/signing.py index 5060f6edbcd..cc1a0c9d6f7 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/signing.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/signing.py @@ -4,7 +4,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -72,11 +74,6 @@ class HttpSigningConfiguration(object): and optionally the body of the HTTP request, then signing the hash value using a private key. The 'Authorization' header is added to outbound HTTP requests. - NOTE: This class is auto generated by OpenAPI Generator - - Ref: https://openapi-generator.tech - Do not edit the class manually. - :param key_id: A string value specifying the identifier of the cryptographic key, when signing HTTP requests. :param signing_scheme: A string value specifying the signature scheme, when diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/setup.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/setup.py index 881691d6f74..9d2c0b75b55 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/setup.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/setup.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py index 2b6fe534d7b..4b74838606e 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py @@ -8,7 +8,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/another_fake_api.py index 60809cd8225..e64b41e45ce 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/another_fake_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/default_api.py index e6e6c36aeeb..0fae685b825 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/default_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py index 591605fca58..27d18a0e091 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_classname_tags123_api.py index f2c7f023834..c596e1b5287 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_classname_tags123_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py index 560ce557f35..217108146f3 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/store_api.py index 26063f3cc5c..8a9239355c4 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/store_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/user_api.py index 87a63b7e019..1c3d3907326 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/user_api.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py index 96652c49087..3aad97eacca 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py @@ -5,7 +5,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ from __future__ import absolute_import @@ -36,10 +38,6 @@ class ApiClient(object): the methods and models for each application are generated from the OpenAPI templates. - NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - Do not edit the class manually. - :param configuration: .Configuration object for this client :param header_name: a header to pass when making calls to the API. :param header_value: a header value to pass when making calls to diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/configuration.py index 5f667ed5f1c..c6081bbaff2 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/configuration.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,7 +23,6 @@ import urllib3 import http.client as httplib from petstore_api.exceptions import ApiValueError - JSON_SCHEMA_VALIDATION_KEYWORDS = { 'multipleOf', 'maximum', 'exclusiveMaximum', 'minimum', 'exclusiveMinimum', 'maxLength', @@ -29,10 +30,7 @@ JSON_SCHEMA_VALIDATION_KEYWORDS = { } class Configuration(object): - """NOTE: This class is auto generated by OpenAPI Generator - - Ref: https://openapi-generator.tech - Do not edit the class manually. + """This class contains various settings of the API client. :param host: Base url. :param api_key: Dict to store API key(s). diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/exceptions.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/exceptions.py index b81fd7505ff..cb957db48b9 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/exceptions.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/exceptions.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py index fe6f65f77ba..c1bd7823cfb 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py @@ -7,7 +7,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/additional_properties_class.py index e73e6ca7022..e99d1d384d5 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/additional_properties_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Dict, Optional from pydantic import BaseModel, StrictStr class AdditionalPropertiesClass(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + AdditionalPropertiesClass """ map_property: Optional[Dict[str, StrictStr]] = None map_of_map_property: Optional[Dict[str, Dict[str, StrictStr]]] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/all_of_with_single_ref.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/all_of_with_single_ref.py index d46e7528735..9b0dca364e5 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/all_of_with_single_ref.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/all_of_with_single_ref.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Any, Optional from pydantic import BaseModel, Field, StrictStr class AllOfWithSingleRef(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + AllOfWithSingleRef """ username: Optional[StrictStr] = None single_ref_type: Optional[Any] = Field(None, alias="SingleRefType") diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/animal.py index e5885a40c20..c37cccbf446 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/animal.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/animal.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class Animal(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Animal """ class_name: StrictStr = Field(..., alias="className") color: Optional[StrictStr] = 'red' diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/any_of_color.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/any_of_color.py index 2a44d37581b..61dffbb4c50 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/any_of_color.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/any_of_color.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -24,11 +26,10 @@ from pydantic import StrictStr, Field ANYOFCOLOR_ANY_OF_SCHEMAS = ["List[int]", "str"] class AnyOfColor(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. """ + Any of RGB array, RGBA array, or hex string. + """ + # data type: List[int] anyof_schema_1_validator: Optional[conlist(conint(strict=True, le=255, ge=0), max_items=3, min_items=3)] = Field(None, description="RGB three element array with values 0-255.") # data type: List[int] diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/any_of_pig.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/any_of_pig.py index d96f44bfdf8..e9e97b7d404 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/any_of_pig.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/any_of_pig.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -26,11 +28,10 @@ from pydantic import StrictStr, Field ANYOFPIG_ANY_OF_SCHEMAS = ["BasquePig", "DanishPig"] class AnyOfPig(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. """ + AnyOfPig + """ + # data type: BasquePig anyof_schema_1_validator: Optional[BasquePig] = None # data type: DanishPig diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/api_response.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/api_response.py index ad9080c88ed..da810c92086 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/api_response.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/api_response.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class ApiResponse(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ApiResponse """ code: Optional[StrictInt] = None type: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_of_array_of_number_only.py index 6ad248d5613..981ec9cebd9 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_of_array_of_number_only.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import List, Optional from pydantic import BaseModel, Field, StrictFloat, conlist class ArrayOfArrayOfNumberOnly(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ArrayOfArrayOfNumberOnly """ array_array_number: Optional[conlist(conlist(StrictFloat))] = Field(None, alias="ArrayArrayNumber") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_of_number_only.py index b0bade0c265..89a4169e085 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_of_number_only.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import List, Optional from pydantic import BaseModel, Field, StrictFloat, conlist class ArrayOfNumberOnly(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ArrayOfNumberOnly """ array_number: Optional[conlist(StrictFloat)] = Field(None, alias="ArrayNumber") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_test.py index 23024b0959c..9fe1c047ecb 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/array_test.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, StrictInt, StrictStr, conlist from petstore_api.models.read_only_first import ReadOnlyFirst class ArrayTest(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ArrayTest """ array_of_string: Optional[conlist(StrictStr, max_items=3, min_items=0)] = None array_array_of_integer: Optional[conlist(conlist(StrictInt))] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/basque_pig.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/basque_pig.py index 2dfbf9c68e8..48ac4d818b7 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/basque_pig.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/basque_pig.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ import json from pydantic import BaseModel, Field, StrictStr class BasquePig(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + BasquePig """ class_name: StrictStr = Field(..., alias="className") color: StrictStr = ... diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/capitalization.py index edf62140d5f..92695072b18 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/capitalization.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/capitalization.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class Capitalization(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Capitalization """ small_camel: Optional[StrictStr] = Field(None, alias="smallCamel") capital_camel: Optional[StrictStr] = Field(None, alias="CapitalCamel") diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/cat.py index 54c92e534d6..f2aca668519 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/cat.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/cat.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, StrictBool from petstore_api.models.animal import Animal class Cat(Animal): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Cat """ declawed: Optional[StrictBool] = None additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/cat_all_of.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/cat_all_of.py index 17029865e8b..349fcc17b58 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/cat_all_of.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/cat_all_of.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictBool class CatAllOf(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + CatAllOf """ declawed: Optional[StrictBool] = None additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/category.py index d2f04fbf284..65579839f32 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/category.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/category.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class Category(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Category """ id: Optional[StrictInt] = None name: StrictStr = ... diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/class_model.py index 6a10ec1d707..b20fe9ca213 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/class_model.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/class_model.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class ClassModel(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Model for testing model with \"_class\" property """ var_class: Optional[StrictStr] = Field(None, alias="_class") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/client.py index 811d6be903c..a2d08564732 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/client.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/client.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class Client(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Client """ client: Optional[StrictStr] = None additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/color.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/color.py index 45d2d0d8f43..2cc4abc9757 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/color.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/color.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -24,10 +26,8 @@ from pydantic import StrictStr, Field COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"] class Color(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + RGB array, RGBA array, or hex string. """ # data type: List[int] oneof_schema_1_validator: Optional[conlist(conint(strict=True, le=255, ge=0), max_items=3, min_items=3)] = Field(None, description="RGB three element array with values 0-255.") diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/danish_pig.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/danish_pig.py index 0f9aa3c03c6..93e6105b2b2 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/danish_pig.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/danish_pig.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ import json from pydantic import BaseModel, Field, StrictInt, StrictStr class DanishPig(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DanishPig """ class_name: StrictStr = Field(..., alias="className") size: StrictInt = ... diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/deprecated_object.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/deprecated_object.py index 40e4919b342..870fec8e859 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/deprecated_object.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/deprecated_object.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class DeprecatedObject(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DeprecatedObject """ name: Optional[StrictStr] = None additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dog.py index 9465c10bfdc..eb6510a7a17 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dog.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dog.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, StrictStr from petstore_api.models.animal import Animal class Dog(Animal): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Dog """ breed: Optional[StrictStr] = None additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dog_all_of.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dog_all_of.py index 526dd6c3578..50b2b59ac0f 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dog_all_of.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dog_all_of.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class DogAllOf(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DogAllOf """ breed: Optional[StrictStr] = None additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dummy_model.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dummy_model.py index ef11b61a2ea..d0db2bdc188 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dummy_model.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/dummy_model.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class DummyModel(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + DummyModel """ category: Optional[StrictStr] = None self_ref: Optional[SelfReferenceModel] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_arrays.py index b1754281dee..0c096aa0fc8 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_arrays.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import List, Optional from pydantic import BaseModel, StrictStr, conlist, validator class EnumArrays(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + EnumArrays """ just_symbol: Optional[StrictStr] = None array_enum: Optional[conlist(StrictStr)] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_class.py index 9fd2fcc13cd..8f013917f4c 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_class.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class EnumClass(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + EnumClass """ """ allowed enum values """ - ABC = '_abc' MINUS_EFG = '-efg' LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS = '(xyz)' diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py index ab30c140963..8a562bd0941 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -25,10 +27,8 @@ from petstore_api.models.outer_enum_integer import OuterEnumInteger from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue class EnumTest(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + EnumTest """ enum_string: Optional[StrictStr] = None enum_string_required: StrictStr = ... diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/file.py index 6217ee78824..182d9cd0fc0 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/file.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/file.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class File(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Must be named `File` for test. """ source_uri: Optional[StrictStr] = Field(None, alias="sourceURI", description="Test capitalization") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/file_schema_test_class.py index 7e8f5b1cc34..f822f4599b3 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/file_schema_test_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, conlist from petstore_api.models.file import File class FileSchemaTestClass(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + FileSchemaTestClass """ file: Optional[File] = None files: Optional[conlist(File)] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/foo.py index bcb183fae04..7a29b7f5728 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/foo.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/foo.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class Foo(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Foo """ bar: Optional[StrictStr] = 'bar' additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/foo_get_default_response.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/foo_get_default_response.py index 0cb3f6286e1..99b2dca4723 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/foo_get_default_response.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/foo_get_default_response.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel from petstore_api.models.foo import Foo class FooGetDefaultResponse(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + FooGetDefaultResponse """ string: Optional[Foo] = None additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py index 30a49901824..1aab1462bd8 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictBytes, StrictInt, StrictStr, condecimal, confloat, conint, constr, validator class FormatTest(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + FormatTest """ integer: Optional[conint(strict=True, le=100, ge=10)] = None int32: Optional[conint(strict=True, le=200, ge=20)] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/has_only_read_only.py index 9a236e34bf1..6207f7f2ece 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/has_only_read_only.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class HasOnlyReadOnly(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + HasOnlyReadOnly """ bar: Optional[StrictStr] = None foo: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/health_check_result.py index d6d2aca0baa..df9fe934a8d 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/health_check_result.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class HealthCheckResult(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. """ nullable_message: Optional[StrictStr] = Field(None, alias="NullableMessage") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/list.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/list.py index bd0b49bc447..27daff87ea4 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/list.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/list.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictStr class List(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + List """ var_123_list: Optional[StrictStr] = Field(None, alias="123-list") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/map_test.py index 679a29dc053..9d2d840b1f3 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/map_test.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Dict, Optional from pydantic import BaseModel, StrictBool, StrictStr, validator class MapTest(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + MapTest """ map_map_of_string: Optional[Dict[str, Dict[str, StrictStr]]] = None map_of_enum_string: Optional[Dict[str, StrictStr]] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py index 633dbf1da8d..b3b259b688f 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, Field, StrictStr from petstore_api.models.animal import Animal class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + MixedPropertiesAndAdditionalPropertiesClass """ uuid: Optional[StrictStr] = None date_time: Optional[datetime] = Field(None, alias="dateTime") diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/model200_response.py index c6f91f79c3f..30425febafa 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/model200_response.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/model200_response.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt, StrictStr class Model200Response(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Model for testing model name starting with number """ name: Optional[StrictInt] = None var_class: Optional[StrictStr] = Field(None, alias="class") diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/model_return.py index 53ffd8c2617..e26375be4f7 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/model_return.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/model_return.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt class ModelReturn(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Model for testing reserved words """ var_return: Optional[StrictInt] = Field(None, alias="return") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/name.py index 0c48837381d..08ad6361c5e 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/name.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/name.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt, StrictStr class Name(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Model for testing model name same as property name """ name: StrictInt = ... snake_case: Optional[StrictInt] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/nullable_class.py index d3e41b7fa00..5ead496e689 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/nullable_class.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Any, Dict, List, Optional from pydantic import BaseModel, StrictBool, StrictFloat, StrictInt, StrictStr, conlist class NullableClass(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + NullableClass """ required_integer_prop: Optional[StrictInt] = ... integer_prop: Optional[StrictInt] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/number_only.py index 563edbe9c86..65809405f19 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/number_only.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/number_only.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictFloat class NumberOnly(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + NumberOnly """ just_number: Optional[StrictFloat] = Field(None, alias="JustNumber") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/object_with_deprecated_fields.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/object_with_deprecated_fields.py index 7f4fef2a658..7904c259858 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/object_with_deprecated_fields.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/object_with_deprecated_fields.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, Field, StrictFloat, StrictStr, conlist from petstore_api.models.deprecated_object import DeprecatedObject class ObjectWithDeprecatedFields(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ObjectWithDeprecatedFields """ uuid: Optional[StrictStr] = None id: Optional[StrictFloat] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/order.py index ff917f3ff06..a6866f134eb 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/order.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictBool, StrictInt, StrictStr, validator class Order(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Order """ id: Optional[StrictInt] = None pet_id: Optional[StrictInt] = Field(None, alias="petId") diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_composite.py index 609e6edc4f7..855fb1a585e 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_composite.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_composite.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictBool, StrictFloat, StrictStr class OuterComposite(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterComposite """ my_number: Optional[StrictFloat] = None my_string: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum.py index 179e822d35d..befbdfdaa67 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class OuterEnum(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterEnum """ """ allowed enum values """ - PLACED = 'placed' APPROVED = 'approved' DELIVERED = 'delivered' diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_default_value.py index 4a93cbda580..b8937b43c42 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_default_value.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_default_value.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class OuterEnumDefaultValue(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterEnumDefaultValue """ """ allowed enum values """ - PLACED = 'placed' APPROVED = 'approved' DELIVERED = 'delivered' diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_integer.py index 4a4347e3106..72aa99814d4 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_integer.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_integer.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class OuterEnumInteger(int, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterEnumInteger """ """ allowed enum values """ - NUMBER_0 = 0 NUMBER_1 = 1 NUMBER_2 = 2 diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_integer_default_value.py index b0e86076d16..09a945f73c3 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_integer_default_value.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_enum_integer_default_value.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class OuterEnumIntegerDefaultValue(int, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterEnumIntegerDefaultValue """ """ allowed enum values """ - NUMBER_0 = 0 NUMBER_1 = 1 NUMBER_2 = 2 diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_object_with_enum_property.py index 049fa5026e7..28a7bd69b9d 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_object_with_enum_property.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -23,10 +25,8 @@ from petstore_api.models.outer_enum import OuterEnum from petstore_api.models.outer_enum_integer import OuterEnumInteger class OuterObjectWithEnumProperty(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + OuterObjectWithEnumProperty """ str_value: Optional[OuterEnum] = None value: OuterEnumInteger = ... diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pet.py index de8df07a07f..a23db1e79b4 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pet.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -23,10 +25,8 @@ from petstore_api.models.category import Category from petstore_api.models.tag import Tag class Pet(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Pet """ id: Optional[StrictInt] = None category: Optional[Category] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pig.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pig.py index 0799371faa4..66cebdd798c 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pig.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pig.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -26,10 +28,8 @@ from pydantic import StrictStr, Field PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"] class Pig(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Pig """ # data type: BasquePig oneof_schema_1_validator: Optional[BasquePig] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/read_only_first.py index 5323927c4c3..73a9c98aec4 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/read_only_first.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/read_only_first.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictStr class ReadOnlyFirst(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + ReadOnlyFirst """ bar: Optional[StrictStr] = None baz: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/self_reference_model.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/self_reference_model.py index c97efa222a4..faca1f2f565 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/self_reference_model.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/self_reference_model.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt class SelfReferenceModel(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SelfReferenceModel """ size: Optional[StrictInt] = None nested: Optional[DummyModel] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/single_ref_type.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/single_ref_type.py index 67ae5e41be3..e5879e62968 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/single_ref_type.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/single_ref_type.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class SingleRefType(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SingleRefType """ """ allowed enum values """ - ADMIN = 'admin' USER = 'user' diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_character_enum.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_character_enum.py index 374ac242de6..8ecf8ac3d69 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_character_enum.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_character_enum.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -20,16 +22,13 @@ from aenum import Enum, no_arg class SpecialCharacterEnum(str, Enum): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SpecialCharacterEnum """ """ allowed enum values """ - ENUM_456 = '456' ENUM_123ABC = '123abc' UNDERSCORE = '_' diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_model_name.py index aeb308dd45b..0f7f93facf7 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_model_name.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_model_name.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt class SpecialModelName(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SpecialModelName """ special_property_name: Optional[StrictInt] = Field(None, alias="$special[property.name]") additional_properties: Dict[str, Any] = {} diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_name.py index bd3b377e886..58e7a590478 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_name.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, Field, StrictInt, StrictStr, validator from petstore_api.models.category import Category class SpecialName(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + SpecialName """ var_property: Optional[StrictInt] = Field(None, alias="property") var_async: Optional[Category] = Field(None, alias="async") diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/tag.py index b3af7e9e49c..4b01f942e82 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/tag.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/tag.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, StrictInt, StrictStr class Tag(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + Tag """ id: Optional[StrictInt] = None name: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/user.py index 6426d6c8aee..c52f49d337a 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/user.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/user.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -21,10 +23,8 @@ from typing import Optional from pydantic import BaseModel, Field, StrictInt, StrictStr class User(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + User """ id: Optional[StrictInt] = None username: Optional[StrictStr] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/with_nested_one_of.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/with_nested_one_of.py index 0e80a8a9020..52a535dcef2 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/with_nested_one_of.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/with_nested_one_of.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -22,10 +24,8 @@ from pydantic import BaseModel, StrictInt from petstore_api.models.pig import Pig class WithNestedOneOf(BaseModel): - """NOTE: This class is auto generated by OpenAPI Generator. - Ref: https://openapi-generator.tech - - Do not edit the class manually. + """ + WithNestedOneOf """ size: Optional[StrictInt] = None nested_pig: Optional[Pig] = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/rest.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/rest.py index c2c0630f61f..c12ef1c6504 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/rest.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/rest.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/signing.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/signing.py index 5060f6edbcd..cc1a0c9d6f7 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/signing.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/signing.py @@ -4,7 +4,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ @@ -72,11 +74,6 @@ class HttpSigningConfiguration(object): and optionally the body of the HTTP request, then signing the hash value using a private key. The 'Authorization' header is added to outbound HTTP requests. - NOTE: This class is auto generated by OpenAPI Generator - - Ref: https://openapi-generator.tech - Do not edit the class manually. - :param key_id: A string value specifying the identifier of the cryptographic key, when signing HTTP requests. :param signing_scheme: A string value specifying the signature scheme, when diff --git a/samples/openapi3/client/petstore/python-nextgen/setup.py b/samples/openapi3/client/petstore/python-nextgen/setup.py index cfffce8e317..e1bff332d2b 100755 --- a/samples/openapi3/client/petstore/python-nextgen/setup.py +++ b/samples/openapi3/client/petstore/python-nextgen/setup.py @@ -6,7 +6,9 @@ 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 + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. """ diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_api_client.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_api_client.py index 2a9bbc69510..318545d6e8f 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_api_client.py @@ -4,9 +4,9 @@ """ Run the tests. -$ pip install nose (optional) +$ pip install -U pytest $ cd OpenAPIetstore-python -$ nosetests -v +$ pytest """ import os diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_api_exception.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_api_exception.py index d517910174c..73915b0d5fc 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_api_exception.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_api_exception.py @@ -4,9 +4,9 @@ """ Run the tests. -$ pip install nose (optional) +$ pip install -U pytest $ cd petstore_api-python -$ nosetests -v +$ pytest """ import os diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_api_validation.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_api_validation.py index b42e6e50179..dc7da96329c 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_api_validation.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_api_validation.py @@ -4,9 +4,9 @@ """ Run the tests. -$ pip install nose (optional) +$ pip install -U pytest $ cd petstore_api-python -$ nosetests -v +$ pytest """ import os diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_configuration.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_configuration.py index 21ab0219e01..df5f4f3b106 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_configuration.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_configuration.py @@ -4,9 +4,9 @@ """ Run the tests. -$ pip install nose (optional) +$ pip install -U pytest $ cd petstore_api-python -$ nosetests -v +$ pytest """ from __future__ import absolute_import diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_deserialization.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_deserialization.py index 213e7000f63..c5fb6866382 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_deserialization.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_deserialization.py @@ -4,9 +4,9 @@ """ Run the tests. -$ pip install nose (optional) +$ pip install -U pytest $ cd OpenAPIPetstore-python -$ nosetests -v +$ pytest """ from collections import namedtuple import json diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_map_test.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_map_test.py index 4b2c6d5069e..8c0cb48f432 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_map_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_map_test.py @@ -4,9 +4,9 @@ """ Run the tests. -$ pip install nose (optional) +$ pip install -U pytest $ cd petstore_api-python -$ nosetests -v +$ pytest """ import os diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_pet_api.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_pet_api.py index 60302f0a776..073e5e5c6f2 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_pet_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_pet_api.py @@ -6,9 +6,9 @@ Run the tests. $ docker pull swaggerapi/petstore $ docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore -$ pip install nose (optional) +$ pip install -U pytest $ cd petstore_api-python -$ nosetests -v +$ pytest """ import os diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_store_api.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_store_api.py index 1817477aba6..178e44fd1fe 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_store_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_store_api.py @@ -4,9 +4,9 @@ """ Run the tests. -$ pip install nose (optional) +$ pip install -U pytest $ cd OpenAP/Petstore-python -$ nosetests -v +$ pytest """ import os From 70faa6b15c1084ee1bb5cc5526c9340fa544e2f6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 7 Mar 2023 00:35:34 +0800 Subject: [PATCH 005/131] better support of allOf with 1 sub-schema (#14882) --- .../openapitools/codegen/DefaultCodegen.java | 31 +++++++++++ .../codegen/utils/ModelUtils.java | 51 +++++++++++++++++++ .../codegen/DefaultCodegenTest.java | 25 +++++++++ .../test/resources/3_0/issue-5676-enums.yaml | 5 ++ .../builds/enum/apis/DefaultApi.ts | 22 +++++++- .../with-string-enums/apis/DefaultApi.ts | 22 +++++++- 6 files changed, 152 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 40ff3a93ad7..aad7d5946d5 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 @@ -3764,6 +3764,18 @@ public class DefaultCodegen implements CodegenConfig { return cpc; } + Schema original = null; + // check if it's allOf (only 1 sub schema) with default/nullable/etc set in the top level + if (ModelUtils.isAllOf(p) && p.getAllOf().size() == 1 && ModelUtils.hasCommonAttributesDefined(p) ) { + if (p.getAllOf().get(0) instanceof Schema) { + original = p; + p = (Schema) p.getAllOf().get(0); + } else { + LOGGER.error("Unknown type in allOf schema. Please report the issue via openapi-generator's Github issue tracker."); + } + + } + CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY); if (p.equals(trueSchema)) { property.setIsBooleanSchemaTrue(true); @@ -3957,6 +3969,25 @@ public class DefaultCodegen implements CodegenConfig { property.isModel = (ModelUtils.isComposedSchema(referencedSchema) || ModelUtils.isObjectSchema(referencedSchema)) && ModelUtils.isModel(referencedSchema); } + // restore original schema with default value, nullable, readonly etc + if (original != null) { + p = original; + // evaluate common attributes defined in the top level + if (p.getNullable() != null) { + property.isNullable = p.getNullable(); + } else if (p.getExtensions() != null && p.getExtensions().containsKey("x-nullable")) { + property.isNullable = (Boolean) p.getExtensions().get("x-nullable"); + } + + if (p.getReadOnly() != null) { + property.isReadOnly = p.getReadOnly(); + } + + if (p.getWriteOnly() != null) { + property.isWriteOnly = p.getWriteOnly(); + } + } + // set the default value property.defaultValue = toDefaultValue(property, p); property.defaultValueWithParam = toDefaultValueWithParam(name, p); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 11c08308542..580e53121e5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -1852,4 +1852,55 @@ public class ModelUtils { return new SemVer(version); } + + /** + * Returns true if the schema contains allOf but + * no properties/oneOf/anyOf defined. + * + * @param schema the schema + * @return true if the schema contains allOf but no properties/oneOf/anyOf defined. + */ + public static boolean isAllOf(Schema schema) { + if (hasAllOf(schema) && (schema.getProperties() == null || schema.getProperties().isEmpty()) && + (schema.getOneOf() == null || schema.getOneOf().isEmpty()) && + (schema.getAnyOf() == null || schema.getAnyOf().isEmpty())) { + return true; + } + + return false; + } + + /** + * Returns true if the schema contains allOf and may or may not have + * properties/oneOf/anyOf defined. + * + * @param schema the schema + * @return true if allOf is not empty + */ + public static boolean hasAllOf(Schema schema) { + if (schema.getAllOf() != null && !schema.getAllOf().isEmpty()) { + return true; + } + + return false; + } + + /** + * Returns true if any of the common attributes of the schema (e.g. readOnly, default, maximum, etc) is defined. + * + * @param schema the schema + * @return true if allOf is not empty + */ + public static boolean hasCommonAttributesDefined(Schema schema) { + if (schema.getNullable() != null || schema.getDefault() != null || + schema.getMinimum() != null || schema.getMinimum() != null || + schema.getExclusiveMaximum() != null || schema.getExclusiveMinimum() != null || + schema.getMinLength() != null || schema.getMaxLength() != null || + schema.getMinItems() != null || schema.getMaxItems() != null || + schema.getReadOnly() != null || schema.getWriteOnly() != null) { + return true; + } + + return false; + } } 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 9308bb14df3..383924cb627 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 @@ -4294,6 +4294,31 @@ public class DefaultCodegenTest { Assert.assertFalse(referencedEnumSchemaProperty.isPrimitiveType); } + @Test + public void testAllOfDefaultEnumType() { + // test allOf with a single sub-schema and default value set in the top level + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue-5676-enums.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + String modelName = "EnumPatternObject"; + + Schema schemaWithReferencedEnum = openAPI.getComponents().getSchemas().get(modelName); + CodegenModel modelWithReferencedSchema = codegen.fromModel(modelName, schemaWithReferencedEnum); + CodegenProperty defaultEnumSchemaProperty = modelWithReferencedSchema.vars.get(4); + + Assert.assertNotNull(schemaWithReferencedEnum); + Assert.assertTrue(modelWithReferencedSchema.hasEnums); + Assert.assertEquals(defaultEnumSchemaProperty.getName(), "defaultMinusnumberMinusenum"); + Assert.assertFalse(defaultEnumSchemaProperty.isEnum); + Assert.assertTrue(defaultEnumSchemaProperty.getIsEnumOrRef()); + Assert.assertTrue(defaultEnumSchemaProperty.isEnumRef); + Assert.assertFalse(defaultEnumSchemaProperty.isInnerEnum); + Assert.assertFalse(defaultEnumSchemaProperty.isString); + Assert.assertFalse(defaultEnumSchemaProperty.isContainer); + Assert.assertFalse(defaultEnumSchemaProperty.isPrimitiveType); + Assert.assertEquals(defaultEnumSchemaProperty.defaultValue, "2"); + } + @Test public void testInlineEnumType() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue-5676-enums.yaml"); diff --git a/modules/openapi-generator/src/test/resources/3_0/issue-5676-enums.yaml b/modules/openapi-generator/src/test/resources/3_0/issue-5676-enums.yaml index 23cdfdc053b..cbfa2e6000e 100644 --- a/modules/openapi-generator/src/test/resources/3_0/issue-5676-enums.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/issue-5676-enums.yaml @@ -211,3 +211,8 @@ components: nullable: true allOf: - $ref: "#/components/schemas/NumberEnum" + default-number-enum: + default: 2 + allOf: + - $ref: "#/components/schemas/NumberEnum" + diff --git a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts index ee616abdf8f..fa1d5875027 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts @@ -33,9 +33,9 @@ import { export interface FakeEnumRequestGetInlineRequest { stringEnum?: FakeEnumRequestGetInlineStringEnumEnum; - nullableStringEnum?: string | null; + nullableStringEnum?: FakeEnumRequestGetInlineNullableStringEnumEnum; numberEnum?: FakeEnumRequestGetInlineNumberEnumEnum; - nullableNumberEnum?: number | null; + nullableNumberEnum?: FakeEnumRequestGetInlineNullableNumberEnumEnum; } export interface FakeEnumRequestGetRefRequest { @@ -203,6 +203,15 @@ export const FakeEnumRequestGetInlineStringEnumEnum = { Three: 'three' } as const; export type FakeEnumRequestGetInlineStringEnumEnum = typeof FakeEnumRequestGetInlineStringEnumEnum[keyof typeof FakeEnumRequestGetInlineStringEnumEnum]; +/** + * @export + */ +export const FakeEnumRequestGetInlineNullableStringEnumEnum = { + One: 'one', + Two: 'two', + Three: 'three' +} as const; +export type FakeEnumRequestGetInlineNullableStringEnumEnum = typeof FakeEnumRequestGetInlineNullableStringEnumEnum[keyof typeof FakeEnumRequestGetInlineNullableStringEnumEnum]; /** * @export */ @@ -212,3 +221,12 @@ export const FakeEnumRequestGetInlineNumberEnumEnum = { NUMBER_3: 3 } as const; export type FakeEnumRequestGetInlineNumberEnumEnum = typeof FakeEnumRequestGetInlineNumberEnumEnum[keyof typeof FakeEnumRequestGetInlineNumberEnumEnum]; +/** + * @export + */ +export const FakeEnumRequestGetInlineNullableNumberEnumEnum = { + NUMBER_1: 1, + NUMBER_2: 2, + NUMBER_3: 3 +} as const; +export type FakeEnumRequestGetInlineNullableNumberEnumEnum = typeof FakeEnumRequestGetInlineNullableNumberEnumEnum[keyof typeof FakeEnumRequestGetInlineNullableNumberEnumEnum]; diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts index 53db124d121..a6f4fa649ac 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts @@ -33,9 +33,9 @@ import { export interface FakeEnumRequestGetInlineRequest { stringEnum?: FakeEnumRequestGetInlineStringEnumEnum; - nullableStringEnum?: string | null; + nullableStringEnum?: FakeEnumRequestGetInlineNullableStringEnumEnum; numberEnum?: FakeEnumRequestGetInlineNumberEnumEnum; - nullableNumberEnum?: number | null; + nullableNumberEnum?: FakeEnumRequestGetInlineNullableNumberEnumEnum; } export interface FakeEnumRequestGetRefRequest { @@ -203,6 +203,15 @@ export enum FakeEnumRequestGetInlineStringEnumEnum { Two = 'two', Three = 'three' } +/** + * @export + * @enum {string} + */ +export enum FakeEnumRequestGetInlineNullableStringEnumEnum { + One = 'one', + Two = 'two', + Three = 'three' +} /** * @export * @enum {string} @@ -212,3 +221,12 @@ export enum FakeEnumRequestGetInlineNumberEnumEnum { NUMBER_2 = 2, NUMBER_3 = 3 } +/** + * @export + * @enum {string} + */ +export enum FakeEnumRequestGetInlineNullableNumberEnumEnum { + NUMBER_1 = 1, + NUMBER_2 = 2, + NUMBER_3 = 3 +} From e38ea578f879d1a86972ee3c70dfc0d4e34e10eb Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 7 Mar 2023 15:53:53 +0800 Subject: [PATCH 006/131] Better support of inline allOf/anyOf/oneOf schemas (#14887) * better support of inilne allof schemas * add test file * better handling of anyof, oneof inline schemas * update samples * add tests for nested anyof * better code format --- .../codegen/InlineModelResolver.java | 29 +++--- .../codegen/utils/ModelUtils.java | 64 +++++++++++++ .../codegen/InlineModelResolverTest.java | 25 +++++ .../inline_model_allof_propertyof_oneof.yaml | 56 +++++++++++ .../src/test/resources/3_0/nested_anyof.yaml | 16 ++++ .../openapi-v3/.openapi-generator/FILES | 2 - .../rust-server/output/openapi-v3/README.md | 2 - .../output/openapi-v3/api/openapi.yaml | 24 ++--- .../output/openapi-v3/src/models.rs | 92 ------------------- 9 files changed, 188 insertions(+), 122 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline_model_allof_propertyof_oneof.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/nested_anyof.yaml diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java index f8b67f47cd7..1d11972b44d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java @@ -224,7 +224,7 @@ public class InlineModelResolver { } if (m.getAllOf() != null && !m.getAllOf().isEmpty()) { - // check to ensure at least of the allOf item is model + // check to ensure at least one of the allOf item is model for (Schema inner : m.getAllOf()) { if (isModelNeeded(ModelUtils.getReferencedSchema(openAPI, inner), visitedSchemas)) { return true; @@ -385,6 +385,7 @@ public class InlineModelResolver { } } m.setAnyOf(newAnyOf); + } if (m.getOneOf() != null) { List newOneOf = new ArrayList(); @@ -541,15 +542,15 @@ public class InlineModelResolver { * allOf: * - $ref: '#/components/schemas/Animal' * - type: object - * properties: - * name: - * type: string - * age: - * type: string + * properties: + * name: + * type: string + * age: + * type: string * - type: object - * properties: - * breed: - * type: string + * properties: + * breed: + * type: string * * @param key a unique name ofr the composed schema. * @param children the list of nested schemas within a composed schema (allOf, anyOf, oneOf). @@ -577,6 +578,8 @@ public class InlineModelResolver { // instead of inline. String innerModelName = resolveModelName(component.getTitle(), key); Schema innerModel = modelFromProperty(openAPI, component, innerModelName); + // Recurse to create $refs for inner models + gatherInlineModels(innerModel, innerModelName); String existing = matchGenerated(innerModel); if (existing == null) { innerModelName = addSchemas(innerModelName, innerModel); @@ -604,13 +607,17 @@ public class InlineModelResolver { List modelNames = new ArrayList(models.keySet()); for (String modelName : modelNames) { Schema model = models.get(modelName); - if (ModelUtils.isComposedSchema(model)) { + if (ModelUtils.isAnyOf(model)) { // contains anyOf only + gatherInlineModels(model, modelName); + } else if (ModelUtils.isOneOf(model)) { // contains oneOf only + gatherInlineModels(model, modelName); + } else if (ModelUtils.isComposedSchema(model)) { ComposedSchema m = (ComposedSchema) model; // inline child schemas flattenComposedChildren(modelName + "_allOf", m.getAllOf()); flattenComposedChildren(modelName + "_anyOf", m.getAnyOf()); flattenComposedChildren(modelName + "_oneOf", m.getOneOf()); - } else if (model instanceof Schema) { + } else { gatherInlineModels(model, modelName); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 580e53121e5..a392325eb81 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -1885,6 +1885,70 @@ public class ModelUtils { return false; } + /** + * Returns true if the schema contains oneOf but + * no properties/allOf/anyOf defined. + * + * @param schema the schema + * @return true if the schema contains oneOf but no properties/allOf/anyOf defined. + */ + public static boolean isOneOf(Schema schema) { + if (hasOneOf(schema) && (schema.getProperties() == null || schema.getProperties().isEmpty()) && + (schema.getAllOf() == null || schema.getAllOf().isEmpty()) && + (schema.getAnyOf() == null || schema.getAnyOf().isEmpty())) { + return true; + } + + return false; + } + + /** + * Returns true if the schema contains oneOf and may or may not have + * properties/allOf/anyOf defined. + * + * @param schema the schema + * @return true if allOf is not empty + */ + public static boolean hasOneOf(Schema schema) { + if (schema.getOneOf() != null && !schema.getOneOf().isEmpty()) { + return true; + } + + return false; + } + + /** + * Returns true if the schema contains anyOf but + * no properties/allOf/anyOf defined. + * + * @param schema the schema + * @return true if the schema contains oneOf but no properties/allOf/anyOf defined. + */ + public static boolean isAnyOf(Schema schema) { + if (hasAnyOf(schema) && (schema.getProperties() == null || schema.getProperties().isEmpty()) && + (schema.getAllOf() == null || schema.getAllOf().isEmpty()) && + (schema.getOneOf() == null || schema.getOneOf().isEmpty())) { + return true; + } + + return false; + } + + /** + * Returns true if the schema contains anyOf and may or may not have + * properties/allOf/oneOf defined. + * + * @param schema the schema + * @return true if anyOf is not empty + */ + public static boolean hasAnyOf(Schema schema) { + if (schema.getAnyOf() != null && !schema.getAnyOf().isEmpty()) { + return true; + } + + return false; + } + /** * Returns true if any of the common attributes of the schema (e.g. readOnly, default, maximum, etc) is defined. * diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java index f21dcb2202e..c34cd38df42 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -1103,4 +1103,29 @@ public class InlineModelResolverTest { //RequestBody referencedRequestBody = ModelUtils.getReferencedRequestBody(openAPI, requestBodyReference); //assertTrue(referencedRequestBody.getRequired()); } + + @Test + public void testInlineSchemaAllOfPropertyOfOneOf() { + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_allof_propertyof_oneof.yaml"); + InlineModelResolver resolver = new InlineModelResolver(); + resolver.flatten(openAPI); + + Schema schema = openAPI.getComponents().getSchemas().get("Order_allOf_inline_oneof"); + assertEquals(((Schema) schema.getOneOf().get(0)).get$ref(), "#/components/schemas/Tag"); + assertEquals(((Schema) schema.getOneOf().get(1)).get$ref(), "#/components/schemas/Filter"); + + Schema schema2 = openAPI.getComponents().getSchemas().get("Order_allOf_inline_model"); + assertTrue(schema2.getProperties().get("something") instanceof StringSchema); + } + + @Test + public void testNestedAnyOf() { + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/nested_anyof.yaml"); + InlineModelResolver resolver = new InlineModelResolver(); + resolver.flatten(openAPI); + + Schema schema = openAPI.getComponents().getSchemas().get("SomeData_anyOf"); + assertTrue((Schema) schema.getAnyOf().get(0) instanceof StringSchema); + assertTrue((Schema) schema.getAnyOf().get(1) instanceof IntegerSchema); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/inline_model_allof_propertyof_oneof.yaml b/modules/openapi-generator/src/test/resources/3_0/inline_model_allof_propertyof_oneof.yaml new file mode 100644 index 00000000000..c8869707fef --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline_model_allof_propertyof_oneof.yaml @@ -0,0 +1,56 @@ +openapi: 3.0.1 +info: + title: ping test + version: '1.0' +servers: + - url: 'http://localhost:8000/' +paths: + /ping: + get: + operationId: pingGet + responses: + '201': + description: OK +components: + schemas: + Order: + title: Pet Order + description: An order for a pets from the pet store + allOf: + - $ref: "#/components/schemas/Tag" + - type: object + properties: + length: + type: integer + format: int64 + shipDate: + type: string + format: date-time + inline_oneof: + oneOf: + - $ref: "#/components/schemas/Tag" + - $ref: "#/components/schemas/Filter" + inline_model: + properties: + something: + type: string + Tag: + title: Pet Tag + description: A tag for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + Filter: + title: Pet Tag + description: A tag for a pet + type: object + properties: + fid: + type: integer + format: int64 + fname: + type: string diff --git a/modules/openapi-generator/src/test/resources/3_0/nested_anyof.yaml b/modules/openapi-generator/src/test/resources/3_0/nested_anyof.yaml new file mode 100644 index 00000000000..da3c88bd038 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/nested_anyof.yaml @@ -0,0 +1,16 @@ +openapi: 3.0.0 +info: + version: '1.0.0' + title: 'Problem example with nested anyOf' +paths: {} +components: + schemas: + NullOne: + enum: + - null + SomeData: + anyOf: + - anyOf: + - type: string + - type: integer + - $ref: '#/components/schemas/NullOne' diff --git a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/FILES b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/FILES index b0d6b6c8395..995168af5ff 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/FILES +++ b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/FILES @@ -9,14 +9,12 @@ docs/AnotherXmlInner.md docs/AnotherXmlObject.md docs/AnyOfGet202Response.md docs/AnyOfObject.md -docs/AnyOfObjectAnyOf.md docs/AnyOfProperty.md docs/DuplicateXmlObject.md docs/EnumWithStarObject.md docs/Err.md docs/Error.md docs/Model12345AnyOfObject.md -docs/Model12345AnyOfObjectAnyOf.md docs/MultigetGet201Response.md docs/MyId.md docs/MyIdList.md diff --git a/samples/server/petstore/rust-server/output/openapi-v3/README.md b/samples/server/petstore/rust-server/output/openapi-v3/README.md index b5bbb27bdf3..fabb7795874 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/README.md +++ b/samples/server/petstore/rust-server/output/openapi-v3/README.md @@ -155,14 +155,12 @@ Method | HTTP request | Description - [AnotherXmlObject](docs/AnotherXmlObject.md) - [AnyOfGet202Response](docs/AnyOfGet202Response.md) - [AnyOfObject](docs/AnyOfObject.md) - - [AnyOfObjectAnyOf](docs/AnyOfObjectAnyOf.md) - [AnyOfProperty](docs/AnyOfProperty.md) - [DuplicateXmlObject](docs/DuplicateXmlObject.md) - [EnumWithStarObject](docs/EnumWithStarObject.md) - [Err](docs/Err.md) - [Error](docs/Error.md) - [Model12345AnyOfObject](docs/Model12345AnyOfObject.md) - - [Model12345AnyOfObjectAnyOf](docs/Model12345AnyOfObjectAnyOf.md) - [MultigetGet201Response](docs/MultigetGet201Response.md) - [MyId](docs/MyId.md) - [MyIdList](docs/MyIdList.md) diff --git a/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml b/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml index 43da25ffc94..10519bee5f9 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml +++ b/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml @@ -478,13 +478,20 @@ components: - requiredAnyOf AnyOfObject: anyOf: - - $ref: '#/components/schemas/AnyOfObject_anyOf' + - enum: + - FOO + - BAR + type: string - description: Alternate option type: string description: Test a model containing an anyOf "12345AnyOfObject": anyOf: - - $ref: '#/components/schemas/_12345AnyOfObject_anyOf' + - enum: + - FOO + - BAR + - '*' + type: string - description: Alternate option type: string description: Test a model containing an anyOf that starts with a number @@ -678,19 +685,6 @@ components: anyOf: - $ref: '#/components/schemas/StringObject' - $ref: '#/components/schemas/UuidObject' - AnyOfObject_anyOf: - enum: - - FOO - - BAR - type: string - example: null - _12345AnyOfObject_anyOf: - enum: - - FOO - - BAR - - '*' - type: string - example: null securitySchemes: authScheme: flows: diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs index 4ffae09b4e1..f3ea23bb3b7 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs @@ -638,50 +638,6 @@ impl AnyOfObject { } } -/// Enumeration of values. -/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]` -/// which helps with FFI. -#[allow(non_camel_case_types)] -#[repr(C)] -#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)] -#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))] -pub enum AnyOfObjectAnyOf { - #[serde(rename = "FOO")] - Foo, - #[serde(rename = "BAR")] - Bar, -} - -impl std::fmt::Display for AnyOfObjectAnyOf { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match *self { - AnyOfObjectAnyOf::Foo => write!(f, "FOO"), - AnyOfObjectAnyOf::Bar => write!(f, "BAR"), - } - } -} - -impl std::str::FromStr for AnyOfObjectAnyOf { - type Err = String; - - fn from_str(s: &str) -> std::result::Result { - match s { - "FOO" => std::result::Result::Ok(AnyOfObjectAnyOf::Foo), - "BAR" => std::result::Result::Ok(AnyOfObjectAnyOf::Bar), - _ => std::result::Result::Err(format!("Value not valid: {}", s)), - } - } -} - -impl AnyOfObjectAnyOf { - /// Helper function to allow us to convert this model to an XML string. - /// Will panic if serialisation fails. - #[allow(dead_code)] - pub(crate) fn as_xml(&self) -> String { - serde_xml_rs::to_string(&self).expect("impossible to fail to serialize") - } -} - /// Test containing an anyOf object #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))] @@ -1242,54 +1198,6 @@ impl Model12345AnyOfObject { } } -/// Enumeration of values. -/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]` -/// which helps with FFI. -#[allow(non_camel_case_types)] -#[repr(C)] -#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)] -#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))] -pub enum Model12345AnyOfObjectAnyOf { - #[serde(rename = "FOO")] - Foo, - #[serde(rename = "BAR")] - Bar, - #[serde(rename = "*")] - Star, -} - -impl std::fmt::Display for Model12345AnyOfObjectAnyOf { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match *self { - Model12345AnyOfObjectAnyOf::Foo => write!(f, "FOO"), - Model12345AnyOfObjectAnyOf::Bar => write!(f, "BAR"), - Model12345AnyOfObjectAnyOf::Star => write!(f, "*"), - } - } -} - -impl std::str::FromStr for Model12345AnyOfObjectAnyOf { - type Err = String; - - fn from_str(s: &str) -> std::result::Result { - match s { - "FOO" => std::result::Result::Ok(Model12345AnyOfObjectAnyOf::Foo), - "BAR" => std::result::Result::Ok(Model12345AnyOfObjectAnyOf::Bar), - "*" => std::result::Result::Ok(Model12345AnyOfObjectAnyOf::Star), - _ => std::result::Result::Err(format!("Value not valid: {}", s)), - } - } -} - -impl Model12345AnyOfObjectAnyOf { - /// Helper function to allow us to convert this model to an XML string. - /// Will panic if serialisation fails. - #[allow(dead_code)] - pub(crate) fn as_xml(&self) -> String { - serde_xml_rs::to_string(&self).expect("impossible to fail to serialize") - } -} - #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))] pub struct MultigetGet201Response { From 4ed3cd92335ec9ca3cb13471eb9b0cc2112469c7 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 7 Mar 2023 21:46:11 +0800 Subject: [PATCH 007/131] add new openapi-normalizer rule: ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE (#14891) --- docs/customization.md | 7 ++ .../codegen/OpenAPINormalizer.java | 45 +++++++++++ .../codegen/DefaultCodegenTest.java | 26 +++++++ ...gnedToIntegerWithInvalidMaxValue_test.yaml | 75 +++++++++++++++++++ 4 files changed, 153 insertions(+) create mode 100644 modules/openapi-generator/src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml diff --git a/docs/customization.md b/docs/customization.md index f9be18ff07f..90676792631 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -505,3 +505,10 @@ Example: ``` java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml -o /tmp/java-okhttp/ --openapi-normalizer SET_TAGS_FOR_ALL_OPERATIONS=true ``` + +- `ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE`: when set to true, auto fix integer with maximum value 4294967295 (2^32-1) or long with 18446744073709551615 (2^64-1) by adding x-unsigned to the schema + +Example: +``` +java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml -o /tmp/java-okhttp/ --openapi-normalizer ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE=true +``` diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index 3e883e47b18..c11f296d237 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -76,6 +76,11 @@ public class OpenAPINormalizer { final String SET_TAGS_FOR_ALL_OPERATIONS = "SET_TAGS_FOR_ALL_OPERATIONS"; String setTagsForAllOperations; + // when set to true, auto fix integer with maximum value 4294967295 (2^32-1) or long with 18446744073709551615 (2^64-1) + // by adding x-unsigned to the schema + final String ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE = "ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE"; + boolean addUnsignedToIntegerWithInvalidMaxValue; + // ============= end of rules ============= /** @@ -132,6 +137,9 @@ public class OpenAPINormalizer { setTagsForAllOperations = rules.get(SET_TAGS_FOR_ALL_OPERATIONS); } + if (enableAll || "true".equalsIgnoreCase(rules.get(ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE))) { + addUnsignedToIntegerWithInvalidMaxValue = true; + } } /** @@ -367,6 +375,8 @@ public class OpenAPINormalizer { normalizeProperties(schema.getProperties(), visitedSchemas); } else if (schema instanceof BooleanSchema) { normalizeBooleanSchema(schema, visitedSchemas); + } else if (schema instanceof IntegerSchema) { + normalizeIntegerSchema(schema, visitedSchemas); } else if (schema instanceof Schema) { normalizeSchemaWithOnlyProperties(schema, visitedSchemas); } else { @@ -380,6 +390,10 @@ public class OpenAPINormalizer { processSimplifyBooleanEnum(schema); } + private void normalizeIntegerSchema(Schema schema, Set visitedSchemas) { + processAddUnsignedToIntegerWithInvalidMaxValue(schema); + } + private void normalizeSchemaWithOnlyProperties(Schema schema, Set visitedSchemas) { // normalize non-composed schema (e.g. schema with only properties) } @@ -675,5 +689,36 @@ public class OpenAPINormalizer { } } + /** + * If the schema is integer and the max value is invalid (out of bound) + * then add x-unsigned to use unsigned integer/long instead. + * + * @param schema Schema + * @return Schema + */ + private void processAddUnsignedToIntegerWithInvalidMaxValue(Schema schema) { + if (!addUnsignedToIntegerWithInvalidMaxValue && !enableAll) { + return; + } + + LOGGER.info("processAddUnsignedToIntegerWithInvalidMaxValue"); + if (schema instanceof IntegerSchema) { + if (ModelUtils.isLongSchema(schema)) { + if ("18446744073709551615".equals(String.valueOf(schema.getMaximum())) && + "0".equals(String.valueOf(schema.getMinimum()))) { + schema.addExtension("x-unsigned", true); + LOGGER.info("fix long"); + } + } else { + if ("4294967295".equals(String.valueOf(schema.getMaximum())) && + "0".equals(String.valueOf(schema.getMinimum()))) { + schema.addExtension("x-unsigned", true); + LOGGER.info("fix integer"); + + } + } + } + } + // ===================== end of rules ===================== } 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 383924cb627..b393608b626 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 @@ -4496,4 +4496,30 @@ public class DefaultCodegenTest { assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().get(0), "core"); assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().get(0), "core"); } + + @Test + public void testAddUnsignedToIntegerWithInvalidMaxValue() { + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml"); + + Schema person = openAPI.getComponents().getSchemas().get("Person"); + assertNull(((Schema)person.getProperties().get("integer")).getExtensions()); + assertNull(((Schema)person.getProperties().get("int32")).getExtensions()); + assertNull(((Schema)person.getProperties().get("int64")).getExtensions()); + assertNull(((Schema)person.getProperties().get("integer_max")).getExtensions()); + assertNull(((Schema)person.getProperties().get("int32_max")).getExtensions()); + assertNull(((Schema)person.getProperties().get("int64_max")).getExtensions()); + + Map options = new HashMap<>(); + options.put("ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema person2 = openAPI.getComponents().getSchemas().get("Person"); + assertNull(((Schema)person2.getProperties().get("integer")).getExtensions()); + assertNull(((Schema)person2.getProperties().get("int32")).getExtensions()); + assertNull(((Schema)person2.getProperties().get("int64")).getExtensions()); + assertTrue((Boolean)((Schema)person2.getProperties().get("integer_max")).getExtensions().get("x-unsigned")); + assertTrue((Boolean)((Schema)person2.getProperties().get("int32_max")).getExtensions().get("x-unsigned")); + assertTrue((Boolean)((Schema)person2.getProperties().get("int64_max")).getExtensions().get("x-unsigned")); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml b/modules/openapi-generator/src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml new file mode 100644 index 00000000000..081d96a9013 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml @@ -0,0 +1,75 @@ +openapi: 3.0.1 +info: + version: 1.0.0 + title: Example + license: + name: MIT +servers: + - url: http://api.example.xyz/v1 +paths: + /person/display/{personId}: + get: + tags: + - person + - basic + parameters: + - name: personId + in: path + required: true + description: The id of the person to retrieve + schema: + type: string + operationId: list + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: "#/components/schemas/Person" + delete: + tags: + - person + parameters: + - name: personId + in: path + required: true + description: The id of the person to retrieve + schema: + type: string + operationId: delete + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: "#/components/schemas/Person" +components: + schemas: + Person: + description: person + type: object + properties: + integer: + type: integer + int32: + type: integer + format: int32 + int64: + type: integer + format: int64 + integer_max: + type: integer + minimum: 0 + maximum: 4294967295 #(2^32)-1 + int32_max: + type: integer + format: int32 + minimum: 0 + maximum: 4294967295 #(2^32)-1 + int64_max: + type: integer + format: int64 + minimum: 0 + maximum: 18446744073709551615 #(2^64)-1 From c81ff5801d0af944a3012a85e4e47d0813484b6f Mon Sep 17 00:00:00 2001 From: Volker Suschke Date: Tue, 7 Mar 2023 17:23:46 +0100 Subject: [PATCH 008/131] [Kotlin-Spring] Remove wildcard imports from mustache templates [#14652] (#14899) * [Kotlin-Spring] Remove wildcard imports from mustache templates [#14652] * [Kotlin-Spring] Update sample files [#14652] --- .../src/main/resources/kotlin-spring/api.mustache | 9 ++++++++- .../main/resources/kotlin-spring/apiInterface.mustache | 9 ++++++++- .../src/main/resources/kotlin-spring/model.mustache | 9 ++++++++- .../main/kotlin/org/openapitools/api/PetApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/UserApiController.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Category.kt | 9 ++++++++- .../kotlin/org/openapitools/model/ModelApiResponse.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Order.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Tag.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/User.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/api/PetApi.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/api/StoreApi.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/api/UserApi.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Category.kt | 9 ++++++++- .../kotlin/org/openapitools/model/ModelApiResponse.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Order.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Tag.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/User.kt | 9 ++++++++- .../main/kotlin/org/openapitools/api/PetApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/UserApiController.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Category.kt | 9 ++++++++- .../kotlin/org/openapitools/model/ModelApiResponse.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Order.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Tag.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/User.kt | 9 ++++++++- .../main/kotlin/org/openapitools/api/PetApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/UserApiController.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Category.kt | 9 ++++++++- .../kotlin/org/openapitools/model/ModelApiResponse.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Order.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Tag.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/User.kt | 9 ++++++++- .../main/kotlin/org/openapitools/api/PetApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/UserApiController.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Category.kt | 9 ++++++++- .../kotlin/org/openapitools/model/ModelApiResponse.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Order.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Tag.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/User.kt | 9 ++++++++- .../main/kotlin/org/openapitools/api/PetApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/UserApiController.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Category.kt | 9 ++++++++- .../kotlin/org/openapitools/model/ModelApiResponse.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Order.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Tag.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/User.kt | 9 ++++++++- .../main/kotlin/org/openapitools/api/PetApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/UserApiController.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Category.kt | 9 ++++++++- .../kotlin/org/openapitools/model/ModelApiResponse.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Order.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Tag.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/User.kt | 9 ++++++++- .../main/kotlin/org/openapitools/api/PetApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../kotlin/org/openapitools/api/UserApiController.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Category.kt | 9 ++++++++- .../kotlin/org/openapitools/model/ModelApiResponse.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Order.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/Tag.kt | 9 ++++++++- .../src/main/kotlin/org/openapitools/model/User.kt | 9 ++++++++- 75 files changed, 600 insertions(+), 75 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index 3369278f313..78dd8f8743c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -30,8 +30,15 @@ import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired {{#useBeanValidation}} -import {{javaxPackage}}.validation.constraints.* import {{javaxPackage}}.validation.Valid +import {{javaxPackage}}.validation.constraints.DecimalMax +import {{javaxPackage}}.validation.constraints.DecimalMin +import {{javaxPackage}}.validation.constraints.Email +import {{javaxPackage}}.validation.constraints.Max +import {{javaxPackage}}.validation.constraints.Min +import {{javaxPackage}}.validation.constraints.NotNull +import {{javaxPackage}}.validation.constraints.Pattern +import {{javaxPackage}}.validation.constraints.Size {{/useBeanValidation}} {{#reactive}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index 558ef8b5fea..25c2fca6c56 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -35,7 +35,14 @@ import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired {{#useBeanValidation}} -import {{javaxPackage}}.validation.constraints.* +import {{javaxPackage}}.validation.constraints.DecimalMax +import {{javaxPackage}}.validation.constraints.DecimalMin +import {{javaxPackage}}.validation.constraints.Email +import {{javaxPackage}}.validation.constraints.Max +import {{javaxPackage}}.validation.constraints.Min +import {{javaxPackage}}.validation.constraints.NotNull +import {{javaxPackage}}.validation.constraints.Pattern +import {{javaxPackage}}.validation.constraints.Size import {{javaxPackage}}.validation.Valid {{/useBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache index f2707f7eecc..f6005b5340f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache @@ -4,7 +4,14 @@ import java.util.Objects {{#imports}}import {{import}} {{/imports}} {{#useBeanValidation}} -import {{javaxPackage}}.validation.constraints.* +import {{javaxPackage}}.validation.constraints.DecimalMax +import {{javaxPackage}}.validation.constraints.DecimalMin +import {{javaxPackage}}.validation.constraints.Email +import {{javaxPackage}}.validation.constraints.Max +import {{javaxPackage}}.validation.constraints.Min +import {{javaxPackage}}.validation.constraints.NotNull +import {{javaxPackage}}.validation.constraints.Pattern +import {{javaxPackage}}.validation.constraints.Size import {{javaxPackage}}.validation.Valid {{/useBeanValidation}} {{#swagger2AnnotationLibrary}} diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt index 3ba8bf11515..7269bef2cff 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -11,8 +11,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import jakarta.validation.constraints.* import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 489b67a5c86..b47bad73d03 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -10,8 +10,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import jakarta.validation.constraints.* import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt index 132eba2012c..2f81b70eead 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -10,8 +10,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import jakarta.validation.constraints.* import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt index 0776927c6d6..3cc63c511b1 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import jakarta.validation.constraints.* +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index e69a84ffb29..0abe67b0e8b 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import jakarta.validation.constraints.* +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt index c9183985dcf..87667494f23 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,7 +3,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import jakarta.validation.constraints.* +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt index 90d44174bfb..4db341ab1c4 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import jakarta.validation.constraints.* +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt index 7d448c4e31a..c1081aeaf97 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import jakarta.validation.constraints.* +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt index 7889c3ce43c..b819427eaf5 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import jakarta.validation.constraints.* +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 77800b98973..1abef969d7f 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -21,7 +21,14 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import kotlin.collections.List diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index abd12db7704..5cc5d146f14 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -20,7 +20,14 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import kotlin.collections.List diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 490377a1700..a589346b0a0 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -20,7 +20,14 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import kotlin.collections.List diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt index 5e1f58d1eda..64541c666d4 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 9184be916b6..6af39346cf4 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt index 4494a01b1d5..128eee7f628 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,7 +3,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index c2dc926bb76..12a5a585b40 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index 24222a73ddd..0f2b45edcf7 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt index e9590783281..ef3d46afd3e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt index 6d7b6e53d77..0cf82b64c04 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -16,8 +16,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt index b0946d1bbf6..09afab084a7 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -15,8 +15,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt index f0aad1cbbe1..08160bfaf0f 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -15,8 +15,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt index b7425df729e..95fa00f2636 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index d99a43615c6..68d1ebf496b 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt index 2ab4410e869..b0ebd4f13c0 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,7 +3,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt index 27ad499e95f..a989737abc3 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt index d3853248d27..1ad68021b89 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt index 55d3848402e..b1d1cead418 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt index 867ba7a9341..047e4caafe9 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -16,8 +16,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlinx.coroutines.flow.Flow import kotlin.collections.List diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 299c0cc6ed2..61a9b1a243c 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -15,8 +15,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlinx.coroutines.flow.Flow import kotlin.collections.List diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt index ed81d4a9edb..3ba3d95214c 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -15,8 +15,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlinx.coroutines.flow.Flow import kotlin.collections.List diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt index 071460876e2..f7ed3a1a970 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 9184be916b6..6af39346cf4 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt index 4494a01b1d5..128eee7f628 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,7 +3,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt index 01a57ac0677..cab156b8818 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt index 24222a73ddd..0f2b45edcf7 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt index e9590783281..ef3d46afd3e 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt index f140835c306..75079add0cb 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -18,8 +18,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 04d362f7c9d..764c1073e56 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -17,8 +17,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt index 922b00e48fa..5e7076f405c 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -17,8 +17,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt index 4e2eb168a7e..926b412f109 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 51bacef319b..be3714162c5 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt index 62eb9fe862c..8365af30903 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,7 +3,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt index 91a928d5356..a1a910115db 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt index 0fd597f0ade..5ffd22fa340 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt index b7ad8b1f496..cd0997a8e22 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt index 6d7b6e53d77..0cf82b64c04 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -16,8 +16,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt index b0946d1bbf6..09afab084a7 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -15,8 +15,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt index f0aad1cbbe1..08160bfaf0f 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -15,8 +15,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt index 071460876e2..f7ed3a1a970 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 9184be916b6..6af39346cf4 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt index 4494a01b1d5..128eee7f628 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,7 +3,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt index 01a57ac0677..cab156b8818 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt index 24222a73ddd..0f2b45edcf7 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt index e9590783281..ef3d46afd3e 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.v3.oas.annotations.media.Schema diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt index f140835c306..75079add0cb 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -18,8 +18,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 04d362f7c9d..764c1073e56 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -17,8 +17,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt index 922b00e48fa..5e7076f405c 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -17,8 +17,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Category.kt index 4e2eb168a7e..926b412f109 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 51bacef319b..be3714162c5 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Order.kt index 62eb9fe862c..8365af30903 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,7 +3,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Pet.kt index 91a928d5356..a1a910115db 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Tag.kt index 0fd597f0ade..5ffd22fa340 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/User.kt index b7ad8b1f496..cd0997a8e22 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/User.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid import io.swagger.annotations.ApiModelProperty diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt index bd068ad1c43..91872a031f2 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -11,8 +11,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt index a3fb433ad82..6cbb8279976 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -10,8 +10,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt index d0417729a71..daf5c943c2e 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -10,8 +10,15 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt index 3b89d470f8c..7e906d10e10 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 250cb441d30..4b42c877edb 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt index 68536f35df7..61814bda584 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,7 +3,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt index 09cbaeccd4a..ebebb0c1419 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt index fdee0a22908..0beafadd514 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid /** diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt index a99d304e5ac..8780ff0d2f2 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt @@ -2,7 +2,14 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import javax.validation.Valid /** From 9705617f930a684ff1a2b36e7e0deff25ad38a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Rodr=C3=ADguez=20Mart=C3=ADn?= Date: Wed, 8 Mar 2023 16:57:05 +0100 Subject: [PATCH 009/131] [Java][Resttemplate] Normalize the RestTemplate ApiClient (#14845) * Normalize resttemplate * Update samples --- .../resources/Java/libraries/resttemplate/ApiClient.mustache | 2 -- .../src/main/resources/Java/libraries/resttemplate/api.mustache | 2 -- .../src/main/java/org/openapitools/client/ApiClient.java | 2 -- .../src/main/java/org/openapitools/client/api/PetApi.java | 2 -- .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 -- .../src/main/java/org/openapitools/client/api/UserApi.java | 2 -- .../src/main/java/org/openapitools/client/ApiClient.java | 2 -- .../src/main/java/org/openapitools/client/api/PetApi.java | 2 -- .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 -- .../src/main/java/org/openapitools/client/api/UserApi.java | 2 -- .../src/main/java/org/openapitools/client/ApiClient.java | 2 -- .../main/java/org/openapitools/client/api/AnotherFakeApi.java | 2 -- .../src/main/java/org/openapitools/client/api/FakeApi.java | 2 -- .../org/openapitools/client/api/FakeClassnameTags123Api.java | 2 -- .../src/main/java/org/openapitools/client/api/PetApi.java | 2 -- .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 -- .../src/main/java/org/openapitools/client/api/UserApi.java | 2 -- .../src/main/java/org/openapitools/client/ApiClient.java | 2 -- .../main/java/org/openapitools/client/api/AnotherFakeApi.java | 2 -- .../src/main/java/org/openapitools/client/api/FakeApi.java | 2 -- .../org/openapitools/client/api/FakeClassnameTags123Api.java | 2 -- .../src/main/java/org/openapitools/client/api/PetApi.java | 2 -- .../src/main/java/org/openapitools/client/api/StoreApi.java | 2 -- .../src/main/java/org/openapitools/client/api/UserApi.java | 2 -- 24 files changed, 48 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache index b5de6ce3a19..a844c8c384f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache @@ -81,7 +81,6 @@ import {{invokerPackage}}.auth.OAuth; {{/hasOAuthMethods}} {{>generatedAnnotation}} -@Component("{{invokerPackage}}.ApiClient") public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { public enum CollectionFormat { CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); @@ -115,7 +114,6 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { init(); } - @Autowired public ApiClient(RestTemplate restTemplate) { this.restTemplate = restTemplate; init(); diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache index f2e8a1b2c80..87da6cf0402 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache @@ -27,7 +27,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; {{>generatedAnnotation}} -@Component("{{package}}.{{classname}}") {{#operations}} public class {{classname}} { private ApiClient apiClient; @@ -36,7 +35,6 @@ public class {{classname}} { this(new ApiClient()); } - @Autowired public {{classname}}(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java index c6b8de1d33d..9dc97571d97 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java @@ -58,7 +58,6 @@ import org.openapitools.client.auth.ApiKeyAuth; import org.openapitools.client.auth.OAuth; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.ApiClient") public class ApiClient extends JavaTimeFormatter { public enum CollectionFormat { CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); @@ -92,7 +91,6 @@ public class ApiClient extends JavaTimeFormatter { init(); } - @Autowired public ApiClient(RestTemplate restTemplate) { this.restTemplate = restTemplate; init(); diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/PetApi.java index b65ff8d09dd..ade2b53c084 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/PetApi.java @@ -28,7 +28,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.PetApi") public class PetApi { private ApiClient apiClient; @@ -36,7 +35,6 @@ public class PetApi { this(new ApiClient()); } - @Autowired public PetApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java index 4b7c551119a..d2fa07f1e39 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java @@ -26,7 +26,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.StoreApi") public class StoreApi { private ApiClient apiClient; @@ -34,7 +33,6 @@ public class StoreApi { this(new ApiClient()); } - @Autowired public StoreApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/UserApi.java index 1f19f553c9c..10d0d6bed3c 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/UserApi.java @@ -27,7 +27,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.UserApi") public class UserApi { private ApiClient apiClient; @@ -35,7 +34,6 @@ public class UserApi { this(new ApiClient()); } - @Autowired public UserApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java index 1adabd0c01a..43d2387c888 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java @@ -58,7 +58,6 @@ import org.openapitools.client.auth.ApiKeyAuth; import org.openapitools.client.auth.OAuth; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.ApiClient") public class ApiClient extends JavaTimeFormatter { public enum CollectionFormat { CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); @@ -92,7 +91,6 @@ public class ApiClient extends JavaTimeFormatter { init(); } - @Autowired public ApiClient(RestTemplate restTemplate) { this.restTemplate = restTemplate; init(); diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/PetApi.java index 6dcab96f8cd..56085d401a6 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/PetApi.java @@ -28,7 +28,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.PetApi") public class PetApi { private ApiClient apiClient; @@ -36,7 +35,6 @@ public class PetApi { this(new ApiClient()); } - @Autowired public PetApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java index 3172d5ab47e..0274b05080b 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java @@ -26,7 +26,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.StoreApi") public class StoreApi { private ApiClient apiClient; @@ -34,7 +33,6 @@ public class StoreApi { this(new ApiClient()); } - @Autowired public StoreApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/UserApi.java index c05c7830e97..51dcb10ef63 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/UserApi.java @@ -27,7 +27,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.UserApi") public class UserApi { private ApiClient apiClient; @@ -35,7 +34,6 @@ public class UserApi { this(new ApiClient()); } - @Autowired public UserApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java index a94b4917a8c..cdbe1ed2673 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java @@ -64,7 +64,6 @@ import org.openapitools.client.auth.ApiKeyAuth; import org.openapitools.client.auth.OAuth; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.ApiClient") public class ApiClient extends JavaTimeFormatter { public enum CollectionFormat { CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); @@ -98,7 +97,6 @@ public class ApiClient extends JavaTimeFormatter { init(); } - @Autowired public ApiClient(RestTemplate restTemplate) { this.restTemplate = restTemplate; init(); diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 67aa8844f17..7a14617aa42 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -26,7 +26,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.AnotherFakeApi") public class AnotherFakeApi { private ApiClient apiClient; @@ -34,7 +33,6 @@ public class AnotherFakeApi { this(new ApiClient()); } - @Autowired public AnotherFakeApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index 3251aaa0e15..d0a6a8ccd77 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -34,7 +34,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.FakeApi") public class FakeApi { private ApiClient apiClient; @@ -42,7 +41,6 @@ public class FakeApi { this(new ApiClient()); } - @Autowired public FakeApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index eebf656bb5c..6744a0f8826 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -26,7 +26,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.FakeClassnameTags123Api") public class FakeClassnameTags123Api { private ApiClient apiClient; @@ -34,7 +33,6 @@ public class FakeClassnameTags123Api { this(new ApiClient()); } - @Autowired public FakeClassnameTags123Api(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index 2d26052eb28..43440d7863d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -29,7 +29,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.PetApi") public class PetApi { private ApiClient apiClient; @@ -37,7 +36,6 @@ public class PetApi { this(new ApiClient()); } - @Autowired public PetApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java index b45b41c32fd..2ece51a779c 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java @@ -26,7 +26,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.StoreApi") public class StoreApi { private ApiClient apiClient; @@ -34,7 +33,6 @@ public class StoreApi { this(new ApiClient()); } - @Autowired public StoreApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java index 55369257c1e..b48b7d47c89 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java @@ -27,7 +27,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.UserApi") public class UserApi { private ApiClient apiClient; @@ -35,7 +34,6 @@ public class UserApi { this(new ApiClient()); } - @Autowired public UserApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java index 64b9513ef33..2633f1cb708 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java @@ -59,7 +59,6 @@ import org.openapitools.client.auth.ApiKeyAuth; import org.openapitools.client.auth.OAuth; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.ApiClient") public class ApiClient extends JavaTimeFormatter { public enum CollectionFormat { CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); @@ -93,7 +92,6 @@ public class ApiClient extends JavaTimeFormatter { init(); } - @Autowired public ApiClient(RestTemplate restTemplate) { this.restTemplate = restTemplate; init(); diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 67aa8844f17..7a14617aa42 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -26,7 +26,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.AnotherFakeApi") public class AnotherFakeApi { private ApiClient apiClient; @@ -34,7 +33,6 @@ public class AnotherFakeApi { this(new ApiClient()); } - @Autowired public AnotherFakeApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index 3251aaa0e15..d0a6a8ccd77 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -34,7 +34,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.FakeApi") public class FakeApi { private ApiClient apiClient; @@ -42,7 +41,6 @@ public class FakeApi { this(new ApiClient()); } - @Autowired public FakeApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index eebf656bb5c..6744a0f8826 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -26,7 +26,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.FakeClassnameTags123Api") public class FakeClassnameTags123Api { private ApiClient apiClient; @@ -34,7 +33,6 @@ public class FakeClassnameTags123Api { this(new ApiClient()); } - @Autowired public FakeClassnameTags123Api(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index 2d26052eb28..43440d7863d 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -29,7 +29,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.PetApi") public class PetApi { private ApiClient apiClient; @@ -37,7 +36,6 @@ public class PetApi { this(new ApiClient()); } - @Autowired public PetApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java index b45b41c32fd..2ece51a779c 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java @@ -26,7 +26,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.StoreApi") public class StoreApi { private ApiClient apiClient; @@ -34,7 +33,6 @@ public class StoreApi { this(new ApiClient()); } - @Autowired public StoreApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java index 55369257c1e..b48b7d47c89 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java @@ -27,7 +27,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -@Component("org.openapitools.client.api.UserApi") public class UserApi { private ApiClient apiClient; @@ -35,7 +34,6 @@ public class UserApi { this(new ApiClient()); } - @Autowired public UserApi(ApiClient apiClient) { this.apiClient = apiClient; } From d56a55a06b987e80544163842a4549546a71e928 Mon Sep 17 00:00:00 2001 From: Andre Vegas Date: Wed, 8 Mar 2023 11:05:47 -0500 Subject: [PATCH 010/131] Fixing missing openApiNullable config for java apache-httpclient generator (#14828) * 14827 - fixing missing openApiNullable config for java apache-httpclient generator * 14827 - run PR steps updating examples & docs * 14827 - fixing test data --- .../Java/libraries/apache-httpclient/ApiClient.mustache | 6 ++++++ .../src/main/java/org/openapitools/client/ApiClient.java | 2 ++ .../src/test/java/org/openapitools/client/CustomTest.java | 4 ++-- .../src/main/java/org/openapitools/client/ApiClient.java | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache index 14ec22fe248..2fd8862ba3d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache @@ -12,6 +12,9 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; +{{#openApiNullable}} +import org.openapitools.jackson.nullable.JsonNullableModule; +{{/openApiNullable}} import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.Cookie; @@ -141,6 +144,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { objectMapper.registerModule(new JodaModule()); {{/joda}} objectMapper.registerModule(new JavaTimeModule()); + {{#openApiNullable}} + objectMapper.registerModule(new JsonNullableModule()); + {{/openApiNullable}} objectMapper.setDateFormat(ApiClient.buildDefaultDateFormat()); dateFormat = ApiClient.buildDefaultDateFormat(); diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java index 3d8794d49af..1f9408a4110 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; +import org.openapitools.jackson.nullable.JsonNullableModule; import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.Cookie; @@ -116,6 +117,7 @@ public class ApiClient extends JavaTimeFormatter { objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING); objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING); objectMapper.registerModule(new JavaTimeModule()); + objectMapper.registerModule(new JsonNullableModule()); objectMapper.setDateFormat(ApiClient.buildDefaultDateFormat()); dateFormat = ApiClient.buildDefaultDateFormat(); diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java index 3517d1b5b95..762eb405279 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java +++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java @@ -220,7 +220,7 @@ public class CustomTest { Assert.assertNull(d.getArrayStringNullable()); Assert.assertEquals(d.getArrayString().size(), 0); - Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"success\",\"failure\"],\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3],\"array_string\":[],\"array_string_nullable\":{\"present\":false},\"array_string_extension_nullable\":{\"present\":false},\"string_nullable\":{\"present\":false}}"); + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"success\",\"failure\"],\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3],\"array_string\":[]}"); } @Test @@ -248,7 +248,7 @@ public class CustomTest { Assert.assertNull(d.getArrayStringNullable()); Assert.assertEquals(d.getArrayString().size(), 0); - Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[],\"array_string_nullable\":{\"present\":false},\"array_string_extension_nullable\":{\"present\":false},\"string_nullable\":{\"present\":false}}"); + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[]}"); } @Test diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java index 3a0c4c5ef77..81c2b245a5b 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; +import org.openapitools.jackson.nullable.JsonNullableModule; import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.Cookie; @@ -163,6 +164,7 @@ public class ApiClient extends JavaTimeFormatter { objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING); objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING); objectMapper.registerModule(new JavaTimeModule()); + objectMapper.registerModule(new JsonNullableModule()); objectMapper.setDateFormat(ApiClient.buildDefaultDateFormat()); dateFormat = ApiClient.buildDefaultDateFormat(); From 77dd4990a40bd2d0a01fe4ce8bcf53ab12874124 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 9 Mar 2023 11:05:59 +0800 Subject: [PATCH 011/131] update C# client dep, update samples (#14908) --- .../src/main/resources/csharp-netcore/TestProject.mustache | 4 ++-- .../main/resources/csharp-netcore/netcore_project.mustache | 6 +++--- .../resources/csharp-netcore/netcore_testproject.mustache | 4 ++-- .../src/main/resources/csharp-netcore/nuspec.mustache | 6 +++--- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 6 +++--- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 6 +++--- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 4 ++-- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 6 +++--- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 6 +++--- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 6 +++--- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 6 ++++-- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 6 +++--- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 6 +++--- .../src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj | 4 ++-- .../src/Org.OpenAPITools/Org.OpenAPITools.csproj | 6 +++--- 26 files changed, 64 insertions(+), 62 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache index 57e1455087f..2a27f6a9f79 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache @@ -23,8 +23,8 @@ - - + + diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache index dbe742dac5f..8e825801e17 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache @@ -28,11 +28,11 @@ {{/useCompareNetObjects}} {{^useGenericHost}} - - + + {{/useGenericHost}} {{#useRestSharp}} - + {{/useRestSharp}} {{#useGenericHost}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.mustache index 078005bc236..137af22c732 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.mustache @@ -10,8 +10,8 @@ - - + + diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache index 508d6e02e18..f86248be0e0 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache @@ -30,14 +30,14 @@ - + {{#useRestSharp}} - + {{/useRestSharp}} {{#useCompareNetObjects}} {{/useCompareNetObjects}} - + {{#validatable}} {{/validatable}} diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 06b106b96d3..8baebd4ea54 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 242934b6642..8d6a4b78ae0 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 06b106b96d3..8baebd4ea54 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 242934b6642..8d6a4b78ae0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 96b9fd0c60e..c3b726795f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 4611b7d5ecf..8dbd86415f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 96b9fd0c60e..c3b726795f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 96b9fd0c60e..c3b726795f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 96b9fd0c60e..c3b726795f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 06b106b96d3..8baebd4ea54 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 16fc25de9b9..c3a5ce9403f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 5fa12ee8933..5d7666a5560 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj index caabb448dbf..85b203f7dcb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 8dd131b6d22..01b4744bdb6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 62f2be39f35..ea1b60243d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index d708a4dd9b0..795c6bf1512 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 656e9e0e07d..be69426a99e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -22,9 +22,9 @@ - - - + + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 1f62df0559f..d075b5d10ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -24,7 +24,9 @@ OpenAPI spec version: 1.0.0 - - + + runtime; build; native; contentfiles; analyzers; buildtransitive +all + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 242934b6642..8d6a4b78ae0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 7625d897d8f..77236614dbe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 6e71720a940..091c7850ccd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 774035168ae..a6f431cde58 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -21,9 +21,9 @@ - - - + + + From f9efb7b2fbc9f8f09f10181fcd3b252f46768c74 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 9 Mar 2023 11:10:30 +0800 Subject: [PATCH 012/131] [OpenAPI Normalizer] update SIMPLIFY_ONEOF_ANYOF to convert enum of null to nullable (#14898) * reorganize openapi normalizer tests * add the logic to simply oneof anyof rule instead * minor fix --- docs/customization.md | 2 +- .../codegen/OpenAPINormalizer.java | 51 +++- .../codegen/DefaultCodegenTest.java | 180 ------------ .../codegen/OpenAPINormalizerTest.java | 258 ++++++++++++++++++ .../3_0/convertEnumNullToNullable_test.yaml | 43 +++ 5 files changed, 345 insertions(+), 189 deletions(-) create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java create mode 100644 modules/openapi-generator/src/test/resources/3_0/convertEnumNullToNullable_test.yaml diff --git a/docs/customization.md b/docs/customization.md index 90676792631..d8ff7fb0746 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -485,7 +485,7 @@ Example: java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/simplifyBooleanEnum_test.yaml -o /tmp/java-okhttp/ --openapi-normalizer SIMPLIFY_BOOLEAN_ENUM=true ``` -- `SIMPLIFY_ONEOF_ANYOF`: when set to `true`, simplify oneOf/anyOf by 1) removing null (sub-schema) and setting nullable to true instead, and 2) simplifying oneOf/anyOf with a single sub-schema to just the sub-schema itself. +- `SIMPLIFY_ONEOF_ANYOF`: when set to `true`, simplify oneOf/anyOf by 1) removing null (sub-schema) or enum of null (sub-schema) and setting nullable to true instead, and 2) simplifying oneOf/anyOf with a single sub-schema to just the sub-schema itself. Example: ``` diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index c11f296d237..49d1d714a04 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -65,6 +65,7 @@ public class OpenAPINormalizer { // when set to true, oneOf/anyOf schema with only one sub-schema is simplified to just the sub-schema // and if sub-schema contains "null", remove it and set nullable to true instead + // and if sub-schema contains enum of "null", remove it and set nullable to true instead final String SIMPLIFY_ONEOF_ANYOF = "SIMPLIFY_ONEOF_ANYOF"; boolean simplifyOneOfAnyOf; @@ -578,7 +579,7 @@ public class OpenAPINormalizer { return schema; } - Schema s0 = null, s1 = null; + Schema result = null, s0 = null, s1 = null; if (schema.getAnyOf().size() == 2) { s0 = ModelUtils.unaliasSchema(openAPI, (Schema) schema.getAnyOf().get(0)); s1 = ModelUtils.unaliasSchema(openAPI, (Schema) schema.getAnyOf().get(1)); @@ -592,15 +593,27 @@ public class OpenAPINormalizer { // find the string schema (not enum) if (s0 instanceof StringSchema && s1 instanceof StringSchema) { if (((StringSchema) s0).getEnum() != null) { // s0 is enum, s1 is string - return (StringSchema) s1; + result = (StringSchema) s1; } else if (((StringSchema) s1).getEnum() != null) { // s1 is enum, s0 is string - return (StringSchema) s0; + result = (StringSchema) s0; } else { // both are string - return schema; + result = schema; } } else { - return schema; + result = schema; } + + // set nullable + if (schema.getNullable() != null) { + result.setNullable(schema.getNullable()); + } + + // set default + if (schema.getDefault() != null) { + result.setDefault(schema.getDefault()); + } + + return result; } /** @@ -616,11 +629,22 @@ public class OpenAPINormalizer { } if (schema.getOneOf() != null && !schema.getOneOf().isEmpty()) { - // convert null sub-schema to `nullable: true` for (int i = 0; i < schema.getOneOf().size(); i++) { + // convert null sub-schema to `nullable: true` if (schema.getOneOf().get(i) == null || ((Schema) schema.getOneOf().get(i)).getType() == null) { schema.getOneOf().remove(i); schema.setNullable(true); + continue; + } + + // convert enum of null only to `nullable:true` + Schema oneOfElement = ModelUtils.getReferencedSchema(openAPI, (Schema) schema.getOneOf().get(i)); + if (oneOfElement.getEnum() != null && oneOfElement.getEnum().size() == 1) { + if ("null".equals(String.valueOf(oneOfElement.getEnum().get(0)))) { + schema.setNullable(true); + schema.getOneOf().remove(i); + continue; + } } } @@ -649,11 +673,22 @@ public class OpenAPINormalizer { } if (schema.getAnyOf() != null && !schema.getAnyOf().isEmpty()) { - // convert null sub-schema to `nullable: true` for (int i = 0; i < schema.getAnyOf().size(); i++) { + // convert null sub-schema to `nullable: true` if (schema.getAnyOf().get(i) == null || ((Schema) schema.getAnyOf().get(i)).getType() == null) { schema.getAnyOf().remove(i); schema.setNullable(true); + continue; + } + + // convert enum of null only to `nullable:true` + Schema anyOfElement = ModelUtils.getReferencedSchema(openAPI, (Schema) schema.getAnyOf().get(i)); + if (anyOfElement.getEnum() != null && anyOfElement.getEnum().size() == 1) { + if ("null".equals(String.valueOf(anyOfElement.getEnum().get(0)))) { + schema.setNullable(true); + schema.getAnyOf().remove(i); + continue; + } } } @@ -721,4 +756,4 @@ public class OpenAPINormalizer { } // ===================== end of rules ===================== -} +} \ No newline at end of file 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 b393608b626..cd4a82d15f0 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 @@ -4342,184 +4342,4 @@ public class DefaultCodegenTest { Assert.assertFalse(inlineEnumSchemaProperty.isPrimitiveType); } - @Test - public void testOpenAPINormalizerRefAsParentInAllOf() { - // to test the rule REF_AS_PARENT_IN_ALLOF - OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOf_extension_parent.yaml"); - - Schema schema = openAPI.getComponents().getSchemas().get("AnotherPerson"); - assertNull(schema.getExtensions()); - - Schema schema2 = openAPI.getComponents().getSchemas().get("Person"); - assertEquals(schema2.getExtensions().get("x-parent"), "abstract"); - - Map options = new HashMap<>(); - options.put("REF_AS_PARENT_IN_ALLOF", "true"); - OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); - openAPINormalizer.normalize(); - - Schema schema3 = openAPI.getComponents().getSchemas().get("AnotherPerson"); - assertEquals(schema3.getExtensions().get("x-parent"), true); - - Schema schema4 = openAPI.getComponents().getSchemas().get("AnotherParent"); - assertEquals(schema4.getExtensions().get("x-parent"), true); - - Schema schema5 = openAPI.getComponents().getSchemas().get("Person"); - assertEquals(schema5.getExtensions().get("x-parent"), "abstract"); - } - - @Test - public void testOpenAPINormalizerEnableKeepOnlyFirstTagInOperation() { - OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml"); - - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().size(), 2); - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().size(), 1); - - Map options = new HashMap<>(); - options.put("KEEP_ONLY_FIRST_TAG_IN_OPERATION", "true"); - OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); - openAPINormalizer.normalize(); - - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().size(), 1); - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().size(), 1); - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().get(0), "person"); - } - - @Test - public void testOpenAPINormalizerRemoveAnyOfOneOfAndKeepPropertiesOnly() { - // to test the rule REMOVE_ANYOF_ONEOF_AND_KEEP_PROPERTIIES_ONLY - OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/removeAnyOfOneOfAndKeepPropertiesOnly_test.yaml"); - - Schema schema = openAPI.getComponents().getSchemas().get("Person"); - assertEquals(schema.getAnyOf().size(), 2); - - Map options = new HashMap<>(); - options.put("REMOVE_ANYOF_ONEOF_AND_KEEP_PROPERTIES_ONLY", "true"); - OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); - openAPINormalizer.normalize(); - - Schema schema3 = openAPI.getComponents().getSchemas().get("Person"); - assertNull(schema.getAnyOf()); - } - - @Test - public void testOpenAPINormalizerSimplifyOneOfAnyOfStringAndEnumString() { - // to test the rule SIMPLIFY_ONEOF_ANYOF_STRING_AND_ENUM_STRING - OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/simplifyAnyOfStringAndEnumString_test.yaml"); - - Schema schema = openAPI.getComponents().getSchemas().get("AnyOfTest"); - assertEquals(schema.getAnyOf().size(), 2); - - Map options = new HashMap<>(); - options.put("SIMPLIFY_ANYOF_STRING_AND_ENUM_STRING", "true"); - OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); - openAPINormalizer.normalize(); - - Schema schema3 = openAPI.getComponents().getSchemas().get("AnyOfTest"); - assertNull(schema3.getAnyOf()); - assertTrue(schema3 instanceof StringSchema); - } - - @Test - public void testOpenAPINormalizerSimplifyOneOfAnyOf() { - // to test the rule SIMPLIFY_ONEOF_ANYOF - OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml"); - - Schema schema = openAPI.getComponents().getSchemas().get("AnyOfTest"); - assertEquals(schema.getAnyOf().size(), 2); - assertNull(schema.getNullable()); - - Schema schema2 = openAPI.getComponents().getSchemas().get("OneOfTest"); - assertEquals(schema2.getOneOf().size(), 2); - assertNull(schema2.getNullable()); - - Schema schema5 = openAPI.getComponents().getSchemas().get("OneOfNullableTest"); - assertEquals(schema5.getOneOf().size(), 3); - assertNull(schema5.getNullable()); - - Map options = new HashMap<>(); - options.put("SIMPLIFY_ONEOF_ANYOF", "true"); - OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); - openAPINormalizer.normalize(); - - Schema schema3 = openAPI.getComponents().getSchemas().get("AnyOfTest"); - assertNull(schema3.getAnyOf()); - assertTrue(schema3 instanceof StringSchema); - assertTrue(schema3.getNullable()); - - Schema schema4 = openAPI.getComponents().getSchemas().get("OneOfTest"); - assertNull(schema4.getOneOf()); - assertTrue(schema4 instanceof IntegerSchema); - - Schema schema6 = openAPI.getComponents().getSchemas().get("OneOfNullableTest"); - assertEquals(schema6.getOneOf().size(), 2); - assertTrue(schema6.getNullable()); - } - - @Test - public void testOpenAPINormalizerSimplifyBooleanEnum() { - // to test the rule SIMPLIFY_BOOLEAN_ENUM - OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/simplifyBooleanEnum_test.yaml"); - - Schema schema = openAPI.getComponents().getSchemas().get("BooleanEnumTest"); - assertEquals(schema.getProperties().size(), 3); - assertTrue(schema.getProperties().get("boolean_enum") instanceof BooleanSchema); - BooleanSchema bs = (BooleanSchema) schema.getProperties().get("boolean_enum"); - assertEquals(bs.getEnum().size(), 2); - - Map options = new HashMap<>(); - options.put("SIMPLIFY_BOOLEAN_ENUM", "true"); - OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); - openAPINormalizer.normalize(); - - Schema schema3 = openAPI.getComponents().getSchemas().get("BooleanEnumTest"); - assertEquals(schema.getProperties().size(), 3); - assertTrue(schema.getProperties().get("boolean_enum") instanceof BooleanSchema); - BooleanSchema bs2 = (BooleanSchema) schema.getProperties().get("boolean_enum"); - assertNull(bs2.getEnum()); //ensure the enum has been erased - } - - @Test - public void testOpenAPINormalizerSetTagsInAllOperations() { - OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml"); - - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().size(), 2); - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().size(), 1); - - Map options = new HashMap<>(); - options.put("SET_TAGS_FOR_ALL_OPERATIONS", "core"); - OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); - openAPINormalizer.normalize(); - - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().size(), 1); - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().size(), 1); - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().get(0), "core"); - assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().get(0), "core"); - } - - @Test - public void testAddUnsignedToIntegerWithInvalidMaxValue() { - OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml"); - - Schema person = openAPI.getComponents().getSchemas().get("Person"); - assertNull(((Schema)person.getProperties().get("integer")).getExtensions()); - assertNull(((Schema)person.getProperties().get("int32")).getExtensions()); - assertNull(((Schema)person.getProperties().get("int64")).getExtensions()); - assertNull(((Schema)person.getProperties().get("integer_max")).getExtensions()); - assertNull(((Schema)person.getProperties().get("int32_max")).getExtensions()); - assertNull(((Schema)person.getProperties().get("int64_max")).getExtensions()); - - Map options = new HashMap<>(); - options.put("ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE", "true"); - OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); - openAPINormalizer.normalize(); - - Schema person2 = openAPI.getComponents().getSchemas().get("Person"); - assertNull(((Schema)person2.getProperties().get("integer")).getExtensions()); - assertNull(((Schema)person2.getProperties().get("int32")).getExtensions()); - assertNull(((Schema)person2.getProperties().get("int64")).getExtensions()); - assertTrue((Boolean)((Schema)person2.getProperties().get("integer_max")).getExtensions().get("x-unsigned")); - assertTrue((Boolean)((Schema)person2.getProperties().get("int32_max")).getExtensions().get("x-unsigned")); - assertTrue((Boolean)((Schema)person2.getProperties().get("int64_max")).getExtensions().get("x-unsigned")); - } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java new file mode 100644 index 00000000000..a5b80494f62 --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java @@ -0,0 +1,258 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openapitools.codegen; + +import com.google.common.collect.Sets; +import com.samskivert.mustache.Mustache.Lambda; + +import io.swagger.parser.OpenAPIParser; +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.PathItem; +import io.swagger.v3.oas.models.headers.Header; +import io.swagger.v3.oas.models.media.*; +import io.swagger.v3.oas.models.parameters.QueryParameter; +import io.swagger.v3.oas.models.parameters.RequestBody; +import io.swagger.v3.oas.models.responses.ApiResponse; +import io.swagger.v3.oas.models.responses.ApiResponses; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.parser.core.models.ParseOptions; + +import org.openapitools.codegen.config.CodegenConfigurator; +import org.openapitools.codegen.config.GlobalSettings; +import org.openapitools.codegen.model.ModelMap; +import org.openapitools.codegen.model.ModelsMap; +import org.openapitools.codegen.templating.mustache.CamelCaseLambda; +import org.openapitools.codegen.templating.mustache.IndentedLambda; +import org.openapitools.codegen.templating.mustache.LowercaseLambda; +import org.openapitools.codegen.templating.mustache.TitlecaseLambda; +import org.openapitools.codegen.templating.mustache.UppercaseLambda; +import org.openapitools.codegen.utils.ModelUtils; +import org.openapitools.codegen.utils.SemVer; +import org.testng.Assert; +import org.testng.annotations.Ignore; +import org.testng.annotations.Test; + +import java.io.File; +import java.nio.file.Files; +import java.util.*; +import java.util.stream.Collectors; + +import static org.testng.Assert.*; + +public class OpenAPINormalizerTest { + @Test + public void testOpenAPINormalizerRefAsParentInAllOf() { + // to test the rule REF_AS_PARENT_IN_ALLOF + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOf_extension_parent.yaml"); + + Schema schema = openAPI.getComponents().getSchemas().get("AnotherPerson"); + assertNull(schema.getExtensions()); + + Schema schema2 = openAPI.getComponents().getSchemas().get("Person"); + assertEquals(schema2.getExtensions().get("x-parent"), "abstract"); + + Map options = new HashMap<>(); + options.put("REF_AS_PARENT_IN_ALLOF", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema schema3 = openAPI.getComponents().getSchemas().get("AnotherPerson"); + assertEquals(schema3.getExtensions().get("x-parent"), true); + + Schema schema4 = openAPI.getComponents().getSchemas().get("AnotherParent"); + assertEquals(schema4.getExtensions().get("x-parent"), true); + + Schema schema5 = openAPI.getComponents().getSchemas().get("Person"); + assertEquals(schema5.getExtensions().get("x-parent"), "abstract"); + } + + @Test + public void testOpenAPINormalizerEnableKeepOnlyFirstTagInOperation() { + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml"); + + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().size(), 2); + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().size(), 1); + + Map options = new HashMap<>(); + options.put("KEEP_ONLY_FIRST_TAG_IN_OPERATION", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().size(), 1); + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().size(), 1); + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().get(0), "person"); + } + + @Test + public void testOpenAPINormalizerRemoveAnyOfOneOfAndKeepPropertiesOnly() { + // to test the rule REMOVE_ANYOF_ONEOF_AND_KEEP_PROPERTIIES_ONLY + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/removeAnyOfOneOfAndKeepPropertiesOnly_test.yaml"); + + Schema schema = openAPI.getComponents().getSchemas().get("Person"); + assertEquals(schema.getAnyOf().size(), 2); + + Map options = new HashMap<>(); + options.put("REMOVE_ANYOF_ONEOF_AND_KEEP_PROPERTIES_ONLY", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema schema3 = openAPI.getComponents().getSchemas().get("Person"); + assertNull(schema.getAnyOf()); + } + + @Test + public void testOpenAPINormalizerSimplifyOneOfAnyOfStringAndEnumString() { + // to test the rule SIMPLIFY_ONEOF_ANYOF_STRING_AND_ENUM_STRING + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/simplifyAnyOfStringAndEnumString_test.yaml"); + + Schema schema = openAPI.getComponents().getSchemas().get("AnyOfTest"); + assertEquals(schema.getAnyOf().size(), 2); + + Map options = new HashMap<>(); + options.put("SIMPLIFY_ANYOF_STRING_AND_ENUM_STRING", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema schema3 = openAPI.getComponents().getSchemas().get("AnyOfTest"); + assertNull(schema3.getAnyOf()); + assertTrue(schema3 instanceof StringSchema); + } + + @Test + public void testOpenAPINormalizerSimplifyOneOfAnyOf() { + // to test the rule SIMPLIFY_ONEOF_ANYOF + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml"); + + Schema schema = openAPI.getComponents().getSchemas().get("AnyOfTest"); + assertEquals(schema.getAnyOf().size(), 2); + assertNull(schema.getNullable()); + + Schema schema2 = openAPI.getComponents().getSchemas().get("OneOfTest"); + assertEquals(schema2.getOneOf().size(), 2); + assertNull(schema2.getNullable()); + + Schema schema5 = openAPI.getComponents().getSchemas().get("OneOfNullableTest"); + assertEquals(schema5.getOneOf().size(), 3); + assertNull(schema5.getNullable()); + + Map options = new HashMap<>(); + options.put("SIMPLIFY_ONEOF_ANYOF", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema schema3 = openAPI.getComponents().getSchemas().get("AnyOfTest"); + assertNull(schema3.getAnyOf()); + assertTrue(schema3 instanceof StringSchema); + assertTrue(schema3.getNullable()); + + Schema schema4 = openAPI.getComponents().getSchemas().get("OneOfTest"); + assertNull(schema4.getOneOf()); + assertTrue(schema4 instanceof IntegerSchema); + + Schema schema6 = openAPI.getComponents().getSchemas().get("OneOfNullableTest"); + assertEquals(schema6.getOneOf().size(), 2); + assertTrue(schema6.getNullable()); + } + + @Test + public void testOpenAPINormalizerSimplifyBooleanEnum() { + // to test the rule SIMPLIFY_BOOLEAN_ENUM + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/simplifyBooleanEnum_test.yaml"); + + Schema schema = openAPI.getComponents().getSchemas().get("BooleanEnumTest"); + assertEquals(schema.getProperties().size(), 3); + assertTrue(schema.getProperties().get("boolean_enum") instanceof BooleanSchema); + BooleanSchema bs = (BooleanSchema) schema.getProperties().get("boolean_enum"); + assertEquals(bs.getEnum().size(), 2); + + Map options = new HashMap<>(); + options.put("SIMPLIFY_BOOLEAN_ENUM", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema schema3 = openAPI.getComponents().getSchemas().get("BooleanEnumTest"); + assertEquals(schema.getProperties().size(), 3); + assertTrue(schema.getProperties().get("boolean_enum") instanceof BooleanSchema); + BooleanSchema bs2 = (BooleanSchema) schema.getProperties().get("boolean_enum"); + assertNull(bs2.getEnum()); //ensure the enum has been erased + } + + @Test + public void testOpenAPINormalizerSetTagsInAllOperations() { + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml"); + + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().size(), 2); + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().size(), 1); + + Map options = new HashMap<>(); + options.put("SET_TAGS_FOR_ALL_OPERATIONS", "core"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().size(), 1); + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().size(), 1); + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getGet().getTags().get(0), "core"); + assertEquals(openAPI.getPaths().get("/person/display/{personId}").getDelete().getTags().get(0), "core"); + } + + @Test + public void testAddUnsignedToIntegerWithInvalidMaxValue() { + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml"); + + Schema person = openAPI.getComponents().getSchemas().get("Person"); + assertNull(((Schema)person.getProperties().get("integer")).getExtensions()); + assertNull(((Schema)person.getProperties().get("int32")).getExtensions()); + assertNull(((Schema)person.getProperties().get("int64")).getExtensions()); + assertNull(((Schema)person.getProperties().get("integer_max")).getExtensions()); + assertNull(((Schema)person.getProperties().get("int32_max")).getExtensions()); + assertNull(((Schema)person.getProperties().get("int64_max")).getExtensions()); + + Map options = new HashMap<>(); + options.put("ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema person2 = openAPI.getComponents().getSchemas().get("Person"); + assertNull(((Schema)person2.getProperties().get("integer")).getExtensions()); + assertNull(((Schema)person2.getProperties().get("int32")).getExtensions()); + assertNull(((Schema)person2.getProperties().get("int64")).getExtensions()); + assertTrue((Boolean)((Schema)person2.getProperties().get("integer_max")).getExtensions().get("x-unsigned")); + assertTrue((Boolean)((Schema)person2.getProperties().get("int32_max")).getExtensions().get("x-unsigned")); + assertTrue((Boolean)((Schema)person2.getProperties().get("int64_max")).getExtensions().get("x-unsigned")); + } + + @Test + public void testOpenAPINormalizerConvertEnumNullToNullable_test() { + // to test the rule SIMPLIFY_ONEOF_ANYOF, which now also covers CONVERT_ENUM_NULL_TO_NULLABLE (removed) + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/convertEnumNullToNullable_test.yaml"); + + Schema schema = openAPI.getComponents().getSchemas().get("AnyOfTest"); + assertEquals(schema.getAnyOf().size(), 3); + assertNull(schema.getNullable()); + + Map options = new HashMap<>(); + options.put("SIMPLIFY_ONEOF_ANYOF", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema schema3 = openAPI.getComponents().getSchemas().get("AnyOfTest"); + assertEquals(schema3.getAnyOf().size(), 2); + assertTrue(schema3.getNullable()); + } +} diff --git a/modules/openapi-generator/src/test/resources/3_0/convertEnumNullToNullable_test.yaml b/modules/openapi-generator/src/test/resources/3_0/convertEnumNullToNullable_test.yaml new file mode 100644 index 00000000000..ab97e13abbd --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/convertEnumNullToNullable_test.yaml @@ -0,0 +1,43 @@ +openapi: 3.0.1 +info: + version: 1.0.0 + title: Example + license: + name: MIT +servers: + - url: http://api.example.xyz/v1 +paths: + /person/display/{personId}: + get: + parameters: + - name: personId + in: path + required: true + description: The id of the person to retrieve + schema: + type: string + operationId: list + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: "#/components/schemas/AnyOfTest" +components: + schemas: + AnyOfTest: + description: to test anyOf (string, enum string) + anyOf: + - type: string + - $ref: '#/components/schemas/EnumString' + - $ref: '#/components/schemas/EnumNull' + EnumString: + type: string + enum: + - A + - B + EnumNull: + type: string + enum: + - null From f3960b2116501ba4eca5684be5981d1e9d6783cc Mon Sep 17 00:00:00 2001 From: Brahim Hadriche Date: Fri, 10 Mar 2023 01:17:50 -0500 Subject: [PATCH 013/131] [v2] (RFC) Csharp netcore generator supports UnityWebRequest library (#14870) * Base impl * Improve Unity support * update samples * Sync bool property * Update samples * Set support file property * Address comments * Fix test asmdef * Fixes for WebGL support * Add note about Unity version * Add Unity Sample --------- Co-authored-by: William Cheng --- ...netcore-OpenAPIClient-unityWebRequest.yaml | 6 + .../languages/CSharpNetCoreClientCodegen.java | 49 +- .../csharp-netcore/RequestOptions.mustache | 4 + .../resources/csharp-netcore/api.mustache | 16 + .../unityWebRequest/ApiClient.mustache | 639 ++++ .../ConnectionException.mustache | 21 + .../libraries/unityWebRequest/README.mustache | 178 + .../unityWebRequest/RequestOptions.mustache | 60 + .../UnexpectedResponseException.mustache | 26 + .../libraries/unityWebRequest/api.mustache | 690 ++++ .../unityWebRequest/api_test.mustache | 74 + .../libraries/unityWebRequest/asmdef.mustache | 7 + .../unityWebRequest/asmdef_test.mustache | 15 + .../libraries/unityWebRequest/model.mustache | 47 + .../unityWebRequest/model_test.mustache | 64 + .../csharp-netcore/modelGeneric.mustache | 2 + .../OpenAPIClient-unityWebRequest/.gitignore | 362 ++ .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 200 ++ .../.openapi-generator/VERSION | 1 + .../OpenAPIClient-unityWebRequest/README.md | 260 ++ .../docs/Activity.md | 11 + .../ActivityOutputElementRepresentation.md | 11 + .../docs/AdditionalPropertiesClass.md | 17 + .../docs/Animal.md | 11 + .../docs/AnotherFakeApi.md | 99 + .../docs/ApiResponse.md | 12 + .../docs/Apple.md | 11 + .../docs/AppleReq.md | 11 + .../docs/ArrayOfArrayOfNumberOnly.md | 10 + .../docs/ArrayOfNumberOnly.md | 10 + .../docs/ArrayTest.md | 12 + .../docs/Banana.md | 10 + .../docs/BananaReq.md | 11 + .../docs/BasquePig.md | 10 + .../docs/Capitalization.md | 15 + .../OpenAPIClient-unityWebRequest/docs/Cat.md | 12 + .../docs/CatAllOf.md | 10 + .../docs/Category.md | 11 + .../docs/ChildCat.md | 11 + .../docs/ChildCatAllOf.md | 11 + .../docs/ClassModel.md | 11 + .../docs/ComplexQuadrilateral.md | 11 + .../docs/DanishPig.md | 10 + .../docs/DateOnlyClass.md | 10 + .../docs/DefaultApi.md | 174 + .../docs/DeprecatedObject.md | 10 + .../OpenAPIClient-unityWebRequest/docs/Dog.md | 12 + .../docs/DogAllOf.md | 10 + .../docs/Drawing.md | 13 + .../docs/EnumArrays.md | 11 + .../docs/EnumClass.md | 9 + .../docs/EnumTest.md | 18 + .../docs/EquilateralTriangle.md | 11 + .../docs/FakeApi.md | 1394 ++++++++ .../docs/FakeClassnameTags123Api.md | 104 + .../docs/File.md | 11 + .../docs/FileSchemaTestClass.md | 11 + .../OpenAPIClient-unityWebRequest/docs/Foo.md | 10 + .../docs/FooGetDefaultResponse.md | 10 + .../docs/FormatTest.md | 25 + .../docs/Fruit.md | 13 + .../docs/FruitReq.md | 13 + .../docs/GmFruit.md | 13 + .../docs/GrandparentAnimal.md | 10 + .../docs/HasOnlyReadOnly.md | 11 + .../docs/HealthCheckResult.md | 11 + .../docs/IsoscelesTriangle.md | 11 + .../docs/List.md | 10 + .../docs/Mammal.md | 13 + .../docs/MapTest.md | 13 + ...dPropertiesAndAdditionalPropertiesClass.md | 13 + .../docs/Model200Response.md | 12 + .../docs/ModelClient.md | 10 + .../docs/Name.md | 14 + .../docs/NullableClass.md | 21 + .../docs/NullableGuidClass.md | 10 + .../docs/NullableShape.md | 12 + .../docs/NumberOnly.md | 10 + .../docs/ObjectWithDeprecatedFields.md | 13 + .../docs/Order.md | 15 + .../docs/OuterComposite.md | 12 + .../docs/OuterEnum.md | 9 + .../docs/OuterEnumDefaultValue.md | 9 + .../docs/OuterEnumInteger.md | 9 + .../docs/OuterEnumIntegerDefaultValue.md | 9 + .../docs/ParentPet.md | 10 + .../OpenAPIClient-unityWebRequest/docs/Pet.md | 15 + .../docs/PetApi.md | 856 +++++ .../OpenAPIClient-unityWebRequest/docs/Pig.md | 10 + .../docs/PolymorphicProperty.md | 9 + .../docs/Quadrilateral.md | 11 + .../docs/QuadrilateralInterface.md | 10 + .../docs/ReadOnlyFirst.md | 11 + .../docs/Return.md | 11 + .../docs/ScaleneTriangle.md | 11 + .../docs/Shape.md | 11 + .../docs/ShapeInterface.md | 10 + .../docs/ShapeOrNull.md | 12 + .../docs/SimpleQuadrilateral.md | 11 + .../docs/SpecialModelName.md | 11 + .../docs/StoreApi.md | 373 ++ .../OpenAPIClient-unityWebRequest/docs/Tag.md | 11 + .../docs/Triangle.md | 11 + .../docs/TriangleInterface.md | 10 + .../docs/User.md | 21 + .../docs/UserApi.md | 713 ++++ .../docs/Whale.md | 12 + .../docs/Zebra.md | 11 + .../OpenAPIClient-unityWebRequest/git_push.sh | 57 + .../Api/AnotherFakeApiTests.cs | 68 + .../Api/DefaultApiTests.cs | 78 + .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 258 ++ .../Api/FakeClassnameTags123ApiTests.cs | 68 + .../Org.OpenAPITools.Test/Api/PetApiTests.cs | 167 + .../Api/StoreApiTests.cs | 102 + .../Org.OpenAPITools.Test/Api/UserApiTests.cs | 147 + ...ctivityOutputElementRepresentationTests.cs | 75 + .../Model/ActivityTests.cs | 67 + .../Model/AdditionalPropertiesClassTests.cs | 123 + .../Model/AnimalTests.cs | 93 + .../Model/ApiResponseTests.cs | 83 + .../Model/AppleReqTests.cs | 75 + .../Org.OpenAPITools.Test/Model/AppleTests.cs | 75 + .../Model/ArrayOfArrayOfNumberOnlyTests.cs | 67 + .../Model/ArrayOfNumberOnlyTests.cs | 67 + .../Model/ArrayTestTests.cs | 83 + .../Model/BananaReqTests.cs | 75 + .../Model/BananaTests.cs | 67 + .../Model/BasquePigTests.cs | 67 + .../Model/CapitalizationTests.cs | 107 + .../Model/CatAllOfTests.cs | 67 + .../Org.OpenAPITools.Test/Model/CatTests.cs | 67 + .../Model/CategoryTests.cs | 75 + .../Model/ChildCatAllOfTests.cs | 75 + .../Model/ChildCatTests.cs | 75 + .../Model/ClassModelTests.cs | 67 + .../Model/ComplexQuadrilateralTests.cs | 75 + .../Model/DanishPigTests.cs | 67 + .../Model/DateOnlyClassTests.cs | 67 + .../Model/DeprecatedObjectTests.cs | 67 + .../Model/DogAllOfTests.cs | 67 + .../Org.OpenAPITools.Test/Model/DogTests.cs | 67 + .../Model/DrawingTests.cs | 91 + .../Model/EnumArraysTests.cs | 75 + .../Model/EnumClassTests.cs | 59 + .../Model/EnumTestTests.cs | 131 + .../Model/EquilateralTriangleTests.cs | 75 + .../Model/FileSchemaTestClassTests.cs | 75 + .../Org.OpenAPITools.Test/Model/FileTests.cs | 67 + .../Model/FooGetDefaultResponseTests.cs | 67 + .../Org.OpenAPITools.Test/Model/FooTests.cs | 67 + .../Model/FormatTestTests.cs | 187 + .../Model/FruitReqTests.cs | 91 + .../Org.OpenAPITools.Test/Model/FruitTests.cs | 91 + .../Model/GmFruitTests.cs | 91 + .../Model/GrandparentAnimalTests.cs | 85 + .../Model/HasOnlyReadOnlyTests.cs | 75 + .../Model/HealthCheckResultTests.cs | 67 + .../Model/IsoscelesTriangleTests.cs | 75 + .../Org.OpenAPITools.Test/Model/ListTests.cs | 67 + .../Model/MammalTests.cs | 91 + .../Model/MapTestTests.cs | 91 + ...ertiesAndAdditionalPropertiesClassTests.cs | 91 + .../Model/Model200ResponseTests.cs | 75 + .../Model/ModelClientTests.cs | 67 + .../Org.OpenAPITools.Test/Model/NameTests.cs | 91 + .../Model/NullableClassTests.cs | 155 + .../Model/NullableGuidClassTests.cs | 67 + .../Model/NullableShapeTests.cs | 75 + .../Model/NumberOnlyTests.cs | 67 + .../Model/ObjectWithDeprecatedFieldsTests.cs | 91 + .../Org.OpenAPITools.Test/Model/OrderTests.cs | 107 + .../Model/OuterCompositeTests.cs | 83 + .../Model/OuterEnumDefaultValueTests.cs | 59 + .../OuterEnumIntegerDefaultValueTests.cs | 59 + .../Model/OuterEnumIntegerTests.cs | 59 + .../Model/OuterEnumTests.cs | 59 + .../Model/ParentPetTests.cs | 68 + .../Org.OpenAPITools.Test/Model/PetTests.cs | 107 + .../Org.OpenAPITools.Test/Model/PigTests.cs | 67 + .../Model/PolymorphicPropertyTests.cs | 59 + .../Model/QuadrilateralInterfaceTests.cs | 67 + .../Model/QuadrilateralTests.cs | 75 + .../Model/ReadOnlyFirstTests.cs | 75 + .../Model/ReturnTests.cs | 67 + .../Model/ScaleneTriangleTests.cs | 75 + .../Model/ShapeInterfaceTests.cs | 67 + .../Model/ShapeOrNullTests.cs | 75 + .../Org.OpenAPITools.Test/Model/ShapeTests.cs | 75 + .../Model/SimpleQuadrilateralTests.cs | 75 + .../Model/SpecialModelNameTests.cs | 75 + .../Org.OpenAPITools.Test/Model/TagTests.cs | 75 + .../Model/TriangleInterfaceTests.cs | 67 + .../Model/TriangleTests.cs | 75 + .../Org.OpenAPITools.Test/Model/UserTests.cs | 155 + .../Org.OpenAPITools.Test/Model/WhaleTests.cs | 83 + .../Org.OpenAPITools.Test/Model/ZebraTests.cs | 75 + .../Org.OpenAPITools.Test.asmdef | 15 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 355 ++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 497 +++ .../src/Org.OpenAPITools/Api/FakeApi.cs | 3148 +++++++++++++++++ .../Api/FakeClassnameTags123Api.cs | 365 ++ .../src/Org.OpenAPITools/Api/PetApi.cs | 2013 +++++++++++ .../src/Org.OpenAPITools/Api/StoreApi.cs | 846 +++++ .../src/Org.OpenAPITools/Api/UserApi.cs | 1534 ++++++++ .../src/Org.OpenAPITools/Client/ApiClient.cs | 645 ++++ .../Org.OpenAPITools/Client/ApiException.cs | 68 + .../Org.OpenAPITools/Client/ApiResponse.cs | 166 + .../Org.OpenAPITools/Client/ClientUtils.cs | 242 ++ .../Org.OpenAPITools/Client/Configuration.cs | 697 ++++ .../Client/ConnectionException.cs | 29 + .../Client/ExceptionFactory.cs | 22 + .../Client/GlobalConfiguration.cs | 67 + .../Client/HttpSigningConfiguration.cs | 774 ++++ .../Org.OpenAPITools/Client/IApiAccessor.cs | 37 + .../Client/IAsynchronousClient.cs | 100 + .../Client/IReadableConfiguration.cs | 134 + .../Client/ISynchronousClient.cs | 93 + .../src/Org.OpenAPITools/Client/Multimap.cs | 295 ++ .../Client/OpenAPIDateConverter.cs | 29 + .../Org.OpenAPITools/Client/RequestOptions.cs | 68 + .../Client/UnexpectedResponseException.cs | 34 + .../Client/WebRequestPathBuilder.cs | 53 + .../Model/AbstractOpenAPISchema.cs | 76 + .../src/Org.OpenAPITools/Model/Activity.cs | 119 + .../ActivityOutputElementRepresentation.cs | 136 + .../Model/AdditionalPropertiesClass.cs | 249 ++ .../src/Org.OpenAPITools/Model/Animal.cs | 147 + .../src/Org.OpenAPITools/Model/ApiResponse.cs | 150 + .../src/Org.OpenAPITools/Model/Apple.cs | 136 + .../src/Org.OpenAPITools/Model/AppleReq.cs | 142 + .../Model/ArrayOfArrayOfNumberOnly.cs | 119 + .../Model/ArrayOfNumberOnly.cs | 119 + .../src/Org.OpenAPITools/Model/ArrayTest.cs | 157 + .../src/Org.OpenAPITools/Model/Banana.cs | 114 + .../src/Org.OpenAPITools/Model/BananaReq.cs | 133 + .../src/Org.OpenAPITools/Model/BasquePig.cs | 128 + .../Org.OpenAPITools/Model/Capitalization.cs | 209 ++ .../src/Org.OpenAPITools/Model/Cat.cs | 122 + .../src/Org.OpenAPITools/Model/CatAllOf.cs | 114 + .../src/Org.OpenAPITools/Model/Category.cs | 142 + .../src/Org.OpenAPITools/Model/ChildCat.cs | 147 + .../Org.OpenAPITools/Model/ChildCatAllOf.cs | 146 + .../src/Org.OpenAPITools/Model/ClassModel.cs | 118 + .../Model/ComplexQuadrilateral.cs | 151 + .../src/Org.OpenAPITools/Model/DanishPig.cs | 128 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 119 + .../Model/DeprecatedObject.cs | 118 + .../src/Org.OpenAPITools/Model/Dog.cs | 126 + .../src/Org.OpenAPITools/Model/DogAllOf.cs | 118 + .../src/Org.OpenAPITools/Model/Drawing.cs | 174 + .../src/Org.OpenAPITools/Model/EnumArrays.cs | 173 + .../src/Org.OpenAPITools/Model/EnumClass.cs | 53 + .../src/Org.OpenAPITools/Model/EnumTest.cs | 337 ++ .../Model/EquilateralTriangle.cs | 151 + .../src/Org.OpenAPITools/Model/File.cs | 119 + .../Model/FileSchemaTestClass.cs | 137 + .../src/Org.OpenAPITools/Model/Foo.cs | 119 + .../Model/FooGetDefaultResponse.cs | 118 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 378 ++ .../src/Org.OpenAPITools/Model/Fruit.cs | 283 ++ .../src/Org.OpenAPITools/Model/FruitReq.cs | 292 ++ .../src/Org.OpenAPITools/Model/GmFruit.cs | 256 ++ .../Model/GrandparentAnimal.cs | 128 + .../Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 149 + .../Model/HealthCheckResult.cs | 118 + .../Model/IsoscelesTriangle.cs | 151 + .../src/Org.OpenAPITools/Model/List.cs | 118 + .../src/Org.OpenAPITools/Model/Mammal.cs | 329 ++ .../src/Org.OpenAPITools/Model/MapTest.cs | 196 + ...dPropertiesAndAdditionalPropertiesClass.cs | 173 + .../Model/Model200Response.cs | 132 + .../src/Org.OpenAPITools/Model/ModelClient.cs | 118 + .../src/Org.OpenAPITools/Model/Name.cs | 177 + .../Org.OpenAPITools/Model/NullableClass.cs | 324 ++ .../Model/NullableGuidClass.cs | 118 + .../Org.OpenAPITools/Model/NullableShape.cs | 292 ++ .../src/Org.OpenAPITools/Model/NumberOnly.cs | 117 + .../Model/ObjectWithDeprecatedFields.cs | 172 + .../src/Org.OpenAPITools/Model/Order.cs | 216 ++ .../Org.OpenAPITools/Model/OuterComposite.cs | 146 + .../src/Org.OpenAPITools/Model/OuterEnum.cs | 53 + .../Model/OuterEnumDefaultValue.cs | 53 + .../Model/OuterEnumInteger.cs | 49 + .../Model/OuterEnumIntegerDefaultValue.cs | 49 + .../src/Org.OpenAPITools/Model/ParentPet.cs | 107 + .../src/Org.OpenAPITools/Model/Pet.cs | 245 ++ .../src/Org.OpenAPITools/Model/Pig.cs | 283 ++ .../Model/PolymorphicProperty.cs | 375 ++ .../Org.OpenAPITools/Model/Quadrilateral.cs | 283 ++ .../Model/QuadrilateralInterface.cs | 128 + .../Org.OpenAPITools/Model/ReadOnlyFirst.cs | 142 + .../src/Org.OpenAPITools/Model/Return.cs | 114 + .../Org.OpenAPITools/Model/ScaleneTriangle.cs | 151 + .../src/Org.OpenAPITools/Model/Shape.cs | 283 ++ .../Org.OpenAPITools/Model/ShapeInterface.cs | 128 + .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 292 ++ .../Model/SimpleQuadrilateral.cs | 151 + .../Model/SpecialModelName.cs | 132 + .../src/Org.OpenAPITools/Model/Tag.cs | 132 + .../src/Org.OpenAPITools/Model/Triangle.cs | 329 ++ .../Model/TriangleInterface.cs | 128 + .../src/Org.OpenAPITools/Model/User.cs | 313 ++ .../src/Org.OpenAPITools/Model/Whale.cs | 156 + .../src/Org.OpenAPITools/Model/Zebra.cs | 185 + .../Org.OpenAPITools/Org.OpenAPITools.asmdef | 7 + 307 files changed, 40822 insertions(+), 6 deletions(-) create mode 100644 bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ApiClient.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ConnectionException.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/README.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/RequestOptions.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/UnexpectedResponseException.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api_test.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef_test.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model.mustache create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model_test.mustache create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.gitignore create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator-ignore create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Activity.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Animal.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ApiResponse.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Apple.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AppleReq.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayTest.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Banana.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BananaReq.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BasquePig.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Capitalization.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Cat.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/CatAllOf.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Category.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCat.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ClassModel.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DanishPig.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Dog.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DogAllOf.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Drawing.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumArrays.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumTest.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeApi.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/File.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Foo.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Fruit.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FruitReq.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GmFruit.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/List.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Mammal.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MapTest.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Model200Response.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ModelClient.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Name.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableShape.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NumberOnly.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Order.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterComposite.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnum.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ParentPet.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pet.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PetApi.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pig.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Return.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Shape.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/StoreApi.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Tag.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Triangle.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/User.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/UserApi.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Whale.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Zebra.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/git_push.sh create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef diff --git a/bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml b/bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml new file mode 100644 index 00000000000..b65bdf593f9 --- /dev/null +++ b/bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml @@ -0,0 +1,6 @@ +# for .net Unity +generatorName: csharp-netcore +outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest +inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +library: unityWebRequest \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index 184df911737..ae7def89f95 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -61,6 +61,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { protected static final String RESTSHARP = "restsharp"; protected static final String HTTPCLIENT = "httpclient"; protected static final String GENERICHOST = "generichost"; + protected static final String UNITY_WEB_REQUEST = "unityWebRequest"; // Project Variable, determined from target framework. Not intended to be user-settable. protected static final String TARGET_FRAMEWORK_IDENTIFIER = "targetFrameworkIdentifier"; @@ -100,6 +101,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { protected boolean supportsRetry = Boolean.TRUE; protected boolean supportsAsync = Boolean.TRUE; protected boolean netStandard = Boolean.FALSE; + protected boolean supportsFileParameters = Boolean.TRUE; protected boolean validatable = Boolean.TRUE; protected Map regexModifiers; @@ -325,6 +327,8 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { + "(Experimental. Subject to breaking changes without notice.)"); supportedLibraries.put(HTTPCLIENT, "HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) " + "(Experimental. Subject to breaking changes without notice.)"); + supportedLibraries.put(UNITY_WEB_REQUEST, "UnityWebRequest (...) " + + "(Experimental. Subject to breaking changes without notice.)"); supportedLibraries.put(RESTSHARP, "RestSharp (https://github.com/restsharp/RestSharp)"); CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "HTTP library template (sub-template) to use"); @@ -701,6 +705,10 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { setLibrary(HTTPCLIENT); additionalProperties.put("useHttpClient", true); needsUriBuilder = true; + } else if (UNITY_WEB_REQUEST.equals(getLibrary())) { + setLibrary(UNITY_WEB_REQUEST); + additionalProperties.put("useUnityWebRequest", true); + needsUriBuilder = true; } else { throw new RuntimeException("Invalid HTTP library " + getLibrary() + ". Only restsharp, httpclient, and generichost are supported."); } @@ -780,6 +788,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { syncBooleanProperty(additionalProperties, CodegenConstants.OPTIONAL_METHOD_ARGUMENT, this::setOptionalMethodArgumentFlag, optionalMethodArgumentFlag); syncBooleanProperty(additionalProperties, CodegenConstants.NON_PUBLIC_API, this::setNonPublicApi, isNonPublicApi()); syncBooleanProperty(additionalProperties, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, this::setUseOneOfDiscriminatorLookup, this.useOneOfDiscriminatorLookup); + syncBooleanProperty(additionalProperties, "supportsFileParameters", this::setSupportsFileParameters, this.supportsFileParameters); final String testPackageName = testPackageName(); String packageFolder = sourceFolder + File.separator + packageName; @@ -816,6 +825,20 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { addGenericHostSupportingFiles(clientPackageDir, packageFolder, excludeTests, testPackageFolder, testPackageName, modelPackageDir); additionalProperties.put("apiDocPath", apiDocPath + File.separatorChar + "apis"); additionalProperties.put("modelDocPath", modelDocPath + File.separatorChar + "models"); + } else if (UNITY_WEB_REQUEST.equals(getLibrary())) { + additionalProperties.put(CodegenConstants.VALIDATABLE, false); + setValidatable(false); + setSupportsRetry(false); + setSupportsAsync(true); + // Some consoles and tvOS do not support either Application.persistentDataPath or will refuse to + // compile/link if you even reference GetTempPath as well. + additionalProperties.put("supportsFileParameters", false); + setSupportsFileParameters(false); + + addSupportingFiles(clientPackageDir, packageFolder, excludeTests, testPackageFolder, testPackageName, modelPackageDir, authPackageDir); + + supportingFiles.add(new SupportingFile("ConnectionException.mustache", clientPackageDir, "ConnectionException.cs")); + supportingFiles.add(new SupportingFile("UnexpectedResponseException.mustache", clientPackageDir, "UnexpectedResponseException.cs")); } else { //restsharp addSupportingFiles(clientPackageDir, packageFolder, excludeTests, testPackageFolder, testPackageName, modelPackageDir, authPackageDir); additionalProperties.put("apiDocPath", apiDocPath); @@ -911,14 +934,24 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore")); - supportingFiles.add(new SupportingFile("Solution.mustache", "", packageName + ".sln")); - supportingFiles.add(new SupportingFile("netcore_project.mustache", packageFolder, packageName + ".csproj")); - - if (Boolean.FALSE.equals(excludeTests.get())) { - supportingFiles.add(new SupportingFile("netcore_testproject.mustache", testPackageFolder, testPackageName + ".csproj")); + if (UNITY_WEB_REQUEST.equals(getLibrary())) { + supportingFiles.add(new SupportingFile("asmdef.mustache", packageFolder, packageName + ".asmdef")); + } else { + supportingFiles.add(new SupportingFile("Solution.mustache", "", packageName + ".sln")); + supportingFiles.add(new SupportingFile("netcore_project.mustache", packageFolder, packageName + ".csproj")); } - supportingFiles.add(new SupportingFile("appveyor.mustache", "", "appveyor.yml")); + if (Boolean.FALSE.equals(excludeTests.get())) { + if (UNITY_WEB_REQUEST.equals(getLibrary())) { + supportingFiles.add(new SupportingFile("asmdef_test.mustache", testPackageFolder, testPackageName + ".asmdef")); + } else { + supportingFiles.add(new SupportingFile("netcore_testproject.mustache", testPackageFolder, testPackageName + ".csproj")); + } + } + + if (!UNITY_WEB_REQUEST.equals(getLibrary())) { + supportingFiles.add(new SupportingFile("appveyor.mustache", "", "appveyor.yml")); + } supportingFiles.add(new SupportingFile("AbstractOpenAPISchema.mustache", modelPackageDir, "AbstractOpenAPISchema.cs")); } @@ -1048,6 +1081,10 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { this.supportsAsync = supportsAsync; } + public void setSupportsFileParameters(Boolean supportsFileParameters) { + this.supportsFileParameters = supportsFileParameters; + } + public void setSupportsRetry(Boolean supportsRetry) { this.supportsRetry = supportsRetry; } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache index 928c5e74073..cfc1469250a 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache @@ -35,10 +35,12 @@ namespace {{packageName}}.Client /// public Dictionary FormParameters { get; set; } + {{#supportsFileParameters}} /// /// File parameters to be sent along with the request. /// public Multimap FileParameters { get; set; } + {{/supportsFileParameters}} /// /// Cookies to be sent along with the request. @@ -76,7 +78,9 @@ namespace {{packageName}}.Client QueryParameters = new Multimap(); HeaderParameters = new Multimap(); FormParameters = new Dictionary(); + {{#supportsFileParameters}} FileParameters = new Multimap(); + {{/supportsFileParameters}} Cookies = new List(); } } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache index 2f6c23598d3..ddfa74e9d5f 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache @@ -361,13 +361,17 @@ namespace {{packageName}}.{{apiPackage}} {{#required}} {{#isFile}} {{#isArray}} + {{#supportsFileParameters}} foreach (var file in {{paramName}}) { localVarRequestOptions.FileParameters.Add("{{baseName}}", file); } + {{/supportsFileParameters}} {{/isArray}} {{^isArray}} + {{#supportsFileParameters}} localVarRequestOptions.FileParameters.Add("{{baseName}}", {{paramName}}); + {{/supportsFileParameters}} {{/isArray}} {{/isFile}} {{^isFile}} @@ -379,13 +383,17 @@ namespace {{packageName}}.{{apiPackage}} { {{#isFile}} {{#isArray}} + {{#supportsFileParameters}} foreach (var file in {{paramName}}) { localVarRequestOptions.FileParameters.Add("{{baseName}}", file); } + {{/supportsFileParameters}} {{/isArray}} {{^isArray}} + {{#supportsFileParameters}} localVarRequestOptions.FileParameters.Add("{{baseName}}", {{paramName}}); + {{/supportsFileParameters}} {{/isArray}} {{/isFile}} {{^isFile}} @@ -602,13 +610,17 @@ namespace {{packageName}}.{{apiPackage}} {{#required}} {{#isFile}} {{#isArray}} + {{#supportsFileParameters}} foreach (var file in {{paramName}}) { localVarRequestOptions.FileParameters.Add("{{baseName}}", file); } + {{/supportsFileParameters}} {{/isArray}} {{^isArray}} + {{#supportsFileParameters}} localVarRequestOptions.FileParameters.Add("{{baseName}}", {{paramName}}); + {{/supportsFileParameters}} {{/isArray}} {{/isFile}} {{^isFile}} @@ -620,13 +632,17 @@ namespace {{packageName}}.{{apiPackage}} { {{#isFile}} {{#isArray}} + {{#supportsFileParameters}} foreach (var file in {{paramName}}) { localVarRequestOptions.FileParameters.Add("{{baseName}}", file); } + {{/supportsFileParameters}} {{/isArray}} {{^isArray}} + {{#supportsFileParameters}} localVarRequestOptions.FileParameters.Add("{{baseName}}", {{paramName}}); + {{/supportsFileParameters}} {{/isArray}} {{/isFile}} {{^isFile}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ApiClient.mustache new file mode 100644 index 00000000000..908c829f53b --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ApiClient.mustache @@ -0,0 +1,639 @@ +{{>partial_header}} + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Net; +using System.Reflection; +using System.Runtime.Serialization; +using System.Runtime.Serialization.Formatters; +using System.Text; +using System.Threading; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; +using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs; +using System.Net.Http; +using System.Net.Http.Headers; +using UnityEngine.Networking; +using UnityEngine; + +namespace {{packageName}}.Client +{ + /// + /// To Serialize/Deserialize JSON using our custom logic, but only when ContentType is JSON. + /// + internal class CustomJsonCodec + { + private readonly IReadableConfiguration _configuration; + private static readonly string _contentType = "application/json"; + private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + public CustomJsonCodec(IReadableConfiguration configuration) + { + _configuration = configuration; + } + + public CustomJsonCodec(JsonSerializerSettings serializerSettings, IReadableConfiguration configuration) + { + _serializerSettings = serializerSettings; + _configuration = configuration; + } + + /// + /// Serialize the object into a JSON string. + /// + /// Object to be serialized. + /// A JSON string. + public string Serialize(object obj) + { + if (obj != null && obj is {{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema) + { + // the object to be serialized is an oneOf/anyOf schema + return (({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema)obj).ToJson(); + } + else + { + return JsonConvert.SerializeObject(obj, _serializerSettings); + } + } + + public T Deserialize(UnityWebRequest request) + { + var result = (T) Deserialize(request, typeof(T)); + return result; + } + + /// + /// Deserialize the JSON string into a proper object. + /// + /// The UnityWebRequest after it has a response. + /// Object type. + /// Object representation of the JSON string. + internal object Deserialize(UnityWebRequest request, Type type) + { + if (type == typeof(byte[])) // return byte array + { + return request.downloadHandler.data; + } + + // TODO: ? if (type.IsAssignableFrom(typeof(Stream))) + if (type == typeof(Stream)) + { + // NOTE: Ignoring Content-Disposition filename support, since not all platforms + // have a location on disk to write arbitrary data (tvOS, consoles). + return new MemoryStream(request.downloadHandler.data); + } + + if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object + { + return DateTime.Parse(request.downloadHandler.text, null, System.Globalization.DateTimeStyles.RoundtripKind); + } + + if (type == typeof(string) || type.Name.StartsWith("System.Nullable")) // return primitive type + { + return Convert.ChangeType(request.downloadHandler.text, type); + } + + var contentType = request.GetResponseHeader("Content-Type"); + + if (!string.IsNullOrEmpty(contentType) && contentType.Contains("application/json")) + { + var text = request.downloadHandler?.text; + + // Generated APIs that don't expect a return value provide System.Object as the type + if (type == typeof(System.Object) && (string.IsNullOrEmpty(text) || text.Trim() == "null")) + { + return null; + } + + if (request.responseCode >= 200 && request.responseCode < 300) + { + try + { + // Deserialize as a model + return JsonConvert.DeserializeObject(text, type, _serializerSettings); + } + catch (Exception e) + { + throw new UnexpectedResponseException(request, type, e.ToString()); + } + } + else + { + throw new ApiException((int)request.responseCode, request.error, text); + } + } + + if (type != typeof(System.Object) && request.responseCode >= 200 && request.responseCode < 300) + { + throw new UnexpectedResponseException(request, type); + } + + return null; + + } + + public string RootElement { get; set; } + public string Namespace { get; set; } + public string DateFormat { get; set; } + + public string ContentType + { + get { return _contentType; } + set { throw new InvalidOperationException("Not allowed to set content type."); } + } + } + /// + /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations), + /// encapsulating general REST accessor use cases. + /// + /// + /// The Dispose method will manage the HttpClient lifecycle when not passed by constructor. + /// + {{>visibility}} partial class ApiClient : IDisposable, ISynchronousClient{{#supportsAsync}}, IAsynchronousClient{{/supportsAsync}} + { + private readonly string _baseUrl; + + /// + /// Specifies the settings on a object. + /// These settings can be adjusted to accommodate custom serialization rules. + /// + public JsonSerializerSettings SerializerSettings { get; set; } = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + /// + /// Initializes a new instance of the , defaulting to the global configurations' base url. + /// + public ApiClient() : + this({{packageName}}.Client.GlobalConfiguration.Instance.BasePath) + { + } + + /// + /// Initializes a new instance of the . + /// + /// The target service's base path in URL format. + /// + public ApiClient(string basePath) + { + if (string.IsNullOrEmpty(basePath)) throw new ArgumentException("basePath cannot be empty"); + + _baseUrl = basePath; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + } + + /// + /// Provides all logic for constructing a new UnityWebRequest. + /// At this point, all information for querying the service is known. Here, it is simply + /// mapped into the UnityWebRequest. + /// + /// The http verb. + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// [private] A new UnityWebRequest instance. + /// + private UnityWebRequest NewRequest( + string method, + string path, + RequestOptions options, + IReadableConfiguration configuration) + { + if (path == null) throw new ArgumentNullException("path"); + if (options == null) throw new ArgumentNullException("options"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + WebRequestPathBuilder builder = new WebRequestPathBuilder(_baseUrl, path); + + builder.AddPathParameters(options.PathParameters); + + builder.AddQueryParameters(options.QueryParameters); + + string contentType = null; + if (options.HeaderParameters != null && options.HeaderParameters.ContainsKey("Content-Type")) + { + var contentTypes = options.HeaderParameters["Content-Type"]; + contentType = contentTypes.FirstOrDefault(); + } + + var uri = builder.GetFullUri(); + UnityWebRequest request = null; + + if (contentType == "multipart/form-data") + { + var formData = new List(); + foreach (var formParameter in options.FormParameters) + { + formData.Add(new MultipartFormDataSection(formParameter.Key, formParameter.Value)); + } + + request = UnityWebRequest.Post(uri, formData); + request.method = method; + } + else if (contentType == "application/x-www-form-urlencoded") + { + var form = new WWWForm(); + foreach (var kvp in options.FormParameters) + { + form.AddField(kvp.Key, kvp.Value); + } + + request = UnityWebRequest.Post(uri, form); + request.method = method; + } + else if (options.Data != null) + { + var serializer = new CustomJsonCodec(SerializerSettings, configuration); + var jsonData = serializer.Serialize(options.Data); + + // Making a post body application/json encoded is whack with UnityWebRequest. + // See: https://stackoverflow.com/questions/68156230/unitywebrequest-post-not-sending-body + request = UnityWebRequest.Put(uri, jsonData); + request.method = method; + request.SetRequestHeader("Content-Type", "application/json"); + } + else + { + request = new UnityWebRequest(builder.GetFullUri(), method); + } + + if (request.downloadHandler == null && typeof(T) != typeof(System.Object)) + { + request.downloadHandler = new DownloadHandlerBuffer(); + } + +#if UNITY_EDITOR || !UNITY_WEBGL + if (configuration.UserAgent != null) + { + request.SetRequestHeader("User-Agent", configuration.UserAgent); + } +#endif + + if (configuration.DefaultHeaders != null) + { + foreach (var headerParam in configuration.DefaultHeaders) + { + request.SetRequestHeader(headerParam.Key, headerParam.Value); + } + } + + if (options.HeaderParameters != null) + { + foreach (var headerParam in options.HeaderParameters) + { + foreach (var value in headerParam.Value) + { + // Todo make content headers actually content headers + request.SetRequestHeader(headerParam.Key, value); + } + } + } + + if (options.Cookies != null && options.Cookies.Count > 0) + { + #if UNITY_WEBGL + throw new System.InvalidOperationException("UnityWebRequest does not support setting cookies in WebGL"); + #else + if (options.Cookies.Count != 1) + { + UnityEngine.Debug.LogError("Only one cookie supported, ignoring others"); + } + + request.SetRequestHeader("Cookie", options.Cookies[0].ToString()); + #endif + } + + return request; + + } + + partial void InterceptRequest(UnityWebRequest req, string path, RequestOptions options, IReadableConfiguration configuration); + partial void InterceptResponse(UnityWebRequest req, string path, RequestOptions options, IReadableConfiguration configuration, ref object responseData); + + private ApiResponse ToApiResponse(UnityWebRequest request, object responseData) + { + T result = (T) responseData; + + var transformed = new ApiResponse((HttpStatusCode)request.responseCode, new Multimap({{#caseInsensitiveResponseHeaders}}StringComparer.OrdinalIgnoreCase{{/caseInsensitiveResponseHeaders}}), result, request.downloadHandler?.text ?? "") + { + ErrorText = request.error, + Cookies = new List() + }; + + // process response headers, e.g. Access-Control-Allow-Methods + var responseHeaders = request.GetResponseHeaders(); + if (responseHeaders != null) + { + foreach (var responseHeader in request.GetResponseHeaders()) + { + transformed.Headers.Add(responseHeader.Key, ClientUtils.ParameterToString(responseHeader.Value)); + } + } + + return transformed; + } + + private async Task> ExecAsync( + UnityWebRequest request, + string path, + RequestOptions options, + IReadableConfiguration configuration, + System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var deserializer = new CustomJsonCodec(SerializerSettings, configuration); + + using (request) + { + if (configuration.Timeout > 0) + { + request.timeout = (int)Math.Ceiling(configuration.Timeout / 1000.0f); + } + + if (configuration.Proxy != null) + { + throw new InvalidOperationException("Configuration `Proxy` not supported by UnityWebRequest"); + } + + if (configuration.ClientCertificates != null) + { + // Only Android/iOS/tvOS/Standalone players can support certificates, and this + // implementation is intended to work on all platforms. + // + // TODO: Could optionally allow support for this on these platforms. + // + // See: https://docs.unity3d.com/ScriptReference/Networking.CertificateHandler.html + throw new InvalidOperationException("Configuration `ClientCertificates` not supported by UnityWebRequest on all platforms"); + } + + InterceptRequest(request, path, options, configuration); + + var asyncOp = request.SendWebRequest(); + + TaskCompletionSource tsc = new TaskCompletionSource(); + asyncOp.completed += (_) => tsc.TrySetResult(request.result); + + using (var tokenRegistration = cancellationToken.Register(request.Abort, true)) + { + await tsc.Task; + } + + if (request.result == UnityWebRequest.Result.ConnectionError || + request.result == UnityWebRequest.Result.DataProcessingError) + { + throw new ConnectionException(request); + } + + object responseData = deserializer.Deserialize(request); + + // if the response type is oneOf/anyOf, call FromJSON to deserialize the data + if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) + { + responseData = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { new ByteArrayContent(request.downloadHandler.data) }); + } + else if (typeof(T).Name == "Stream") // for binary response + { + responseData = (T) (object) new MemoryStream(request.downloadHandler.data); + } + + InterceptResponse(request, path, options, configuration, ref responseData); + + return ToApiResponse(request, responseData); + } + } + + {{#supportsAsync}} + #region IAsynchronousClient + /// + /// Make a HTTP GET request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> GetAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("GET", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP POST request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PostAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("POST", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP PUT request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PutAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("PUT", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP DELETE request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> DeleteAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("DELETE", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP HEAD request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> HeadAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("HEAD", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP OPTION request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> OptionsAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("OPTIONS", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP PATCH request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PatchAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("PATCH", path, options, config), path, options, config, cancellationToken); + } + #endregion IAsynchronousClient + {{/supportsAsync}} + + #region ISynchronousClient + /// + /// Make a HTTP GET request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Get(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP POST request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Post(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP PUT request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Put(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP DELETE request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Delete(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP HEAD request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Head(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP OPTION request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Options(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP PATCH request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Patch(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + #endregion ISynchronousClient + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ConnectionException.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ConnectionException.mustache new file mode 100644 index 00000000000..108ea3bf567 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ConnectionException.mustache @@ -0,0 +1,21 @@ +{{>partial_header}} + +using System; +using UnityEngine.Networking; + +namespace {{packageName}}.Client +{ + public class ConnectionException : Exception + { + public UnityWebRequest.Result Result { get; private set; } + public string Error { get; private set; } + + // NOTE: Cannot keep reference to the request since it will be disposed. + public ConnectionException(UnityWebRequest request) + : base($"result={request.result} error={request.error}") + { + Result = request.result; + Error = request.error ?? ""; + } + } +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/README.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/README.mustache new file mode 100644 index 00000000000..a36233a78d2 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/README.mustache @@ -0,0 +1,178 @@ +# {{packageName}} - the C# library for the {{appName}} + +{{#appDescriptionWithNewLines}} +{{{.}}} +{{/appDescriptionWithNewLines}} + +This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: + +- API version: {{appVersion}} +- SDK version: {{packageVersion}} +{{^hideGenerationTimestamp}} +- Build date: {{generatedDate}} +{{/hideGenerationTimestamp}} +- Build package: {{generatorClass}} +{{#infoUrl}} + For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}}) +{{/infoUrl}} + + +## Version support +This generator should support all current LTS versions of Unity +- Unity 2020.3 (LTS) and up +- .NET Standard 2.1 / .NET Framework + + +## Dependencies + +- [Newtonsoft.Json](https://docs.unity3d.com/Packages/com.unity.nuget.newtonsoft-json@3.0/manual/index.html) - 3.0.2 or later +- [Unity Test Framework](https://docs.unity3d.com/Packages/com.unity.test-framework@1.1/manual/index.html) - 1.1.33 or later + + +## Installation +Add the dependencies to `Packages/manifest.json` +``` +{ + "dependencies": { + ... + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.test-framework": "1.1.33", + } +} +``` + +Then use the namespaces: +```csharp +using {{packageName}}.{{apiPackage}}; +using {{packageName}}.Client; +using {{packageName}}.{{modelPackage}}; +``` + + +## Getting Started + +```csharp +using System; +using System.Collections.Generic; +using UnityEngine; +using {{packageName}}.{{apiPackage}}; +using {{packageName}}.Client; +using {{packageName}}.{{modelPackage}}; + +namespace {{packageName}}Example +{ +{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}} + public class {{operationId}}Example : MonoBehaviour + { + async void Start() + { + Configuration config = new Configuration(); + config.BasePath = "{{{basePath}}}"; + {{#hasAuthMethods}} + {{#authMethods}} + {{#isBasicBasic}} + // Configure HTTP basic authorization: {{{name}}} + config.Username = "YOUR_USERNAME"; + config.Password = "YOUR_PASSWORD"; + {{/isBasicBasic}} + {{#isBasicBearer}} + // Configure Bearer token for authorization: {{{name}}} + config.AccessToken = "YOUR_BEARER_TOKEN"; + {{/isBasicBearer}} + {{#isApiKey}} + // Configure API key authorization: {{{name}}} + config.ApiKey.Add("{{{keyParamName}}}", "YOUR_API_KEY"); + // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed + // config.ApiKeyPrefix.Add("{{{keyParamName}}}", "Bearer"); + {{/isApiKey}} + {{#isOAuth}} + // Configure OAuth2 access token for authorization: {{{name}}} + config.AccessToken = "YOUR_ACCESS_TOKEN"; + {{/isOAuth}} + {{/authMethods}} + + {{/hasAuthMethods}} + var apiInstance = new {{classname}}(config); + {{#allParams}} + {{#isPrimitiveType}} + var {{paramName}} = {{{example}}}; // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}} + {{/isPrimitiveType}} + {{^isPrimitiveType}} + var {{paramName}} = new {{{dataType}}}(); // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}} + {{/isPrimitiveType}} + {{/allParams}} + + try + { + {{#summary}} + // {{{.}}} + {{/summary}} + {{#returnType}}{{{.}}} result = {{/returnType}}await apiInstance.{{{operationId}}}Async({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});{{#returnType}} + Debug.Log(result);{{/returnType}} + Debug.Log("Done!"); + } + catch (ApiException e) + { + Debug.LogError("Exception when calling {{classname}}.{{operationId}}: " + e.Message ); + Debug.LogError("Status Code: "+ e.ErrorCode); + Debug.LogError(e.StackTrace); + } +{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}} + } + } +} +``` + + +## Documentation for API Endpoints + +All URIs are relative to *{{{basePath}}}* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{{summary}}} +{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}} + + +## Documentation for Models + +{{#modelPackage}} +{{#models}}{{#model}} - [{{{modelPackage}}}.{{{classname}}}]({{modelDocPath}}{{{classname}}}.md) +{{/model}}{{/models}} +{{/modelPackage}} +{{^modelPackage}} +No model defined in this package +{{/modelPackage}} + + +## Documentation for Authorization + +{{^authMethods}} +All endpoints do not require authorization. +{{/authMethods}} +{{#authMethods}} +{{#last}} +Authentication schemes defined for the API: +{{/last}} +{{/authMethods}} +{{#authMethods}} + +### {{name}} + +{{#isApiKey}}- **Type**: API key +- **API key parameter name**: {{keyParamName}} +- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}} +{{/isApiKey}} +{{#isBasicBasic}}- **Type**: HTTP basic authentication +{{/isBasicBasic}} +{{#isBasicBearer}}- **Type**: Bearer Authentication +{{/isBasicBearer}} +{{#isOAuth}}- **Type**: OAuth +- **Flow**: {{flow}} +- **Authorization URL**: {{authorizationUrl}} +- **Scopes**: {{^scopes}}N/A{{/scopes}} +{{#scopes}} - {{scope}}: {{description}} +{{/scopes}} +{{/isOAuth}} + +{{/authMethods}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/RequestOptions.mustache new file mode 100644 index 00000000000..0dd18c4ed60 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/RequestOptions.mustache @@ -0,0 +1,60 @@ +{{>partial_header}} + +using System; +using System.Collections.Generic; +using System.IO; +using System.Net; + +namespace {{packageName}}.Client +{ + /// + /// A container for generalized request inputs. This type allows consumers to extend the request functionality + /// by abstracting away from the default (built-in) request framework (e.g. RestSharp). + /// + public class RequestOptions + { + /// + /// Parameters to be bound to path parts of the Request's URL + /// + public Dictionary PathParameters { get; set; } + + /// + /// Query parameters to be applied to the request. + /// Keys may have 1 or more values associated. + /// + public Multimap QueryParameters { get; set; } + + /// + /// Header parameters to be applied to to the request. + /// Keys may have 1 or more values associated. + /// + public Multimap HeaderParameters { get; set; } + + /// + /// Form parameters to be sent along with the request. + /// + public Dictionary FormParameters { get; set; } + + /// + /// Cookies to be sent along with the request. + /// + public List Cookies { get; set; } + + /// + /// Any data associated with a request body. + /// + public Object Data { get; set; } + + /// + /// Constructs a new instance of + /// + public RequestOptions() + { + PathParameters = new Dictionary(); + QueryParameters = new Multimap(); + HeaderParameters = new Multimap(); + FormParameters = new Dictionary(); + Cookies = new List(); + } + } +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/UnexpectedResponseException.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/UnexpectedResponseException.mustache new file mode 100644 index 00000000000..a976b2a76be --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/UnexpectedResponseException.mustache @@ -0,0 +1,26 @@ +{{>partial_header}} + +using System; +using UnityEngine.Networking; + +namespace {{packageName}}.Client +{ + // Thrown when a backend doesn't return an expected response based on the expected type + // of the response data. + public class UnexpectedResponseException : Exception + { + public int ErrorCode { get; private set; } + + // NOTE: Cannot keep reference to the request since it will be disposed. + public UnexpectedResponseException(UnityWebRequest request, System.Type type, string extra = "") + : base(CreateMessage(request, type, extra)) + { + ErrorCode = (int)request.responseCode; + } + + private static string CreateMessage(UnityWebRequest request, System.Type type, string extra) + { + return $"httpcode={request.responseCode}, expected {type.Name} but got data: {extra}"; + } + } +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api.mustache new file mode 100644 index 00000000000..6b0a5883d30 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api.mustache @@ -0,0 +1,690 @@ +{{>partial_header}} + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using {{packageName}}.Client; +{{#hasImport}}using {{packageName}}.{{modelPackage}}; +{{/hasImport}} + +namespace {{packageName}}.{{apiPackage}} +{ + {{#operations}} + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + {{>visibility}} interface {{interfacePrefix}}{{classname}}Sync : IApiAccessor + { + #region Synchronous Operations + {{#operation}} + /// + /// {{summary}} + /// + {{#notes}} + /// + /// {{.}} + /// + {{/notes}} + /// Thrown when fails to make API call + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} + {{/allParams}}/// {{returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} + {{{returnType}}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}); + + /// + /// {{summary}} + /// + /// + /// {{notes}} + /// + /// Thrown when fails to make API call + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} + {{/allParams}}/// ApiResponse of {{returnType}}{{^returnType}}Object(void){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} + ApiResponse<{{{returnType}}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}); + {{/operation}} + #endregion Synchronous Operations + } + + {{#supportsAsync}} + /// + /// Represents a collection of functions to interact with the API endpoints + /// + {{>visibility}} interface {{interfacePrefix}}{{classname}}Async : IApiAccessor + { + #region Asynchronous Operations + {{#operation}} + /// + /// {{summary}} + /// + /// + /// {{notes}} + /// + /// Thrown when fails to make API call + {{#allParams}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} + {{/allParams}} + /// Cancellation Token to cancel the request. + /// Task of {{returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} + {{#returnType}}System.Threading.Tasks.Task<{{{.}}}>{{/returnType}}{{^returnType}}System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// {{summary}} + /// + /// + /// {{notes}} + /// + /// Thrown when fails to make API call + {{#allParams}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} + {{/allParams}} + /// Cancellation Token to cancel the request. + /// Task of ApiResponse{{#returnType}} ({{.}}){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} + System.Threading.Tasks.Task> {{operationId}}WithHttpInfoAsync({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + {{/operation}} + #endregion Asynchronous Operations + } + {{/supportsAsync}} + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + {{>visibility}} interface {{interfacePrefix}}{{classname}} : {{interfacePrefix}}{{classname}}Sync{{#supportsAsync}}, {{interfacePrefix}}{{classname}}Async{{/supportsAsync}} + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + {{>visibility}} partial class {{classname}} : IDisposable, {{interfacePrefix}}{{classname}} + { + private {{packageName}}.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// + public {{classname}}() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// The target service's base path in URL format. + /// + /// + public {{classname}}(string basePath) + { + this.Configuration = {{packageName}}.Client.Configuration.MergeConfigurations( + {{packageName}}.Client.GlobalConfiguration.Instance, + new {{packageName}}.Client.Configuration { BasePath = basePath } + ); + this.ApiClient = new {{packageName}}.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + {{#supportsAsync}} + this.AsynchronousClient = this.ApiClient; + {{/supportsAsync}} + this.ExceptionFactory = {{packageName}}.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class using Configuration object. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// An instance of Configuration. + /// + /// + public {{classname}}({{packageName}}.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = {{packageName}}.Client.Configuration.MergeConfigurations( + {{packageName}}.Client.GlobalConfiguration.Instance, + configuration + ); + this.ApiClient = new {{packageName}}.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + {{#supportsAsync}} + this.AsynchronousClient = this.ApiClient; + {{/supportsAsync}} + ExceptionFactory = {{packageName}}.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access.{{#supportsAsync}} + /// The client interface for asynchronous API access.{{/supportsAsync}} + /// The configuration object. + /// + public {{classname}}({{packageName}}.Client.ISynchronousClient client, {{#supportsAsync}}{{packageName}}.Client.IAsynchronousClient asyncClient, {{/supportsAsync}}{{packageName}}.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + {{#supportsAsync}} + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + {{/supportsAsync}} + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + {{#supportsAsync}} + this.AsynchronousClient = asyncClient; + {{/supportsAsync}} + this.Configuration = configuration; + this.ExceptionFactory = {{packageName}}.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + this.ApiClient?.Dispose(); + } + + /// + /// Holds the ApiClient if created + /// + public {{packageName}}.Client.ApiClient ApiClient { get; set; } = null; + + {{#supportsAsync}} + /// + /// The client for accessing this underlying API asynchronously. + /// + public {{packageName}}.Client.IAsynchronousClient AsynchronousClient { get; set; } + {{/supportsAsync}} + + /// + /// The client for accessing this underlying API synchronously. + /// + public {{packageName}}.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public {{packageName}}.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public {{packageName}}.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + {{#operation}} + /// + /// {{summary}} {{notes}} + /// + /// Thrown when fails to make API call + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} + {{/allParams}}/// {{returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} + public {{{returnType}}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) + { + {{#returnType}}{{packageName}}.Client.ApiResponse<{{{returnType}}}> localVarResponse = {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); + return localVarResponse.Data;{{/returnType}}{{^returnType}}{{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});{{/returnType}} + } + + /// + /// {{summary}} {{notes}} + /// + /// Thrown when fails to make API call + {{#allParams}}/// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} + {{/allParams}}/// ApiResponse of {{returnType}}{{^returnType}}Object(void){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} + public {{packageName}}.Client.ApiResponse<{{{returnType}}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) + { + {{#allParams}} + {{#required}} + {{^vendorExtensions.x-csharp-value-type}} + // verify the required parameter '{{paramName}}' is set + if ({{paramName}} == null) + throw new {{packageName}}.Client.ApiException(400, "Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}"); + + {{/vendorExtensions.x-csharp-value-type}} + {{/required}} + {{/allParams}} + {{packageName}}.Client.RequestOptions localVarRequestOptions = new {{packageName}}.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + {{#consumes}} + "{{{mediaType}}}"{{^-last}},{{/-last}} + {{/consumes}} + }; + + // to determine the Accept header + string[] _accepts = new string[] { + {{#produces}} + "{{{mediaType}}}"{{^-last}},{{/-last}} + {{/produces}} + }; + + var localVarContentType = {{packageName}}.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = {{packageName}}.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + {{#pathParams}} + {{#required}} + localVarRequestOptions.PathParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // path parameter + {{/required}} + {{^required}} + if ({{paramName}} != null) + { + localVarRequestOptions.PathParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // path parameter + } + {{/required}} + {{/pathParams}} + {{#queryParams}} + {{#required}} + {{#isDeepObject}} + {{#items.vars}} + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.{{name}})); + {{/items.vars}} + {{^items}} + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("deepObject", "{{baseName}}", {{paramName}})); + {{/items}} + {{/isDeepObject}} + {{^isDeepObject}} + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}})); + {{/isDeepObject}} + {{/required}} + {{^required}} + if ({{paramName}} != null) + { + {{#isDeepObject}} + {{#items.vars}} + if ({{paramName}}.{{name}} != null) + { + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.{{name}})); + } + {{/items.vars}} + {{^items}} + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("deepObject", "{{baseName}}", {{paramName}})); + {{/items}} + {{/isDeepObject}} + {{^isDeepObject}} + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}})); + {{/isDeepObject}} + } + {{/required}} + {{/queryParams}} + {{#headerParams}} + {{#required}} + localVarRequestOptions.HeaderParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // header parameter + {{/required}} + {{^required}} + if ({{paramName}} != null) + { + localVarRequestOptions.HeaderParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // header parameter + } + {{/required}} + {{/headerParams}} + {{#formParams}} + {{#required}} + {{#isFile}} + {{/isFile}} + {{^isFile}} + localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // form parameter + {{/isFile}} + {{/required}} + {{^required}} + if ({{paramName}} != null) + { + {{#isFile}} + {{/isFile}} + {{^isFile}} + localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // form parameter + {{/isFile}} + } + {{/required}} + {{/formParams}} + {{#bodyParam}} + localVarRequestOptions.Data = {{paramName}}; + {{/bodyParam}} + + {{#authMethods}} + // authentication ({{name}}) required + {{#isApiKey}} + {{#isKeyInCookie}} + // cookie parameter support + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))) + { + localVarRequestOptions.Cookies.Add(new Cookie("{{keyParamName}}", this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))); + } + {{/isKeyInCookie}} + {{#isKeyInHeader}} + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))) + { + localVarRequestOptions.HeaderParameters.Add("{{keyParamName}}", this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}")); + } + {{/isKeyInHeader}} + {{#isKeyInQuery}} + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))) + { + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("", "{{keyParamName}}", this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))); + } + {{/isKeyInQuery}} + {{/isApiKey}} + {{#isBasicBasic}} + // http basic authentication required + if (!string.IsNullOrEmpty(this.Configuration.Username) || !string.IsNullOrEmpty(this.Configuration.Password) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Basic " + {{packageName}}.Client.ClientUtils.Base64Encode(this.Configuration.Username + ":" + this.Configuration.Password)); + } + {{/isBasicBasic}} + {{#isBasicBearer}} + // bearer authentication required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + {{/isBasicBearer}} + {{#isOAuth}} + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + {{/isOAuth}} + {{#isHttpSignature}} + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "{{{httpMethod}}}", "{{{path}}}", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + {{/isHttpSignature}} + {{/authMethods}} + + // make the HTTP request + var localVarResponse = this.Client.{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}<{{{returnType}}}{{^returnType}}Object{{/returnType}}>("{{{path}}}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("{{operationId}}", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + {{#supportsAsync}} + /// + /// {{summary}} {{notes}} + /// + /// Thrown when fails to make API call + {{#allParams}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} + {{/allParams}} + /// Cancellation Token to cancel the request. + /// Task of {{returnType}}{{^returnType}}void{{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} + {{#returnType}}public async System.Threading.Tasks.Task<{{{.}}}>{{/returnType}}{{^returnType}}public async System.Threading.Tasks.Task{{/returnType}} {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = {{operationId}}WithHttpInfoAsync({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}cancellationToken); + {{#returnType}} +#if UNITY_EDITOR || !UNITY_WEBGL + {{packageName}}.Client.ApiResponse<{{{returnType}}}> localVarResponse = await task.ConfigureAwait(false); +#else + {{packageName}}.Client.ApiResponse<{{{returnType}}}> localVarResponse = await task; +#endif + return localVarResponse.Data; + {{/returnType}} + {{^returnType}} +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + {{/returnType}} + } + + /// + /// {{summary}} {{notes}} + /// + /// Thrown when fails to make API call + {{#allParams}} + /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} + {{/allParams}} + /// Cancellation Token to cancel the request. + /// Task of ApiResponse{{#returnType}} ({{.}}){{/returnType}} + {{#isDeprecated}} + [Obsolete] + {{/isDeprecated}} + public async System.Threading.Tasks.Task<{{packageName}}.Client.ApiResponse<{{{returnType}}}{{^returnType}}Object{{/returnType}}>> {{operationId}}WithHttpInfoAsync({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = default({{{dataType}}}){{/optionalMethodArgument}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + {{#allParams}} + {{#required}} + {{^vendorExtensions.x-csharp-value-type}} + // verify the required parameter '{{paramName}}' is set + if ({{paramName}} == null) + throw new {{packageName}}.Client.ApiException(400, "Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}"); + + {{/vendorExtensions.x-csharp-value-type}} + {{/required}} + {{/allParams}} + + {{packageName}}.Client.RequestOptions localVarRequestOptions = new {{packageName}}.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + {{#consumes}} + "{{{mediaType}}}"{{^-last}}, {{/-last}} + {{/consumes}} + }; + + // to determine the Accept header + string[] _accepts = new string[] { + {{#produces}} + "{{{mediaType}}}"{{^-last}},{{/-last}} + {{/produces}} + }; + + + var localVarContentType = {{packageName}}.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = {{packageName}}.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + {{#pathParams}} + {{#required}} + localVarRequestOptions.PathParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // path parameter + {{/required}} + {{^required}} + if ({{paramName}} != null) + { + localVarRequestOptions.PathParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // path parameter + } + {{/required}} + {{/pathParams}} + {{#queryParams}} + {{#required}} + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}})); + {{/required}} + {{^required}} + if ({{paramName}} != null) + { + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}})); + } + {{/required}} + {{/queryParams}} + {{#headerParams}} + {{#required}} + localVarRequestOptions.HeaderParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // header parameter + {{/required}} + {{^required}} + if ({{paramName}} != null) + { + localVarRequestOptions.HeaderParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // header parameter + } + {{/required}} + {{/headerParams}} + {{#formParams}} + {{#required}} + {{#isFile}} + {{/isFile}} + {{^isFile}} + localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // form parameter + {{/isFile}} + {{/required}} + {{^required}} + if ({{paramName}} != null) + { + {{#isFile}} + {{/isFile}} + {{^isFile}} + localVarRequestOptions.FormParameters.Add("{{baseName}}", {{packageName}}.Client.ClientUtils.ParameterToString({{paramName}})); // form parameter + {{/isFile}} + } + {{/required}} + {{/formParams}} + {{#bodyParam}} + localVarRequestOptions.Data = {{paramName}}; + {{/bodyParam}} + + {{#authMethods}} + // authentication ({{name}}) required + {{#isApiKey}} + {{#isKeyInCookie}} + // cookie parameter support + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))) + { + localVarRequestOptions.Cookies.Add(new Cookie("{{keyParamName}}", this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))); + } + {{/isKeyInCookie}} + {{#isKeyInHeader}} + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))) + { + localVarRequestOptions.HeaderParameters.Add("{{keyParamName}}", this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}")); + } + {{/isKeyInHeader}} + {{#isKeyInQuery}} + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))) + { + localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("", "{{keyParamName}}", this.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))); + } + {{/isKeyInQuery}} + {{/isApiKey}} + {{#isBasic}} + {{#isBasicBasic}} + // http basic authentication required + if (!string.IsNullOrEmpty(this.Configuration.Username) || !string.IsNullOrEmpty(this.Configuration.Password) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Basic " + {{packageName}}.Client.ClientUtils.Base64Encode(this.Configuration.Username + ":" + this.Configuration.Password)); + } + {{/isBasicBasic}} + {{#isBasicBearer}} + // bearer authentication required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + {{/isBasicBearer}} + {{/isBasic}} + {{#isOAuth}} + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + {{/isOAuth}} + {{#isHttpSignature}} + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "{{{httpMethod}}}", "{{{path}}}", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + {{/isHttpSignature}} + {{/authMethods}} + + // make the HTTP request + + var task = this.AsynchronousClient.{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}}Async<{{{returnType}}}{{^returnType}}Object{{/returnType}}>("{{{path}}}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("{{operationId}}", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + {{/supportsAsync}} + {{/operation}} + } + {{/operations}} +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api_test.mustache new file mode 100644 index 00000000000..0f7f49f7f63 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api_test.mustache @@ -0,0 +1,74 @@ +{{>partial_header}} +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +using {{packageName}}.Client; +using {{packageName}}.{{apiPackage}}; +{{#hasImport}} +// uncomment below to import models +//using {{packageName}}.{{modelPackage}}; +{{/hasImport}} + +namespace {{packageName}}.Test.Api +{ + /// + /// Class for testing {{classname}} + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class {{classname}}Tests : IDisposable + { + {{^nonPublicApi}} + private {{classname}} instance; + + {{/nonPublicApi}} + public {{classname}}Tests() + { + {{^nonPublicApi}} + instance = new {{classname}}(); + {{/nonPublicApi}} + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of {{classname}} + /// + [Test] + public void {{operationId}}InstanceTest() + { + // TODO uncomment below to test 'IsType' {{classname}} + //Assert.IsType<{{classname}}>(instance); + } + {{#operations}} + {{#operation}} + + /// + /// Test {{operationId}} + /// + [Test] + public void {{operationId}}Test() + { + // TODO uncomment below to test the method and replace null with proper value + {{#allParams}} + //{{{dataType}}} {{paramName}} = null; + {{/allParams}} + //{{#returnType}}var response = {{/returnType}}instance.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); + {{#returnType}} + //Assert.IsType<{{{.}}}>(response); + {{/returnType}} + } + {{/operation}} + {{/operations}} + } +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef.mustache new file mode 100644 index 00000000000..a30cba8cc0b --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef.mustache @@ -0,0 +1,7 @@ +{ + "name": "{{packageName}}", + "overrideReferences": true, + "precompiledReferences": [ + "Newtonsoft.Json.dll" + ] +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef_test.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef_test.mustache new file mode 100644 index 00000000000..c5e2d5852ca --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef_test.mustache @@ -0,0 +1,15 @@ +{ + "name": "{{testPackageName}}", + "references": [ + "{{packageName}}", + "UnityEngine.TestRunner" + ], + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll", + "Newtonsoft.Json.dll" + ], + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ] +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model.mustache new file mode 100644 index 00000000000..3c1c6c0e252 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model.mustache @@ -0,0 +1,47 @@ +{{>partial_header}} + +{{#models}} +{{#model}} +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +{{#vendorExtensions.x-com-visible}} +using System.Runtime.InteropServices; +{{/vendorExtensions.x-com-visible}} +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +{{/model}} +{{/models}} +{{#validatable}} +using System.ComponentModel.DataAnnotations; +{{/validatable}} +using OpenAPIDateConverter = {{packageName}}.Client.OpenAPIDateConverter; +{{#useCompareNetObjects}} +using OpenAPIClientUtils = {{packageName}}.Client.ClientUtils; +{{/useCompareNetObjects}} +{{#models}} +{{#model}} +{{#oneOf}} +{{#-first}} +using System.Reflection; +{{/-first}} +{{/oneOf}} +{{#anyOf}} +{{#-first}} +using System.Reflection; +{{/-first}} +{{/anyOf}} + +namespace {{packageName}}.{{modelPackage}} +{ +{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{#anyOf}}{{#-first}}{{>modelAnyOf}}{{/-first}}{{/anyOf}}{{^oneOf}}{{^anyOf}}{{>modelGeneric}}{{/anyOf}}{{/oneOf}}{{/isEnum}} +{{/model}} +{{/models}} +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model_test.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model_test.mustache new file mode 100644 index 00000000000..404623281e2 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model_test.mustache @@ -0,0 +1,64 @@ +{{>partial_header}} + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using {{packageName}}.{{apiPackage}}; +using {{packageName}}.{{modelPackage}}; +using {{packageName}}.{{clientPackage}}; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +{{#models}} +{{#model}} +namespace {{packageName}}.Test.Model +{ + /// + /// Class for testing {{classname}} + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class {{classname}}Tests : IDisposable + { + // TODO uncomment below to declare an instance variable for {{classname}} + //private {{classname}} instance; + + public {{classname}}Tests() + { + // TODO uncomment below to create an instance of {{classname}} + //instance = new {{classname}}(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of {{classname}} + /// + [Test] + public void {{classname}}InstanceTest() + { + // TODO uncomment below to test "IsType" {{classname}} + //Assert.IsType<{{classname}}>(instance); + } + + {{#vars}} + /// + /// Test the property '{{name}}' + /// + [Test] + public void {{name}}Test() + { + // TODO unit test for the property '{{name}}' + } + {{/vars}} + } +} +{{/model}} +{{/models}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache index 3b61b31644d..f8925f76e28 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache @@ -8,12 +8,14 @@ [ComVisible({{{vendorExtensions.x-com-visible}}})] {{/vendorExtensions.x-com-visible}} [DataContract(Name = "{{{name}}}")] + {{^useUnityWebRequest}} {{#discriminator}} [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")] {{#mappedModels}} [JsonSubtypes.KnownSubType(typeof({{{modelName}}}), "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")] {{/mappedModels}} {{/discriminator}} + {{/useUnityWebRequest}} {{>visibility}} partial class {{classname}} : {{#parent}}{{{.}}}, {{/parent}}IEquatable<{{classname}}>{{#validatable}}, IValidatableObject{{/validatable}} { {{#vars}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.gitignore b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.gitignore new file mode 100644 index 00000000000..1ee53850b84 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.gitignore @@ -0,0 +1,362 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator-ignore b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES new file mode 100644 index 00000000000..2668d8a45b1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES @@ -0,0 +1,200 @@ +.gitignore +README.md +docs/Activity.md +docs/ActivityOutputElementRepresentation.md +docs/AdditionalPropertiesClass.md +docs/Animal.md +docs/AnotherFakeApi.md +docs/ApiResponse.md +docs/Apple.md +docs/AppleReq.md +docs/ArrayOfArrayOfNumberOnly.md +docs/ArrayOfNumberOnly.md +docs/ArrayTest.md +docs/Banana.md +docs/BananaReq.md +docs/BasquePig.md +docs/Capitalization.md +docs/Cat.md +docs/CatAllOf.md +docs/Category.md +docs/ChildCat.md +docs/ChildCatAllOf.md +docs/ClassModel.md +docs/ComplexQuadrilateral.md +docs/DanishPig.md +docs/DateOnlyClass.md +docs/DefaultApi.md +docs/DeprecatedObject.md +docs/Dog.md +docs/DogAllOf.md +docs/Drawing.md +docs/EnumArrays.md +docs/EnumClass.md +docs/EnumTest.md +docs/EquilateralTriangle.md +docs/FakeApi.md +docs/FakeClassnameTags123Api.md +docs/File.md +docs/FileSchemaTestClass.md +docs/Foo.md +docs/FooGetDefaultResponse.md +docs/FormatTest.md +docs/Fruit.md +docs/FruitReq.md +docs/GmFruit.md +docs/GrandparentAnimal.md +docs/HasOnlyReadOnly.md +docs/HealthCheckResult.md +docs/IsoscelesTriangle.md +docs/List.md +docs/Mammal.md +docs/MapTest.md +docs/MixedPropertiesAndAdditionalPropertiesClass.md +docs/Model200Response.md +docs/ModelClient.md +docs/Name.md +docs/NullableClass.md +docs/NullableGuidClass.md +docs/NullableShape.md +docs/NumberOnly.md +docs/ObjectWithDeprecatedFields.md +docs/Order.md +docs/OuterComposite.md +docs/OuterEnum.md +docs/OuterEnumDefaultValue.md +docs/OuterEnumInteger.md +docs/OuterEnumIntegerDefaultValue.md +docs/ParentPet.md +docs/Pet.md +docs/PetApi.md +docs/Pig.md +docs/PolymorphicProperty.md +docs/Quadrilateral.md +docs/QuadrilateralInterface.md +docs/ReadOnlyFirst.md +docs/Return.md +docs/ScaleneTriangle.md +docs/Shape.md +docs/ShapeInterface.md +docs/ShapeOrNull.md +docs/SimpleQuadrilateral.md +docs/SpecialModelName.md +docs/StoreApi.md +docs/Tag.md +docs/Triangle.md +docs/TriangleInterface.md +docs/User.md +docs/UserApi.md +docs/Whale.md +docs/Zebra.md +git_push.sh +src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef +src/Org.OpenAPITools/Api/AnotherFakeApi.cs +src/Org.OpenAPITools/Api/DefaultApi.cs +src/Org.OpenAPITools/Api/FakeApi.cs +src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +src/Org.OpenAPITools/Api/PetApi.cs +src/Org.OpenAPITools/Api/StoreApi.cs +src/Org.OpenAPITools/Api/UserApi.cs +src/Org.OpenAPITools/Client/ApiClient.cs +src/Org.OpenAPITools/Client/ApiException.cs +src/Org.OpenAPITools/Client/ApiResponse.cs +src/Org.OpenAPITools/Client/ClientUtils.cs +src/Org.OpenAPITools/Client/Configuration.cs +src/Org.OpenAPITools/Client/ConnectionException.cs +src/Org.OpenAPITools/Client/ExceptionFactory.cs +src/Org.OpenAPITools/Client/GlobalConfiguration.cs +src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +src/Org.OpenAPITools/Client/IApiAccessor.cs +src/Org.OpenAPITools/Client/IAsynchronousClient.cs +src/Org.OpenAPITools/Client/IReadableConfiguration.cs +src/Org.OpenAPITools/Client/ISynchronousClient.cs +src/Org.OpenAPITools/Client/Multimap.cs +src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs +src/Org.OpenAPITools/Client/RequestOptions.cs +src/Org.OpenAPITools/Client/UnexpectedResponseException.cs +src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs +src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs +src/Org.OpenAPITools/Model/Activity.cs +src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +src/Org.OpenAPITools/Model/Animal.cs +src/Org.OpenAPITools/Model/ApiResponse.cs +src/Org.OpenAPITools/Model/Apple.cs +src/Org.OpenAPITools/Model/AppleReq.cs +src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +src/Org.OpenAPITools/Model/ArrayTest.cs +src/Org.OpenAPITools/Model/Banana.cs +src/Org.OpenAPITools/Model/BananaReq.cs +src/Org.OpenAPITools/Model/BasquePig.cs +src/Org.OpenAPITools/Model/Capitalization.cs +src/Org.OpenAPITools/Model/Cat.cs +src/Org.OpenAPITools/Model/CatAllOf.cs +src/Org.OpenAPITools/Model/Category.cs +src/Org.OpenAPITools/Model/ChildCat.cs +src/Org.OpenAPITools/Model/ChildCatAllOf.cs +src/Org.OpenAPITools/Model/ClassModel.cs +src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +src/Org.OpenAPITools/Model/DanishPig.cs +src/Org.OpenAPITools/Model/DateOnlyClass.cs +src/Org.OpenAPITools/Model/DeprecatedObject.cs +src/Org.OpenAPITools/Model/Dog.cs +src/Org.OpenAPITools/Model/DogAllOf.cs +src/Org.OpenAPITools/Model/Drawing.cs +src/Org.OpenAPITools/Model/EnumArrays.cs +src/Org.OpenAPITools/Model/EnumClass.cs +src/Org.OpenAPITools/Model/EnumTest.cs +src/Org.OpenAPITools/Model/EquilateralTriangle.cs +src/Org.OpenAPITools/Model/File.cs +src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +src/Org.OpenAPITools/Model/Foo.cs +src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +src/Org.OpenAPITools/Model/FormatTest.cs +src/Org.OpenAPITools/Model/Fruit.cs +src/Org.OpenAPITools/Model/FruitReq.cs +src/Org.OpenAPITools/Model/GmFruit.cs +src/Org.OpenAPITools/Model/GrandparentAnimal.cs +src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +src/Org.OpenAPITools/Model/HealthCheckResult.cs +src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/Mammal.cs +src/Org.OpenAPITools/Model/MapTest.cs +src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +src/Org.OpenAPITools/Model/Model200Response.cs +src/Org.OpenAPITools/Model/ModelClient.cs +src/Org.OpenAPITools/Model/Name.cs +src/Org.OpenAPITools/Model/NullableClass.cs +src/Org.OpenAPITools/Model/NullableGuidClass.cs +src/Org.OpenAPITools/Model/NullableShape.cs +src/Org.OpenAPITools/Model/NumberOnly.cs +src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +src/Org.OpenAPITools/Model/Order.cs +src/Org.OpenAPITools/Model/OuterComposite.cs +src/Org.OpenAPITools/Model/OuterEnum.cs +src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +src/Org.OpenAPITools/Model/OuterEnumInteger.cs +src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +src/Org.OpenAPITools/Model/ParentPet.cs +src/Org.OpenAPITools/Model/Pet.cs +src/Org.OpenAPITools/Model/Pig.cs +src/Org.OpenAPITools/Model/PolymorphicProperty.cs +src/Org.OpenAPITools/Model/Quadrilateral.cs +src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +src/Org.OpenAPITools/Model/Return.cs +src/Org.OpenAPITools/Model/ScaleneTriangle.cs +src/Org.OpenAPITools/Model/Shape.cs +src/Org.OpenAPITools/Model/ShapeInterface.cs +src/Org.OpenAPITools/Model/ShapeOrNull.cs +src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +src/Org.OpenAPITools/Model/SpecialModelName.cs +src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/Triangle.cs +src/Org.OpenAPITools/Model/TriangleInterface.cs +src/Org.OpenAPITools/Model/User.cs +src/Org.OpenAPITools/Model/Whale.cs +src/Org.OpenAPITools/Model/Zebra.cs +src/Org.OpenAPITools/Org.OpenAPITools.asmdef diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION new file mode 100644 index 00000000000..7f4d792ec2c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION @@ -0,0 +1 @@ +6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md new file mode 100644 index 00000000000..1f3950ee5b0 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md @@ -0,0 +1,260 @@ +# Org.OpenAPITools - the C# library for the 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: \" \\ + +This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: + +- API version: 1.0.0 +- SDK version: 1.0.0 +- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen + + +## Version support +This generator should support all current LTS versions of Unity +- Unity 2020.3 (LTS) and up +- .NET Standard 2.1 / .NET Framework + + +## Dependencies + +- [Newtonsoft.Json](https://docs.unity3d.com/Packages/com.unity.nuget.newtonsoft-json@3.0/manual/index.html) - 3.0.2 or later +- [Unity Test Framework](https://docs.unity3d.com/Packages/com.unity.test-framework@1.1/manual/index.html) - 1.1.33 or later + + +## Installation +Add the dependencies to `Packages/manifest.json` +``` +{ + "dependencies": { + ... + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.test-framework": "1.1.33", + } +} +``` + +Then use the namespaces: +```csharp +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; +``` + + +## Getting Started + +```csharp +using System; +using System.Collections.Generic; +using UnityEngine; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPIToolsExample +{ + + public class Call123TestSpecialTagsExample : MonoBehaviour + { + async void Start() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new AnotherFakeApi(config); + var modelClient = new ModelClient(); // ModelClient | client model + + try + { + // To test special tags + ModelClient result = await apiInstance.Call123TestSpecialTagsAsync(modelClient); + Debug.Log(result); + Debug.Log("Done!"); + } + catch (ApiException e) + { + Debug.LogError("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message ); + Debug.LogError("Status Code: "+ e.ErrorCode); + Debug.LogError(e.StackTrace); + } + + } + } +} +``` + + +## Documentation for API Endpoints + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*AnotherFakeApi* | [**Call123TestSpecialTags**](AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags +*DefaultApi* | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | +*DefaultApi* | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | +*FakeApi* | [**FakeHealthGet**](FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint +*FakeApi* | [**FakeOuterBooleanSerialize**](FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | +*FakeApi* | [**FakeOuterCompositeSerialize**](FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | +*FakeApi* | [**FakeOuterNumberSerialize**](FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | +*FakeApi* | [**FakeOuterStringSerialize**](FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | +*FakeApi* | [**GetArrayOfEnums**](FakeApi.md#getarrayofenums) | **GET** /fake/array-of-enums | Array of Enums +*FakeApi* | [**TestBodyWithFileSchema**](FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | +*FakeApi* | [**TestBodyWithQueryParams**](FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | +*FakeApi* | [**TestClientModel**](FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model +*FakeApi* | [**TestEndpointParameters**](FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 +*FakeApi* | [**TestEnumParameters**](FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters +*FakeApi* | [**TestGroupParameters**](FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional) +*FakeApi* | [**TestInlineAdditionalProperties**](FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties +*FakeApi* | [**TestJsonFormData**](FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data +*FakeApi* | [**TestQueryParameterCollectionFormat**](FakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-parameters | +*FakeClassnameTags123Api* | [**TestClassname**](FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case +*PetApi* | [**AddPet**](PetApi.md#addpet) | **POST** /pet | Add a new pet to the store +*PetApi* | [**DeletePet**](PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet +*PetApi* | [**FindPetsByStatus**](PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status +*PetApi* | [**FindPetsByTags**](PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags +*PetApi* | [**GetPetById**](PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID +*PetApi* | [**UpdatePet**](PetApi.md#updatepet) | **PUT** /pet | Update an existing pet +*PetApi* | [**UpdatePetWithForm**](PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data +*PetApi* | [**UploadFile**](PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image +*PetApi* | [**UploadFileWithRequiredFile**](PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required) +*StoreApi* | [**DeleteOrder**](StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID +*StoreApi* | [**GetInventory**](StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status +*StoreApi* | [**GetOrderById**](StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID +*StoreApi* | [**PlaceOrder**](StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet +*UserApi* | [**CreateUser**](UserApi.md#createuser) | **POST** /user | Create user +*UserApi* | [**CreateUsersWithArrayInput**](UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array +*UserApi* | [**CreateUsersWithListInput**](UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array +*UserApi* | [**DeleteUser**](UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user +*UserApi* | [**GetUserByName**](UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name +*UserApi* | [**LoginUser**](UserApi.md#loginuser) | **GET** /user/login | Logs user into the system +*UserApi* | [**LogoutUser**](UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session +*UserApi* | [**UpdateUser**](UserApi.md#updateuser) | **PUT** /user/{username} | Updated user + + + +## Documentation for Models + + - [Model.Activity](Activity.md) + - [Model.ActivityOutputElementRepresentation](ActivityOutputElementRepresentation.md) + - [Model.AdditionalPropertiesClass](AdditionalPropertiesClass.md) + - [Model.Animal](Animal.md) + - [Model.ApiResponse](ApiResponse.md) + - [Model.Apple](Apple.md) + - [Model.AppleReq](AppleReq.md) + - [Model.ArrayOfArrayOfNumberOnly](ArrayOfArrayOfNumberOnly.md) + - [Model.ArrayOfNumberOnly](ArrayOfNumberOnly.md) + - [Model.ArrayTest](ArrayTest.md) + - [Model.Banana](Banana.md) + - [Model.BananaReq](BananaReq.md) + - [Model.BasquePig](BasquePig.md) + - [Model.Capitalization](Capitalization.md) + - [Model.Cat](Cat.md) + - [Model.CatAllOf](CatAllOf.md) + - [Model.Category](Category.md) + - [Model.ChildCat](ChildCat.md) + - [Model.ChildCatAllOf](ChildCatAllOf.md) + - [Model.ClassModel](ClassModel.md) + - [Model.ComplexQuadrilateral](ComplexQuadrilateral.md) + - [Model.DanishPig](DanishPig.md) + - [Model.DateOnlyClass](DateOnlyClass.md) + - [Model.DeprecatedObject](DeprecatedObject.md) + - [Model.Dog](Dog.md) + - [Model.DogAllOf](DogAllOf.md) + - [Model.Drawing](Drawing.md) + - [Model.EnumArrays](EnumArrays.md) + - [Model.EnumClass](EnumClass.md) + - [Model.EnumTest](EnumTest.md) + - [Model.EquilateralTriangle](EquilateralTriangle.md) + - [Model.File](File.md) + - [Model.FileSchemaTestClass](FileSchemaTestClass.md) + - [Model.Foo](Foo.md) + - [Model.FooGetDefaultResponse](FooGetDefaultResponse.md) + - [Model.FormatTest](FormatTest.md) + - [Model.Fruit](Fruit.md) + - [Model.FruitReq](FruitReq.md) + - [Model.GmFruit](GmFruit.md) + - [Model.GrandparentAnimal](GrandparentAnimal.md) + - [Model.HasOnlyReadOnly](HasOnlyReadOnly.md) + - [Model.HealthCheckResult](HealthCheckResult.md) + - [Model.IsoscelesTriangle](IsoscelesTriangle.md) + - [Model.List](List.md) + - [Model.Mammal](Mammal.md) + - [Model.MapTest](MapTest.md) + - [Model.MixedPropertiesAndAdditionalPropertiesClass](MixedPropertiesAndAdditionalPropertiesClass.md) + - [Model.Model200Response](Model200Response.md) + - [Model.ModelClient](ModelClient.md) + - [Model.Name](Name.md) + - [Model.NullableClass](NullableClass.md) + - [Model.NullableGuidClass](NullableGuidClass.md) + - [Model.NullableShape](NullableShape.md) + - [Model.NumberOnly](NumberOnly.md) + - [Model.ObjectWithDeprecatedFields](ObjectWithDeprecatedFields.md) + - [Model.Order](Order.md) + - [Model.OuterComposite](OuterComposite.md) + - [Model.OuterEnum](OuterEnum.md) + - [Model.OuterEnumDefaultValue](OuterEnumDefaultValue.md) + - [Model.OuterEnumInteger](OuterEnumInteger.md) + - [Model.OuterEnumIntegerDefaultValue](OuterEnumIntegerDefaultValue.md) + - [Model.ParentPet](ParentPet.md) + - [Model.Pet](Pet.md) + - [Model.Pig](Pig.md) + - [Model.PolymorphicProperty](PolymorphicProperty.md) + - [Model.Quadrilateral](Quadrilateral.md) + - [Model.QuadrilateralInterface](QuadrilateralInterface.md) + - [Model.ReadOnlyFirst](ReadOnlyFirst.md) + - [Model.Return](Return.md) + - [Model.ScaleneTriangle](ScaleneTriangle.md) + - [Model.Shape](Shape.md) + - [Model.ShapeInterface](ShapeInterface.md) + - [Model.ShapeOrNull](ShapeOrNull.md) + - [Model.SimpleQuadrilateral](SimpleQuadrilateral.md) + - [Model.SpecialModelName](SpecialModelName.md) + - [Model.Tag](Tag.md) + - [Model.Triangle](Triangle.md) + - [Model.TriangleInterface](TriangleInterface.md) + - [Model.User](User.md) + - [Model.Whale](Whale.md) + - [Model.Zebra](Zebra.md) + + + +## Documentation for Authorization + + +### petstore_auth + +- **Type**: OAuth +- **Flow**: implicit +- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog +- **Scopes**: + - write:pets: modify pets in your account + - read:pets: read your pets + + +### api_key + +- **Type**: API key +- **API key parameter name**: api_key +- **Location**: HTTP header + + +### api_key_query + +- **Type**: API key +- **API key parameter name**: api_key_query +- **Location**: URL query string + + +### http_basic_test + +- **Type**: HTTP basic authentication + + +### bearer_test + +- **Type**: Bearer Authentication + + +### http_signature_test + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Activity.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Activity.md new file mode 100644 index 00000000000..27a4e457199 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Activity.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Activity +test map of maps + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ActivityOutputs** | **Dictionary<string, List<ActivityOutputElementRepresentation>>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md new file mode 100644 index 00000000000..21f226b3952 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.ActivityOutputElementRepresentation + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Prop1** | **string** | | [optional] +**Prop2** | **Object** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md new file mode 100644 index 00000000000..c40cd0f8acc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md @@ -0,0 +1,17 @@ +# Org.OpenAPITools.Model.AdditionalPropertiesClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**MapProperty** | **Dictionary<string, string>** | | [optional] +**MapOfMapProperty** | **Dictionary<string, Dictionary<string, string>>** | | [optional] +**Anytype1** | **Object** | | [optional] +**MapWithUndeclaredPropertiesAnytype1** | **Object** | | [optional] +**MapWithUndeclaredPropertiesAnytype2** | **Object** | | [optional] +**MapWithUndeclaredPropertiesAnytype3** | **Dictionary<string, Object>** | | [optional] +**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it's an empty map. | [optional] +**MapWithUndeclaredPropertiesString** | **Dictionary<string, string>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Animal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Animal.md new file mode 100644 index 00000000000..f14b7a3ae4e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Animal.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Animal + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ClassName** | **string** | | +**Color** | **string** | | [optional] [default to "red"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md new file mode 100644 index 00000000000..0ddc28a1191 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md @@ -0,0 +1,99 @@ +# Org.OpenAPITools.Api.AnotherFakeApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +| Method | HTTP request | Description | +|--------|--------------|-------------| +| [**Call123TestSpecialTags**](AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags | + + +# **Call123TestSpecialTags** +> ModelClient Call123TestSpecialTags (ModelClient modelClient) + +To test special tags + +To test special tags and operation ID starting with number + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class Call123TestSpecialTagsExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new AnotherFakeApi(config); + var modelClient = new ModelClient(); // ModelClient | client model + + try + { + // To test special tags + ModelClient result = apiInstance.Call123TestSpecialTags(modelClient); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the Call123TestSpecialTagsWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // To test special tags + ApiResponse response = apiInstance.Call123TestSpecialTagsWithHttpInfo(modelClient); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTagsWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **modelClient** | [**ModelClient**](ModelClient.md) | client model | | + +### Return type + +[**ModelClient**](ModelClient.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ApiResponse.md new file mode 100644 index 00000000000..bb723d2baa1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ApiResponse.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.ApiResponse + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Code** | **int** | | [optional] +**Type** | **string** | | [optional] +**Message** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Apple.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Apple.md new file mode 100644 index 00000000000..1f819f8f281 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Apple.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Apple + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Cultivar** | **string** | | [optional] +**Origin** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AppleReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AppleReq.md new file mode 100644 index 00000000000..005b8f8058a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AppleReq.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.AppleReq + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Cultivar** | **string** | | +**Mealy** | **bool** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md new file mode 100644 index 00000000000..4764c0ff80c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.ArrayOfArrayOfNumberOnly + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ArrayArrayNumber** | **List<List<decimal>>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md new file mode 100644 index 00000000000..d93717103b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.ArrayOfNumberOnly + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ArrayNumber** | **List<decimal>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayTest.md new file mode 100644 index 00000000000..d74d11bae77 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayTest.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.ArrayTest + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ArrayOfString** | **List<string>** | | [optional] +**ArrayArrayOfInteger** | **List<List<long>>** | | [optional] +**ArrayArrayOfModel** | **List<List<ReadOnlyFirst>>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Banana.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Banana.md new file mode 100644 index 00000000000..226952d1cec --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Banana.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.Banana + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**LengthCm** | **decimal** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BananaReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BananaReq.md new file mode 100644 index 00000000000..f99aab99e38 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BananaReq.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.BananaReq + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**LengthCm** | **decimal** | | +**Sweet** | **bool** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BasquePig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BasquePig.md new file mode 100644 index 00000000000..681be0bc7e3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BasquePig.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.BasquePig + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ClassName** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Capitalization.md new file mode 100644 index 00000000000..1b1352d918f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Capitalization.md @@ -0,0 +1,15 @@ +# Org.OpenAPITools.Model.Capitalization + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**SmallCamel** | **string** | | [optional] +**CapitalCamel** | **string** | | [optional] +**SmallSnake** | **string** | | [optional] +**CapitalSnake** | **string** | | [optional] +**SCAETHFlowPoints** | **string** | | [optional] +**ATT_NAME** | **string** | Name of the pet | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Cat.md new file mode 100644 index 00000000000..aa1ac17604e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Cat.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.Cat + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ClassName** | **string** | | +**Color** | **string** | | [optional] [default to "red"] +**Declawed** | **bool** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/CatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/CatAllOf.md new file mode 100644 index 00000000000..6cbaaa14e81 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/CatAllOf.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.CatAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Declawed** | **bool** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Category.md new file mode 100644 index 00000000000..032a1faeb3f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Category.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Category + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Id** | **long** | | [optional] +**Name** | **string** | | [default to "default-name"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCat.md new file mode 100644 index 00000000000..072ad05b36d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCat.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.ChildCat + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] +**PetType** | **string** | | [optional] [default to PetTypeEnum.ChildCat] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md new file mode 100644 index 00000000000..864d33e80e7 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.ChildCatAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] +**PetType** | **string** | | [optional] [default to PetTypeEnum.ChildCat] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ClassModel.md new file mode 100644 index 00000000000..f39982657c8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ClassModel.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.ClassModel +Model for testing model with \"_class\" property + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Class** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md new file mode 100644 index 00000000000..65a6097ce3f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.ComplexQuadrilateral + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**QuadrilateralType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DanishPig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DanishPig.md new file mode 100644 index 00000000000..d9cf6527a3f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DanishPig.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.DanishPig + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ClassName** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md new file mode 100644 index 00000000000..d0912d2ac41 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.DateOnlyClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**DateOnlyProperty** | **DateTime** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md new file mode 100644 index 00000000000..265fec1a6f9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md @@ -0,0 +1,174 @@ +# Org.OpenAPITools.Api.DefaultApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +| Method | HTTP request | Description | +|--------|--------------|-------------| +| [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | +| [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | + + +# **FooGet** +> FooGetDefaultResponse FooGet () + + + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class FooGetExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + FooGetDefaultResponse result = apiInstance.FooGet(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.FooGet: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the FooGetWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + ApiResponse response = apiInstance.FooGetWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.FooGetWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +[**FooGetDefaultResponse**](FooGetDefaultResponse.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **0** | response | - | + +[[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) + + +# **GetCountry** +> void GetCountry (string country) + + + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class GetCountryExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + var country = "country_example"; // string | + + try + { + apiInstance.GetCountry(country); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.GetCountry: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the GetCountryWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + apiInstance.GetCountryWithHttpInfo(country); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.GetCountryWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **country** | **string** | | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/x-www-form-urlencoded + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | OK | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md new file mode 100644 index 00000000000..bb7824a3d64 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.DeprecatedObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Dog.md new file mode 100644 index 00000000000..3aa00144e9a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Dog.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.Dog + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ClassName** | **string** | | +**Color** | **string** | | [optional] [default to "red"] +**Breed** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DogAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DogAllOf.md new file mode 100644 index 00000000000..c1096f2c310 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DogAllOf.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.DogAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Breed** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Drawing.md new file mode 100644 index 00000000000..6b7122940af --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Drawing.md @@ -0,0 +1,13 @@ +# Org.OpenAPITools.Model.Drawing + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**MainShape** | [**Shape**](Shape.md) | | [optional] +**ShapeOrNull** | [**ShapeOrNull**](ShapeOrNull.md) | | [optional] +**NullableShape** | [**NullableShape**](NullableShape.md) | | [optional] +**Shapes** | [**List<Shape>**](Shape.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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumArrays.md new file mode 100644 index 00000000000..62e34f03dbc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumArrays.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.EnumArrays + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**JustSymbol** | **string** | | [optional] +**ArrayEnum** | **List<EnumArrays.ArrayEnumEnum>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumClass.md new file mode 100644 index 00000000000..38f309437db --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumClass.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.EnumClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumTest.md new file mode 100644 index 00000000000..5ce3c4addd9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumTest.md @@ -0,0 +1,18 @@ +# Org.OpenAPITools.Model.EnumTest + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EnumString** | **string** | | [optional] +**EnumStringRequired** | **string** | | +**EnumInteger** | **int** | | [optional] +**EnumIntegerOnly** | **int** | | [optional] +**EnumNumber** | **double** | | [optional] +**OuterEnum** | **OuterEnum** | | [optional] +**OuterEnumInteger** | **OuterEnumInteger** | | [optional] +**OuterEnumDefaultValue** | **OuterEnumDefaultValue** | | [optional] +**OuterEnumIntegerDefaultValue** | **OuterEnumIntegerDefaultValue** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md new file mode 100644 index 00000000000..ab06d96ca30 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.EquilateralTriangle + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**TriangleType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeApi.md new file mode 100644 index 00000000000..4b5bf803c4e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeApi.md @@ -0,0 +1,1394 @@ +# Org.OpenAPITools.Api.FakeApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +| Method | HTTP request | Description | +|--------|--------------|-------------| +| [**FakeHealthGet**](FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint | +| [**FakeOuterBooleanSerialize**](FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | | +| [**FakeOuterCompositeSerialize**](FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | | +| [**FakeOuterNumberSerialize**](FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | | +| [**FakeOuterStringSerialize**](FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | | +| [**GetArrayOfEnums**](FakeApi.md#getarrayofenums) | **GET** /fake/array-of-enums | Array of Enums | +| [**TestBodyWithFileSchema**](FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | | +| [**TestBodyWithQueryParams**](FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | | +| [**TestClientModel**](FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model | +| [**TestEndpointParameters**](FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 | +| [**TestEnumParameters**](FakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters | +| [**TestGroupParameters**](FakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional) | +| [**TestInlineAdditionalProperties**](FakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties | +| [**TestJsonFormData**](FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data | +| [**TestQueryParameterCollectionFormat**](FakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-parameters | | + + +# **FakeHealthGet** +> HealthCheckResult FakeHealthGet () + +Health check endpoint + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class FakeHealthGetExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + + try + { + // Health check endpoint + HealthCheckResult result = apiInstance.FakeHealthGet(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.FakeHealthGet: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the FakeHealthGetWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Health check endpoint + ApiResponse response = apiInstance.FakeHealthGetWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.FakeHealthGetWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +[**HealthCheckResult**](HealthCheckResult.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | The instance started successfully | - | + +[[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) + + +# **FakeOuterBooleanSerialize** +> bool FakeOuterBooleanSerialize (bool? body = null) + + + +Test serialization of outer boolean types + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class FakeOuterBooleanSerializeExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var body = true; // bool? | Input boolean as post body (optional) + + try + { + bool result = apiInstance.FakeOuterBooleanSerialize(body); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.FakeOuterBooleanSerialize: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the FakeOuterBooleanSerializeWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + ApiResponse response = apiInstance.FakeOuterBooleanSerializeWithHttpInfo(body); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.FakeOuterBooleanSerializeWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **body** | **bool?** | Input boolean as post body | [optional] | + +### Return type + +**bool** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: */* + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Output boolean | - | + +[[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) + + +# **FakeOuterCompositeSerialize** +> OuterComposite FakeOuterCompositeSerialize (OuterComposite outerComposite = null) + + + +Test serialization of object with outer number type + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class FakeOuterCompositeSerializeExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var outerComposite = new OuterComposite(); // OuterComposite | Input composite as post body (optional) + + try + { + OuterComposite result = apiInstance.FakeOuterCompositeSerialize(outerComposite); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.FakeOuterCompositeSerialize: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the FakeOuterCompositeSerializeWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + ApiResponse response = apiInstance.FakeOuterCompositeSerializeWithHttpInfo(outerComposite); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.FakeOuterCompositeSerializeWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **outerComposite** | [**OuterComposite**](OuterComposite.md) | Input composite as post body | [optional] | + +### Return type + +[**OuterComposite**](OuterComposite.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: */* + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Output composite | - | + +[[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) + + +# **FakeOuterNumberSerialize** +> decimal FakeOuterNumberSerialize (decimal? body = null) + + + +Test serialization of outer number types + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class FakeOuterNumberSerializeExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var body = 8.14D; // decimal? | Input number as post body (optional) + + try + { + decimal result = apiInstance.FakeOuterNumberSerialize(body); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.FakeOuterNumberSerialize: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the FakeOuterNumberSerializeWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + ApiResponse response = apiInstance.FakeOuterNumberSerializeWithHttpInfo(body); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.FakeOuterNumberSerializeWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **body** | **decimal?** | Input number as post body | [optional] | + +### Return type + +**decimal** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: */* + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Output number | - | + +[[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) + + +# **FakeOuterStringSerialize** +> string FakeOuterStringSerialize (Guid requiredStringUuid, string body = null) + + + +Test serialization of outer string types + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class FakeOuterStringSerializeExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var requiredStringUuid = "requiredStringUuid_example"; // Guid | Required UUID String + var body = "body_example"; // string | Input string as post body (optional) + + try + { + string result = apiInstance.FakeOuterStringSerialize(requiredStringUuid, body); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.FakeOuterStringSerialize: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the FakeOuterStringSerializeWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + ApiResponse response = apiInstance.FakeOuterStringSerializeWithHttpInfo(requiredStringUuid, body); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.FakeOuterStringSerializeWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **requiredStringUuid** | **Guid** | Required UUID String | | +| **body** | **string** | Input string as post body | [optional] | + +### Return type + +**string** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: */* + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Output string | - | + +[[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) + + +# **GetArrayOfEnums** +> List<OuterEnum> GetArrayOfEnums () + +Array of Enums + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class GetArrayOfEnumsExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + + try + { + // Array of Enums + List result = apiInstance.GetArrayOfEnums(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.GetArrayOfEnums: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the GetArrayOfEnumsWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Array of Enums + ApiResponse> response = apiInstance.GetArrayOfEnumsWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.GetArrayOfEnumsWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +[**List<OuterEnum>**](OuterEnum.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Got named array of 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) + + +# **TestBodyWithFileSchema** +> void TestBodyWithFileSchema (FileSchemaTestClass fileSchemaTestClass) + + + +For this test, the body for this request much reference a schema named `File`. + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestBodyWithFileSchemaExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var fileSchemaTestClass = new FileSchemaTestClass(); // FileSchemaTestClass | + + try + { + apiInstance.TestBodyWithFileSchema(fileSchemaTestClass); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestBodyWithFileSchema: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestBodyWithFileSchemaWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + apiInstance.TestBodyWithFileSchemaWithHttpInfo(fileSchemaTestClass); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestBodyWithFileSchemaWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **fileSchemaTestClass** | [**FileSchemaTestClass**](FileSchemaTestClass.md) | | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Success | - | + +[[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) + + +# **TestBodyWithQueryParams** +> void TestBodyWithQueryParams (string query, User user) + + + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestBodyWithQueryParamsExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var query = "query_example"; // string | + var user = new User(); // User | + + try + { + apiInstance.TestBodyWithQueryParams(query, user); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestBodyWithQueryParams: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestBodyWithQueryParamsWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestBodyWithQueryParamsWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **query** | **string** | | | +| **user** | [**User**](User.md) | | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Success | - | + +[[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) + + +# **TestClientModel** +> ModelClient TestClientModel (ModelClient modelClient) + +To test \"client\" model + +To test \"client\" model + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestClientModelExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var modelClient = new ModelClient(); // ModelClient | client model + + try + { + // To test \"client\" model + ModelClient result = apiInstance.TestClientModel(modelClient); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestClientModel: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestClientModelWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // To test \"client\" model + ApiResponse response = apiInstance.TestClientModelWithHttpInfo(modelClient); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestClientModelWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **modelClient** | [**ModelClient**](ModelClient.md) | client model | | + +### Return type + +[**ModelClient**](ModelClient.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **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) + + +# **TestEndpointParameters** +> void TestEndpointParameters (decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null, string callback = null) + +Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + +Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestEndpointParametersExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure HTTP basic authorization: http_basic_test + config.Username = "YOUR_USERNAME"; + config.Password = "YOUR_PASSWORD"; + + var apiInstance = new FakeApi(config); + var number = 8.14D; // decimal | None + var _double = 1.2D; // double | None + var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // string | None + var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE"); // byte[] | None + var integer = 56; // int? | None (optional) + var int32 = 56; // int? | None (optional) + var int64 = 789L; // long? | None (optional) + var _float = 3.4F; // float? | None (optional) + var _string = "_string_example"; // string | None (optional) + var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream | None (optional) + var date = DateTime.Parse("2013-10-20"); // DateTime? | None (optional) + var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00""); // DateTime? | None (optional) (default to "2010-02-01T10:20:10.111110+01:00") + var password = "password_example"; // string | None (optional) + var callback = "callback_example"; // string | None (optional) + + try + { + // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestEndpointParameters: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestEndpointParametersWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + apiInstance.TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestEndpointParametersWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **number** | **decimal** | None | | +| **_double** | **double** | None | | +| **patternWithoutDelimiter** | **string** | None | | +| **_byte** | **byte[]** | None | | +| **integer** | **int?** | None | [optional] | +| **int32** | **int?** | None | [optional] | +| **int64** | **long?** | None | [optional] | +| **_float** | **float?** | None | [optional] | +| **_string** | **string** | None | [optional] | +| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional] | +| **date** | **DateTime?** | None | [optional] | +| **dateTime** | **DateTime?** | None | [optional] [default to "2010-02-01T10:20:10.111110+01:00"] | +| **password** | **string** | None | [optional] | +| **callback** | **string** | None | [optional] | + +### Return type + +void (empty response body) + +### Authorization + +[http_basic_test](../README.md#http_basic_test) + +### HTTP request headers + + - **Content-Type**: application/x-www-form-urlencoded + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **400** | Invalid username supplied | - | +| **404** | User not found | - | + +[[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) + + +# **TestEnumParameters** +> void TestEnumParameters (List enumHeaderStringArray = null, string enumHeaderString = null, List enumQueryStringArray = null, string enumQueryString = null, int? enumQueryInteger = null, double? enumQueryDouble = null, List enumFormStringArray = null, string enumFormString = null) + +To test enum parameters + +To test enum parameters + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestEnumParametersExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var enumHeaderStringArray = new List(); // List | Header parameter enum test (string array) (optional) + var enumHeaderString = "_abc"; // string | Header parameter enum test (string) (optional) (default to -efg) + var enumQueryStringArray = new List(); // List | Query parameter enum test (string array) (optional) + var enumQueryString = "_abc"; // string | Query parameter enum test (string) (optional) (default to -efg) + var enumQueryInteger = 1; // int? | Query parameter enum test (double) (optional) + var enumQueryDouble = 1.1D; // double? | Query parameter enum test (double) (optional) + var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional) (default to $) + var enumFormString = "_abc"; // string | Form parameter enum test (string) (optional) (default to -efg) + + try + { + // To test enum parameters + apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestEnumParameters: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestEnumParametersWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // To test enum parameters + apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestEnumParametersWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **enumHeaderStringArray** | [**List<string>**](string.md) | Header parameter enum test (string array) | [optional] | +| **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] | +| **enumQueryStringArray** | [**List<string>**](string.md) | Query parameter enum test (string array) | [optional] | +| **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] | +| **enumQueryInteger** | **int?** | Query parameter enum test (double) | [optional] | +| **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional] | +| **enumFormStringArray** | [**List<string>**](string.md) | Form parameter enum test (string array) | [optional] [default to $] | +| **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/x-www-form-urlencoded + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **400** | Invalid request | - | +| **404** | Not found | - | + +[[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) + + +# **TestGroupParameters** +> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null) + +Fake endpoint to test group parameters (optional) + +Fake endpoint to test group parameters (optional) + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestGroupParametersExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure Bearer token for authorization: bearer_test + config.AccessToken = "YOUR_BEARER_TOKEN"; + + var apiInstance = new FakeApi(config); + var requiredStringGroup = 56; // int | Required String in group parameters + var requiredBooleanGroup = true; // bool | Required Boolean in group parameters + var requiredInt64Group = 789L; // long | Required Integer in group parameters + var stringGroup = 56; // int? | String in group parameters (optional) + var booleanGroup = true; // bool? | Boolean in group parameters (optional) + var int64Group = 789L; // long? | Integer in group parameters (optional) + + try + { + // Fake endpoint to test group parameters (optional) + apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestGroupParameters: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestGroupParametersWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Fake endpoint to test group parameters (optional) + apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestGroupParametersWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **requiredStringGroup** | **int** | Required String in group parameters | | +| **requiredBooleanGroup** | **bool** | Required Boolean in group parameters | | +| **requiredInt64Group** | **long** | Required Integer in group parameters | | +| **stringGroup** | **int?** | String in group parameters | [optional] | +| **booleanGroup** | **bool?** | Boolean in group parameters | [optional] | +| **int64Group** | **long?** | Integer in group parameters | [optional] | + +### Return type + +void (empty response body) + +### Authorization + +[bearer_test](../README.md#bearer_test) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **400** | Something wrong | - | + +[[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) + + +# **TestInlineAdditionalProperties** +> void TestInlineAdditionalProperties (Dictionary requestBody) + +test inline additionalProperties + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestInlineAdditionalPropertiesExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var requestBody = new Dictionary(); // Dictionary | request body + + try + { + // test inline additionalProperties + apiInstance.TestInlineAdditionalProperties(requestBody); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestInlineAdditionalProperties: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestInlineAdditionalPropertiesWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // test inline additionalProperties + apiInstance.TestInlineAdditionalPropertiesWithHttpInfo(requestBody); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestInlineAdditionalPropertiesWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **requestBody** | [**Dictionary<string, string>**](string.md) | request body | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### 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) + + +# **TestJsonFormData** +> void TestJsonFormData (string param, string param2) + +test json serialization of form data + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestJsonFormDataExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var param = "param_example"; // string | field1 + var param2 = "param2_example"; // string | field2 + + try + { + // test json serialization of form data + apiInstance.TestJsonFormData(param, param2); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestJsonFormData: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestJsonFormDataWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // test json serialization of form data + apiInstance.TestJsonFormDataWithHttpInfo(param, param2); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestJsonFormDataWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **param** | **string** | field1 | | +| **param2** | **string** | field2 | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/x-www-form-urlencoded + - **Accept**: Not defined + + +### 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) + + +# **TestQueryParameterCollectionFormat** +> void TestQueryParameterCollectionFormat (List pipe, List ioutil, List http, List url, List context) + + + +To test the collection format in query parameters + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestQueryParameterCollectionFormatExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(config); + var pipe = new List(); // List | + var ioutil = new List(); // List | + var http = new List(); // List | + var url = new List(); // List | + var context = new List(); // List | + + try + { + apiInstance.TestQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeApi.TestQueryParameterCollectionFormat: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestQueryParameterCollectionFormatWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + apiInstance.TestQueryParameterCollectionFormatWithHttpInfo(pipe, ioutil, http, url, context); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeApi.TestQueryParameterCollectionFormatWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **pipe** | [**List<string>**](string.md) | | | +| **ioutil** | [**List<string>**](string.md) | | | +| **http** | [**List<string>**](string.md) | | | +| **url** | [**List<string>**](string.md) | | | +| **context** | [**List<string>**](string.md) | | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Success | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md new file mode 100644 index 00000000000..aff9fbdf0ef --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md @@ -0,0 +1,104 @@ +# Org.OpenAPITools.Api.FakeClassnameTags123Api + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +| Method | HTTP request | Description | +|--------|--------------|-------------| +| [**TestClassname**](FakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case | + + +# **TestClassname** +> ModelClient TestClassname (ModelClient modelClient) + +To test class name in snake case + +To test class name in snake case + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class TestClassnameExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure API key authorization: api_key_query + config.AddApiKey("api_key_query", "YOUR_API_KEY"); + // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed + // config.AddApiKeyPrefix("api_key_query", "Bearer"); + + var apiInstance = new FakeClassnameTags123Api(config); + var modelClient = new ModelClient(); // ModelClient | client model + + try + { + // To test class name in snake case + ModelClient result = apiInstance.TestClassname(modelClient); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling FakeClassnameTags123Api.TestClassname: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the TestClassnameWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // To test class name in snake case + ApiResponse response = apiInstance.TestClassnameWithHttpInfo(modelClient); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling FakeClassnameTags123Api.TestClassnameWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **modelClient** | [**ModelClient**](ModelClient.md) | client model | | + +### Return type + +[**ModelClient**](ModelClient.md) + +### Authorization + +[api_key_query](../README.md#api_key_query) + +### HTTP request headers + + - **Content-Type**: application/json + - **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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/File.md new file mode 100644 index 00000000000..28959feda08 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/File.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.File +Must be named `File` for test. + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**SourceURI** | **string** | Test capitalization | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md new file mode 100644 index 00000000000..0ce4be56cc7 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.FileSchemaTestClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**File** | [**File**](File.md) | | [optional] +**Files** | [**List<File>**](File.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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Foo.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Foo.md new file mode 100644 index 00000000000..92cf4572321 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Foo.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.Foo + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Bar** | **string** | | [optional] [default to "bar"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md new file mode 100644 index 00000000000..dde9b9729b9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.FooGetDefaultResponse + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**String** | [**Foo**](Foo.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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md new file mode 100644 index 00000000000..39a70be7ad4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md @@ -0,0 +1,25 @@ +# Org.OpenAPITools.Model.FormatTest + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Integer** | **int** | | [optional] +**Int32** | **int** | | [optional] +**Int64** | **long** | | [optional] +**Number** | **decimal** | | +**Float** | **float** | | [optional] +**Double** | **double** | | [optional] +**Decimal** | **decimal** | | [optional] +**String** | **string** | | [optional] +**Byte** | **byte[]** | | +**Binary** | **System.IO.Stream** | | [optional] +**Date** | **DateTime** | | +**DateTime** | **DateTime** | | [optional] +**Uuid** | **Guid** | | [optional] +**Password** | **string** | | +**PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] +**PatternWithDigitsAndDelimiter** | **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Fruit.md new file mode 100644 index 00000000000..56b1c9f00ab --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Fruit.md @@ -0,0 +1,13 @@ +# Org.OpenAPITools.Model.Fruit + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Color** | **string** | | [optional] +**Cultivar** | **string** | | [optional] +**Origin** | **string** | | [optional] +**LengthCm** | **decimal** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FruitReq.md new file mode 100644 index 00000000000..5db6b0e2d1d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FruitReq.md @@ -0,0 +1,13 @@ +# Org.OpenAPITools.Model.FruitReq + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Cultivar** | **string** | | +**Mealy** | **bool** | | [optional] +**LengthCm** | **decimal** | | +**Sweet** | **bool** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GmFruit.md new file mode 100644 index 00000000000..2cc2d496e67 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GmFruit.md @@ -0,0 +1,13 @@ +# Org.OpenAPITools.Model.GmFruit + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Color** | **string** | | [optional] +**Cultivar** | **string** | | [optional] +**Origin** | **string** | | [optional] +**LengthCm** | **decimal** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md new file mode 100644 index 00000000000..461ebfe34c2 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.GrandparentAnimal + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**PetType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md new file mode 100644 index 00000000000..64549c18b0a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.HasOnlyReadOnly + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Bar** | **string** | | [optional] [readonly] +**Foo** | **string** | | [optional] [readonly] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md new file mode 100644 index 00000000000..f7d1a7eb688 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.HealthCheckResult +Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**NullableMessage** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md new file mode 100644 index 00000000000..f0eef14fabb --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.IsoscelesTriangle + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**TriangleType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/List.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/List.md new file mode 100644 index 00000000000..2862c7e5321 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/List.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.List + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**_123List** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Mammal.md new file mode 100644 index 00000000000..aab8f4db9c7 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Mammal.md @@ -0,0 +1,13 @@ +# Org.OpenAPITools.Model.Mammal + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**HasBaleen** | **bool** | | [optional] +**HasTeeth** | **bool** | | [optional] +**ClassName** | **string** | | +**Type** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MapTest.md new file mode 100644 index 00000000000..516f9d4fd37 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MapTest.md @@ -0,0 +1,13 @@ +# Org.OpenAPITools.Model.MapTest + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**MapMapOfString** | **Dictionary<string, Dictionary<string, string>>** | | [optional] +**MapOfEnumString** | **Dictionary<string, MapTest.InnerEnum>** | | [optional] +**DirectMap** | **Dictionary<string, bool>** | | [optional] +**IndirectMap** | **Dictionary<string, bool>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md new file mode 100644 index 00000000000..050210a3e37 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -0,0 +1,13 @@ +# Org.OpenAPITools.Model.MixedPropertiesAndAdditionalPropertiesClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**UuidWithPattern** | **Guid** | | [optional] +**Uuid** | **Guid** | | [optional] +**DateTime** | **DateTime** | | [optional] +**Map** | [**Dictionary<string, Animal>**](Animal.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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Model200Response.md new file mode 100644 index 00000000000..31f4d86fe43 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Model200Response.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.Model200Response +Model for testing model name starting with number + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **int** | | [optional] +**Class** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ModelClient.md new file mode 100644 index 00000000000..c29a6287433 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ModelClient.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.ModelClient + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**_Client** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Name.md new file mode 100644 index 00000000000..692af702b5b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Name.md @@ -0,0 +1,14 @@ +# Org.OpenAPITools.Model.Name +Model for testing model name same as property name + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**_Name** | **int** | | +**SnakeCase** | **int** | | [optional] [readonly] +**Property** | **string** | | [optional] +**_123Number** | **int** | | [optional] [readonly] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableClass.md new file mode 100644 index 00000000000..7bab4fa20ee --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableClass.md @@ -0,0 +1,21 @@ +# Org.OpenAPITools.Model.NullableClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**IntegerProp** | **int?** | | [optional] +**NumberProp** | **decimal?** | | [optional] +**BooleanProp** | **bool?** | | [optional] +**StringProp** | **string** | | [optional] +**DateProp** | **DateTime?** | | [optional] +**DatetimeProp** | **DateTime?** | | [optional] +**ArrayNullableProp** | **List<Object>** | | [optional] +**ArrayAndItemsNullableProp** | **List<Object>** | | [optional] +**ArrayItemsNullable** | **List<Object>** | | [optional] +**ObjectNullableProp** | **Dictionary<string, Object>** | | [optional] +**ObjectAndItemsNullableProp** | **Dictionary<string, Object>** | | [optional] +**ObjectItemsNullable** | **Dictionary<string, Object>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md new file mode 100644 index 00000000000..5ada17b4db8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.NullableGuidClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Uuid** | **Guid?** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableShape.md new file mode 100644 index 00000000000..f8fb004da80 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableShape.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.NullableShape +The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1. + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**QuadrilateralType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NumberOnly.md new file mode 100644 index 00000000000..14a7c0f1071 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NumberOnly.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.NumberOnly + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**JustNumber** | **decimal** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md new file mode 100644 index 00000000000..7a335d446f4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md @@ -0,0 +1,13 @@ +# Org.OpenAPITools.Model.ObjectWithDeprecatedFields + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Uuid** | **string** | | [optional] +**Id** | **decimal** | | [optional] +**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] +**Bars** | **List<string>** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Order.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Order.md new file mode 100644 index 00000000000..66c55c3b473 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Order.md @@ -0,0 +1,15 @@ +# Org.OpenAPITools.Model.Order + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Id** | **long** | | [optional] +**PetId** | **long** | | [optional] +**Quantity** | **int** | | [optional] +**ShipDate** | **DateTime** | | [optional] +**Status** | **string** | Order Status | [optional] +**Complete** | **bool** | | [optional] [default to false] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterComposite.md new file mode 100644 index 00000000000..eb42bcc1aaa --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterComposite.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.OuterComposite + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**MyNumber** | **decimal** | | [optional] +**MyString** | **string** | | [optional] +**MyBoolean** | **bool** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnum.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnum.md new file mode 100644 index 00000000000..245765c7845 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnum.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.OuterEnum + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md new file mode 100644 index 00000000000..3ffaa1086a6 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.OuterEnumDefaultValue + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md new file mode 100644 index 00000000000..567858392db --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.OuterEnumInteger + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md new file mode 100644 index 00000000000..35c75a44372 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.OuterEnumIntegerDefaultValue + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ParentPet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ParentPet.md new file mode 100644 index 00000000000..0e18ba6d591 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ParentPet.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.ParentPet + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**PetType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pet.md new file mode 100644 index 00000000000..c7224764e2d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pet.md @@ -0,0 +1,15 @@ +# Org.OpenAPITools.Model.Pet + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Id** | **long** | | [optional] +**Category** | [**Category**](Category.md) | | [optional] +**Name** | **string** | | +**PhotoUrls** | **List<string>** | | +**Tags** | [**List<Tag>**](Tag.md) | | [optional] +**Status** | **string** | pet status in the store | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PetApi.md new file mode 100644 index 00000000000..03dec23f686 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PetApi.md @@ -0,0 +1,856 @@ +# Org.OpenAPITools.Api.PetApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +| Method | HTTP request | Description | +|--------|--------------|-------------| +| [**AddPet**](PetApi.md#addpet) | **POST** /pet | Add a new pet to the store | +| [**DeletePet**](PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet | +| [**FindPetsByStatus**](PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status | +| [**FindPetsByTags**](PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags | +| [**GetPetById**](PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID | +| [**UpdatePet**](PetApi.md#updatepet) | **PUT** /pet | Update an existing pet | +| [**UpdatePetWithForm**](PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data | +| [**UploadFile**](PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image | +| [**UploadFileWithRequiredFile**](PetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required) | + + +# **AddPet** +> void AddPet (Pet pet) + +Add a new pet to the store + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class AddPetExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var pet = new Pet(); // Pet | Pet object that needs to be added to the store + + try + { + // Add a new pet to the store + apiInstance.AddPet(pet); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.AddPet: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the AddPetWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Add a new pet to the store + apiInstance.AddPetWithHttpInfo(pet); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.AddPetWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **pet** | [**Pet**](Pet.md) | Pet object that needs to be added to the store | | + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](../README.md#petstore_auth), [http_signature_test](../README.md#http_signature_test) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **405** | Invalid input | - | + +[[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) + + +# **DeletePet** +> void DeletePet (long petId, string apiKey = null) + +Deletes a pet + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class DeletePetExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var petId = 789L; // long | Pet id to delete + var apiKey = "apiKey_example"; // string | (optional) + + try + { + // Deletes a pet + apiInstance.DeletePet(petId, apiKey); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.DeletePet: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the DeletePetWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Deletes a pet + apiInstance.DeletePetWithHttpInfo(petId, apiKey); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.DeletePetWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **petId** | **long** | Pet id to delete | | +| **apiKey** | **string** | | [optional] | + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **400** | Invalid pet value | - | + +[[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) + + +# **FindPetsByStatus** +> List<Pet> FindPetsByStatus (List status) + +Finds Pets by status + +Multiple status values can be provided with comma separated strings + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class FindPetsByStatusExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var status = new List(); // List | Status values that need to be considered for filter + + try + { + // Finds Pets by status + List result = apiInstance.FindPetsByStatus(status); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.FindPetsByStatus: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the FindPetsByStatusWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Finds Pets by status + ApiResponse> response = apiInstance.FindPetsByStatusWithHttpInfo(status); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.FindPetsByStatusWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **status** | [**List<string>**](string.md) | Status values that need to be considered for filter | | + +### Return type + +[**List<Pet>**](Pet.md) + +### Authorization + +[petstore_auth](../README.md#petstore_auth), [http_signature_test](../README.md#http_signature_test) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | +| **400** | Invalid status value | - | + +[[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) + + +# **FindPetsByTags** +> List<Pet> FindPetsByTags (List tags) + +Finds Pets by tags + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class FindPetsByTagsExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var tags = new List(); // List | Tags to filter by + + try + { + // Finds Pets by tags + List result = apiInstance.FindPetsByTags(tags); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.FindPetsByTags: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the FindPetsByTagsWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Finds Pets by tags + ApiResponse> response = apiInstance.FindPetsByTagsWithHttpInfo(tags); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.FindPetsByTagsWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **tags** | [**List<string>**](string.md) | Tags to filter by | | + +### Return type + +[**List<Pet>**](Pet.md) + +### Authorization + +[petstore_auth](../README.md#petstore_auth), [http_signature_test](../README.md#http_signature_test) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | +| **400** | Invalid tag value | - | + +[[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) + + +# **GetPetById** +> Pet GetPetById (long petId) + +Find pet by ID + +Returns a single pet + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class GetPetByIdExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure API key authorization: api_key + config.AddApiKey("api_key", "YOUR_API_KEY"); + // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed + // config.AddApiKeyPrefix("api_key", "Bearer"); + + var apiInstance = new PetApi(config); + var petId = 789L; // long | ID of pet to return + + try + { + // Find pet by ID + Pet result = apiInstance.GetPetById(petId); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.GetPetById: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the GetPetByIdWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Find pet by ID + ApiResponse response = apiInstance.GetPetByIdWithHttpInfo(petId); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.GetPetByIdWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **petId** | **long** | ID of pet to return | | + +### Return type + +[**Pet**](Pet.md) + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | +| **400** | Invalid ID supplied | - | +| **404** | Pet not found | - | + +[[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) + + +# **UpdatePet** +> void UpdatePet (Pet pet) + +Update an existing pet + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class UpdatePetExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var pet = new Pet(); // Pet | Pet object that needs to be added to the store + + try + { + // Update an existing pet + apiInstance.UpdatePet(pet); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.UpdatePet: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the UpdatePetWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Update an existing pet + apiInstance.UpdatePetWithHttpInfo(pet); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.UpdatePetWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **pet** | [**Pet**](Pet.md) | Pet object that needs to be added to the store | | + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](../README.md#petstore_auth), [http_signature_test](../README.md#http_signature_test) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **400** | Invalid ID supplied | - | +| **404** | Pet not found | - | +| **405** | Validation exception | - | + +[[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) + + +# **UpdatePetWithForm** +> void UpdatePetWithForm (long petId, string name = null, string status = null) + +Updates a pet in the store with form data + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class UpdatePetWithFormExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var petId = 789L; // long | ID of pet that needs to be updated + var name = "name_example"; // string | Updated name of the pet (optional) + var status = "status_example"; // string | Updated status of the pet (optional) + + try + { + // Updates a pet in the store with form data + apiInstance.UpdatePetWithForm(petId, name, status); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.UpdatePetWithForm: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the UpdatePetWithFormWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Updates a pet in the store with form data + apiInstance.UpdatePetWithFormWithHttpInfo(petId, name, status); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.UpdatePetWithFormWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **petId** | **long** | ID of pet that needs to be updated | | +| **name** | **string** | Updated name of the pet | [optional] | +| **status** | **string** | Updated status of the pet | [optional] | + +### Return type + +void (empty response body) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/x-www-form-urlencoded + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **405** | Invalid input | - | + +[[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) + + +# **UploadFile** +> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null) + +uploads an image + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class UploadFileExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var petId = 789L; // long | ID of pet to update + var additionalMetadata = "additionalMetadata_example"; // string | Additional data to pass to server (optional) + var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream | file to upload (optional) + + try + { + // uploads an image + ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.UploadFile: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the UploadFileWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // uploads an image + ApiResponse response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.UploadFileWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **petId** | **long** | ID of pet to update | | +| **additionalMetadata** | **string** | Additional data to pass to server | [optional] | +| **file** | **System.IO.Stream****System.IO.Stream** | 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) + + +# **UploadFileWithRequiredFile** +> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null) + +uploads an image (required) + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class UploadFileWithRequiredFileExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var petId = 789L; // long | ID of pet to update + var requiredFile = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt")); // System.IO.Stream | file to upload + var additionalMetadata = "additionalMetadata_example"; // string | Additional data to pass to server (optional) + + try + { + // uploads an image (required) + ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.UploadFileWithRequiredFile: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the UploadFileWithRequiredFileWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // uploads an image (required) + ApiResponse response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.UploadFileWithRequiredFileWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **petId** | **long** | ID of pet to update | | +| **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload | | +| **additionalMetadata** | **string** | 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, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + + +### 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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pig.md new file mode 100644 index 00000000000..6e86d0760d5 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pig.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.Pig + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ClassName** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md new file mode 100644 index 00000000000..8262a41c50d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.PolymorphicProperty + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md new file mode 100644 index 00000000000..0165ddcc0e4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Quadrilateral + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**QuadrilateralType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md new file mode 100644 index 00000000000..6daf340a141 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.QuadrilateralInterface + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**QuadrilateralType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md new file mode 100644 index 00000000000..b3f4a17ea34 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.ReadOnlyFirst + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Bar** | **string** | | [optional] [readonly] +**Baz** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Return.md new file mode 100644 index 00000000000..2c7c97e09da --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Return.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Return +Model for testing reserved words + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**_Return** | **int** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md new file mode 100644 index 00000000000..76da8f1de81 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.ScaleneTriangle + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**TriangleType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Shape.md new file mode 100644 index 00000000000..9a54628cd41 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Shape.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Shape + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**QuadrilateralType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md new file mode 100644 index 00000000000..57456d6793f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.ShapeInterface + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md new file mode 100644 index 00000000000..cbf61ebe77a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.ShapeOrNull +The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1. + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**QuadrilateralType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md new file mode 100644 index 00000000000..c329495425d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.SimpleQuadrilateral + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**QuadrilateralType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md new file mode 100644 index 00000000000..648179799e1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.SpecialModelName + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**SpecialPropertyName** | **long** | | [optional] +**_SpecialModelName** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/StoreApi.md new file mode 100644 index 00000000000..de4414feafc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/StoreApi.md @@ -0,0 +1,373 @@ +# Org.OpenAPITools.Api.StoreApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +| Method | HTTP request | Description | +|--------|--------------|-------------| +| [**DeleteOrder**](StoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID | +| [**GetInventory**](StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status | +| [**GetOrderById**](StoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID | +| [**PlaceOrder**](StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet | + + +# **DeleteOrder** +> void DeleteOrder (string orderId) + +Delete purchase order by ID + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class DeleteOrderExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new StoreApi(config); + var orderId = "orderId_example"; // string | ID of the order that needs to be deleted + + try + { + // Delete purchase order by ID + apiInstance.DeleteOrder(orderId); + } + catch (ApiException e) + { + Debug.Print("Exception when calling StoreApi.DeleteOrder: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the DeleteOrderWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Delete purchase order by ID + apiInstance.DeleteOrderWithHttpInfo(orderId); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling StoreApi.DeleteOrderWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **orderId** | **string** | ID of the order that needs to be deleted | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **400** | Invalid ID supplied | - | +| **404** | Order not found | - | + +[[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) + + +# **GetInventory** +> Dictionary<string, int> GetInventory () + +Returns pet inventories by status + +Returns a map of status codes to quantities + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class GetInventoryExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // Configure API key authorization: api_key + config.AddApiKey("api_key", "YOUR_API_KEY"); + // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed + // config.AddApiKeyPrefix("api_key", "Bearer"); + + var apiInstance = new StoreApi(config); + + try + { + // Returns pet inventories by status + Dictionary result = apiInstance.GetInventory(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling StoreApi.GetInventory: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the GetInventoryWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Returns pet inventories by status + ApiResponse> response = apiInstance.GetInventoryWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling StoreApi.GetInventoryWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**Dictionary** + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: Not defined + - **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) + + +# **GetOrderById** +> Order GetOrderById (long orderId) + +Find purchase order by ID + +For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class GetOrderByIdExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new StoreApi(config); + var orderId = 789L; // long | ID of pet that needs to be fetched + + try + { + // Find purchase order by ID + Order result = apiInstance.GetOrderById(orderId); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling StoreApi.GetOrderById: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the GetOrderByIdWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Find purchase order by ID + ApiResponse response = apiInstance.GetOrderByIdWithHttpInfo(orderId); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling StoreApi.GetOrderByIdWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **orderId** | **long** | ID of pet that needs to be fetched | | + +### Return type + +[**Order**](Order.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | +| **400** | Invalid ID supplied | - | +| **404** | Order not found | - | + +[[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) + + +# **PlaceOrder** +> Order PlaceOrder (Order order) + +Place an order for a pet + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class PlaceOrderExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new StoreApi(config); + var order = new Order(); // Order | order placed for purchasing the pet + + try + { + // Place an order for a pet + Order result = apiInstance.PlaceOrder(order); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling StoreApi.PlaceOrder: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the PlaceOrderWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Place an order for a pet + ApiResponse response = apiInstance.PlaceOrderWithHttpInfo(order); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling StoreApi.PlaceOrderWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **order** | [**Order**](Order.md) | order placed for purchasing the pet | | + +### Return type + +[**Order**](Order.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | +| **400** | Invalid Order | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Tag.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Tag.md new file mode 100644 index 00000000000..fdd22eb31fd --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Tag.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Tag + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Id** | **long** | | [optional] +**Name** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Triangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Triangle.md new file mode 100644 index 00000000000..c4d0452b4e8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Triangle.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Triangle + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**ShapeType** | **string** | | +**TriangleType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md new file mode 100644 index 00000000000..e0d8b5a5913 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TriangleInterface + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TriangleType** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/User.md new file mode 100644 index 00000000000..b0cd4dc042b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/User.md @@ -0,0 +1,21 @@ +# Org.OpenAPITools.Model.User + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Id** | **long** | | [optional] +**Username** | **string** | | [optional] +**FirstName** | **string** | | [optional] +**LastName** | **string** | | [optional] +**Email** | **string** | | [optional] +**Password** | **string** | | [optional] +**Phone** | **string** | | [optional] +**UserStatus** | **int** | User Status | [optional] +**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the 'null' value. | [optional] +**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the 'null' value. | [optional] +**AnyTypeProp** | **Object** | test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] +**AnyTypePropNullable** | **Object** | test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The 'nullable' attribute does not change the allowed values. | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/UserApi.md new file mode 100644 index 00000000000..a3d461b04c1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/UserApi.md @@ -0,0 +1,713 @@ +# Org.OpenAPITools.Api.UserApi + +All URIs are relative to *http://petstore.swagger.io:80/v2* + +| Method | HTTP request | Description | +|--------|--------------|-------------| +| [**CreateUser**](UserApi.md#createuser) | **POST** /user | Create user | +| [**CreateUsersWithArrayInput**](UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array | +| [**CreateUsersWithListInput**](UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array | +| [**DeleteUser**](UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user | +| [**GetUserByName**](UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name | +| [**LoginUser**](UserApi.md#loginuser) | **GET** /user/login | Logs user into the system | +| [**LogoutUser**](UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session | +| [**UpdateUser**](UserApi.md#updateuser) | **PUT** /user/{username} | Updated user | + + +# **CreateUser** +> void CreateUser (User user) + +Create user + +This can only be done by the logged in user. + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class CreateUserExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(config); + var user = new User(); // User | Created user object + + try + { + // Create user + apiInstance.CreateUser(user); + } + catch (ApiException e) + { + Debug.Print("Exception when calling UserApi.CreateUser: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the CreateUserWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Create user + apiInstance.CreateUserWithHttpInfo(user); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling UserApi.CreateUserWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **user** | [**User**](User.md) | Created user object | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **0** | 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) + + +# **CreateUsersWithArrayInput** +> void CreateUsersWithArrayInput (List user) + +Creates list of users with given input array + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class CreateUsersWithArrayInputExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(config); + var user = new List(); // List | List of user object + + try + { + // Creates list of users with given input array + apiInstance.CreateUsersWithArrayInput(user); + } + catch (ApiException e) + { + Debug.Print("Exception when calling UserApi.CreateUsersWithArrayInput: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the CreateUsersWithArrayInputWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Creates list of users with given input array + apiInstance.CreateUsersWithArrayInputWithHttpInfo(user); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling UserApi.CreateUsersWithArrayInputWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **user** | [**List<User>**](User.md) | List of user object | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **0** | 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) + + +# **CreateUsersWithListInput** +> void CreateUsersWithListInput (List user) + +Creates list of users with given input array + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class CreateUsersWithListInputExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(config); + var user = new List(); // List | List of user object + + try + { + // Creates list of users with given input array + apiInstance.CreateUsersWithListInput(user); + } + catch (ApiException e) + { + Debug.Print("Exception when calling UserApi.CreateUsersWithListInput: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the CreateUsersWithListInputWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Creates list of users with given input array + apiInstance.CreateUsersWithListInputWithHttpInfo(user); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling UserApi.CreateUsersWithListInputWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **user** | [**List<User>**](User.md) | List of user object | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **0** | 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) + + +# **DeleteUser** +> void DeleteUser (string username) + +Delete user + +This can only be done by the logged in user. + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class DeleteUserExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(config); + var username = "username_example"; // string | The name that needs to be deleted + + try + { + // Delete user + apiInstance.DeleteUser(username); + } + catch (ApiException e) + { + Debug.Print("Exception when calling UserApi.DeleteUser: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the DeleteUserWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Delete user + apiInstance.DeleteUserWithHttpInfo(username); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling UserApi.DeleteUserWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **username** | **string** | The name that needs to be deleted | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **400** | Invalid username supplied | - | +| **404** | User not found | - | + +[[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) + + +# **GetUserByName** +> User GetUserByName (string username) + +Get user by user name + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class GetUserByNameExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(config); + var username = "username_example"; // string | The name that needs to be fetched. Use user1 for testing. + + try + { + // Get user by user name + User result = apiInstance.GetUserByName(username); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling UserApi.GetUserByName: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the GetUserByNameWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Get user by user name + ApiResponse response = apiInstance.GetUserByNameWithHttpInfo(username); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling UserApi.GetUserByNameWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **username** | **string** | The name that needs to be fetched. Use user1 for testing. | | + +### Return type + +[**User**](User.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | +| **400** | Invalid username supplied | - | +| **404** | User not found | - | + +[[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) + + +# **LoginUser** +> string LoginUser (string username, string password) + +Logs user into the system + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class LoginUserExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(config); + var username = "username_example"; // string | The user name for login + var password = "password_example"; // string | The password for login in clear text + + try + { + // Logs user into the system + string result = apiInstance.LoginUser(username, password); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling UserApi.LoginUser: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the LoginUserWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Logs user into the system + ApiResponse response = apiInstance.LoginUserWithHttpInfo(username, password); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling UserApi.LoginUserWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **username** | **string** | The user name for login | | +| **password** | **string** | The password for login in clear text | | + +### Return type + +**string** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
| +| **400** | Invalid username/password supplied | - | + +[[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) + + +# **LogoutUser** +> void LogoutUser () + +Logs out current logged in user session + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class LogoutUserExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(config); + + try + { + // Logs out current logged in user session + apiInstance.LogoutUser(); + } + catch (ApiException e) + { + Debug.Print("Exception when calling UserApi.LogoutUser: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the LogoutUserWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Logs out current logged in user session + apiInstance.LogoutUserWithHttpInfo(); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling UserApi.LogoutUserWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **0** | 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) + + +# **UpdateUser** +> void UpdateUser (string username, User user) + +Updated user + +This can only be done by the logged in user. + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class UpdateUserExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(config); + var username = "username_example"; // string | name that need to be deleted + var user = new User(); // User | Updated user object + + try + { + // Updated user + apiInstance.UpdateUser(username, user); + } + catch (ApiException e) + { + Debug.Print("Exception when calling UserApi.UpdateUser: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the UpdateUserWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Updated user + apiInstance.UpdateUserWithHttpInfo(username, user); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling UserApi.UpdateUserWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **username** | **string** | name that need to be deleted | | +| **user** | [**User**](User.md) | Updated user object | | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **400** | Invalid user supplied | - | +| **404** | User not found | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Whale.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Whale.md new file mode 100644 index 00000000000..5fc3dc7f85c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Whale.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.Whale + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**HasBaleen** | **bool** | | [optional] +**HasTeeth** | **bool** | | [optional] +**ClassName** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Zebra.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Zebra.md new file mode 100644 index 00000000000..31e686adf0e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Zebra.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.Zebra + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Type** | **string** | | [optional] +**ClassName** | **string** | | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/git_push.sh b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/git_push.sh new file mode 100644 index 00000000000..f53a75d4fab --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/git_push.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="github.com" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=$(git remote) +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs new file mode 100644 index 00000000000..5291df5c3f4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Class for testing AnotherFakeApi + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class AnotherFakeApiTests : IDisposable + { + private AnotherFakeApi instance; + + public AnotherFakeApiTests() + { + instance = new AnotherFakeApi(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AnotherFakeApi + /// + [Test] + public void InstanceTest() + { + // TODO uncomment below to test 'IsType' AnotherFakeApi + //Assert.IsType(instance); + } + + /// + /// Test Call123TestSpecialTags + /// + [Test] + public void Call123TestSpecialTagsTest() + { + // TODO uncomment below to test the method and replace null with proper value + //ModelClient modelClient = null; + //var response = instance.Call123TestSpecialTags(modelClient); + //Assert.IsType(response); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs new file mode 100644 index 00000000000..389c61984c1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -0,0 +1,78 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Class for testing DefaultApi + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class DefaultApiTests : IDisposable + { + private DefaultApi instance; + + public DefaultApiTests() + { + instance = new DefaultApi(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of DefaultApi + /// + [Test] + public void InstanceTest() + { + // TODO uncomment below to test 'IsType' DefaultApi + //Assert.IsType(instance); + } + + /// + /// Test FooGet + /// + [Test] + public void FooGetTest() + { + // TODO uncomment below to test the method and replace null with proper value + //var response = instance.FooGet(); + //Assert.IsType(response); + } + + /// + /// Test GetCountry + /// + [Test] + public void GetCountryTest() + { + // TODO uncomment below to test the method and replace null with proper value + //string country = null; + //instance.GetCountry(country); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs new file mode 100644 index 00000000000..99c071961eb --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs @@ -0,0 +1,258 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Class for testing FakeApi + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class FakeApiTests : IDisposable + { + private FakeApi instance; + + public FakeApiTests() + { + instance = new FakeApi(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of FakeApi + /// + [Test] + public void InstanceTest() + { + // TODO uncomment below to test 'IsType' FakeApi + //Assert.IsType(instance); + } + + /// + /// Test FakeHealthGet + /// + [Test] + public void FakeHealthGetTest() + { + // TODO uncomment below to test the method and replace null with proper value + //var response = instance.FakeHealthGet(); + //Assert.IsType(response); + } + + /// + /// Test FakeOuterBooleanSerialize + /// + [Test] + public void FakeOuterBooleanSerializeTest() + { + // TODO uncomment below to test the method and replace null with proper value + //bool? body = null; + //var response = instance.FakeOuterBooleanSerialize(body); + //Assert.IsType(response); + } + + /// + /// Test FakeOuterCompositeSerialize + /// + [Test] + public void FakeOuterCompositeSerializeTest() + { + // TODO uncomment below to test the method and replace null with proper value + //OuterComposite outerComposite = null; + //var response = instance.FakeOuterCompositeSerialize(outerComposite); + //Assert.IsType(response); + } + + /// + /// Test FakeOuterNumberSerialize + /// + [Test] + public void FakeOuterNumberSerializeTest() + { + // TODO uncomment below to test the method and replace null with proper value + //decimal? body = null; + //var response = instance.FakeOuterNumberSerialize(body); + //Assert.IsType(response); + } + + /// + /// Test FakeOuterStringSerialize + /// + [Test] + public void FakeOuterStringSerializeTest() + { + // TODO uncomment below to test the method and replace null with proper value + //Guid requiredStringUuid = null; + //string body = null; + //var response = instance.FakeOuterStringSerialize(requiredStringUuid, body); + //Assert.IsType(response); + } + + /// + /// Test GetArrayOfEnums + /// + [Test] + public void GetArrayOfEnumsTest() + { + // TODO uncomment below to test the method and replace null with proper value + //var response = instance.GetArrayOfEnums(); + //Assert.IsType>(response); + } + + /// + /// Test TestBodyWithFileSchema + /// + [Test] + public void TestBodyWithFileSchemaTest() + { + // TODO uncomment below to test the method and replace null with proper value + //FileSchemaTestClass fileSchemaTestClass = null; + //instance.TestBodyWithFileSchema(fileSchemaTestClass); + } + + /// + /// Test TestBodyWithQueryParams + /// + [Test] + public void TestBodyWithQueryParamsTest() + { + // TODO uncomment below to test the method and replace null with proper value + //string query = null; + //User user = null; + //instance.TestBodyWithQueryParams(query, user); + } + + /// + /// Test TestClientModel + /// + [Test] + public void TestClientModelTest() + { + // TODO uncomment below to test the method and replace null with proper value + //ModelClient modelClient = null; + //var response = instance.TestClientModel(modelClient); + //Assert.IsType(response); + } + + /// + /// Test TestEndpointParameters + /// + [Test] + public void TestEndpointParametersTest() + { + // TODO uncomment below to test the method and replace null with proper value + //decimal number = null; + //double _double = null; + //string patternWithoutDelimiter = null; + //byte[] _byte = null; + //int? integer = null; + //int? int32 = null; + //long? int64 = null; + //float? _float = null; + //string _string = null; + //System.IO.Stream binary = null; + //DateTime? date = null; + //DateTime? dateTime = null; + //string password = null; + //string callback = null; + //instance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback); + } + + /// + /// Test TestEnumParameters + /// + [Test] + public void TestEnumParametersTest() + { + // TODO uncomment below to test the method and replace null with proper value + //List enumHeaderStringArray = null; + //string enumHeaderString = null; + //List enumQueryStringArray = null; + //string enumQueryString = null; + //int? enumQueryInteger = null; + //double? enumQueryDouble = null; + //List enumFormStringArray = null; + //string enumFormString = null; + //instance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + } + + /// + /// Test TestGroupParameters + /// + [Test] + public void TestGroupParametersTest() + { + // TODO uncomment below to test the method and replace null with proper value + //int requiredStringGroup = null; + //bool requiredBooleanGroup = null; + //long requiredInt64Group = null; + //int? stringGroup = null; + //bool? booleanGroup = null; + //long? int64Group = null; + //instance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + } + + /// + /// Test TestInlineAdditionalProperties + /// + [Test] + public void TestInlineAdditionalPropertiesTest() + { + // TODO uncomment below to test the method and replace null with proper value + //Dictionary requestBody = null; + //instance.TestInlineAdditionalProperties(requestBody); + } + + /// + /// Test TestJsonFormData + /// + [Test] + public void TestJsonFormDataTest() + { + // TODO uncomment below to test the method and replace null with proper value + //string param = null; + //string param2 = null; + //instance.TestJsonFormData(param, param2); + } + + /// + /// Test TestQueryParameterCollectionFormat + /// + [Test] + public void TestQueryParameterCollectionFormatTest() + { + // TODO uncomment below to test the method and replace null with proper value + //List pipe = null; + //List ioutil = null; + //List http = null; + //List url = null; + //List context = null; + //instance.TestQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs new file mode 100644 index 00000000000..de83d1442ce --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Class for testing FakeClassnameTags123Api + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class FakeClassnameTags123ApiTests : IDisposable + { + private FakeClassnameTags123Api instance; + + public FakeClassnameTags123ApiTests() + { + instance = new FakeClassnameTags123Api(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of FakeClassnameTags123Api + /// + [Test] + public void InstanceTest() + { + // TODO uncomment below to test 'IsType' FakeClassnameTags123Api + //Assert.IsType(instance); + } + + /// + /// Test TestClassname + /// + [Test] + public void TestClassnameTest() + { + // TODO uncomment below to test the method and replace null with proper value + //ModelClient modelClient = null; + //var response = instance.TestClassname(modelClient); + //Assert.IsType(response); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs new file mode 100644 index 00000000000..30879e209dd --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs @@ -0,0 +1,167 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Class for testing PetApi + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class PetApiTests : IDisposable + { + private PetApi instance; + + public PetApiTests() + { + instance = new PetApi(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of PetApi + /// + [Test] + public void InstanceTest() + { + // TODO uncomment below to test 'IsType' PetApi + //Assert.IsType(instance); + } + + /// + /// Test AddPet + /// + [Test] + public void AddPetTest() + { + // TODO uncomment below to test the method and replace null with proper value + //Pet pet = null; + //instance.AddPet(pet); + } + + /// + /// Test DeletePet + /// + [Test] + public void DeletePetTest() + { + // TODO uncomment below to test the method and replace null with proper value + //long petId = null; + //string apiKey = null; + //instance.DeletePet(petId, apiKey); + } + + /// + /// Test FindPetsByStatus + /// + [Test] + public void FindPetsByStatusTest() + { + // TODO uncomment below to test the method and replace null with proper value + //List status = null; + //var response = instance.FindPetsByStatus(status); + //Assert.IsType>(response); + } + + /// + /// Test FindPetsByTags + /// + [Test] + public void FindPetsByTagsTest() + { + // TODO uncomment below to test the method and replace null with proper value + //List tags = null; + //var response = instance.FindPetsByTags(tags); + //Assert.IsType>(response); + } + + /// + /// Test GetPetById + /// + [Test] + public void GetPetByIdTest() + { + // TODO uncomment below to test the method and replace null with proper value + //long petId = null; + //var response = instance.GetPetById(petId); + //Assert.IsType(response); + } + + /// + /// Test UpdatePet + /// + [Test] + public void UpdatePetTest() + { + // TODO uncomment below to test the method and replace null with proper value + //Pet pet = null; + //instance.UpdatePet(pet); + } + + /// + /// Test UpdatePetWithForm + /// + [Test] + public void UpdatePetWithFormTest() + { + // TODO uncomment below to test the method and replace null with proper value + //long petId = null; + //string name = null; + //string status = null; + //instance.UpdatePetWithForm(petId, name, status); + } + + /// + /// Test UploadFile + /// + [Test] + public void UploadFileTest() + { + // TODO uncomment below to test the method and replace null with proper value + //long petId = null; + //string additionalMetadata = null; + //System.IO.Stream file = null; + //var response = instance.UploadFile(petId, additionalMetadata, file); + //Assert.IsType(response); + } + + /// + /// Test UploadFileWithRequiredFile + /// + [Test] + public void UploadFileWithRequiredFileTest() + { + // TODO uncomment below to test the method and replace null with proper value + //long petId = null; + //System.IO.Stream requiredFile = null; + //string additionalMetadata = null; + //var response = instance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + //Assert.IsType(response); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs new file mode 100644 index 00000000000..68f3ec5957d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs @@ -0,0 +1,102 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Class for testing StoreApi + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class StoreApiTests : IDisposable + { + private StoreApi instance; + + public StoreApiTests() + { + instance = new StoreApi(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of StoreApi + /// + [Test] + public void InstanceTest() + { + // TODO uncomment below to test 'IsType' StoreApi + //Assert.IsType(instance); + } + + /// + /// Test DeleteOrder + /// + [Test] + public void DeleteOrderTest() + { + // TODO uncomment below to test the method and replace null with proper value + //string orderId = null; + //instance.DeleteOrder(orderId); + } + + /// + /// Test GetInventory + /// + [Test] + public void GetInventoryTest() + { + // TODO uncomment below to test the method and replace null with proper value + //var response = instance.GetInventory(); + //Assert.IsType>(response); + } + + /// + /// Test GetOrderById + /// + [Test] + public void GetOrderByIdTest() + { + // TODO uncomment below to test the method and replace null with proper value + //long orderId = null; + //var response = instance.GetOrderById(orderId); + //Assert.IsType(response); + } + + /// + /// Test PlaceOrder + /// + [Test] + public void PlaceOrderTest() + { + // TODO uncomment below to test the method and replace null with proper value + //Order order = null; + //var response = instance.PlaceOrder(order); + //Assert.IsType(response); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs new file mode 100644 index 00000000000..ea0996624f7 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs @@ -0,0 +1,147 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Class for testing UserApi + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class UserApiTests : IDisposable + { + private UserApi instance; + + public UserApiTests() + { + instance = new UserApi(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of UserApi + /// + [Test] + public void InstanceTest() + { + // TODO uncomment below to test 'IsType' UserApi + //Assert.IsType(instance); + } + + /// + /// Test CreateUser + /// + [Test] + public void CreateUserTest() + { + // TODO uncomment below to test the method and replace null with proper value + //User user = null; + //instance.CreateUser(user); + } + + /// + /// Test CreateUsersWithArrayInput + /// + [Test] + public void CreateUsersWithArrayInputTest() + { + // TODO uncomment below to test the method and replace null with proper value + //List user = null; + //instance.CreateUsersWithArrayInput(user); + } + + /// + /// Test CreateUsersWithListInput + /// + [Test] + public void CreateUsersWithListInputTest() + { + // TODO uncomment below to test the method and replace null with proper value + //List user = null; + //instance.CreateUsersWithListInput(user); + } + + /// + /// Test DeleteUser + /// + [Test] + public void DeleteUserTest() + { + // TODO uncomment below to test the method and replace null with proper value + //string username = null; + //instance.DeleteUser(username); + } + + /// + /// Test GetUserByName + /// + [Test] + public void GetUserByNameTest() + { + // TODO uncomment below to test the method and replace null with proper value + //string username = null; + //var response = instance.GetUserByName(username); + //Assert.IsType(response); + } + + /// + /// Test LoginUser + /// + [Test] + public void LoginUserTest() + { + // TODO uncomment below to test the method and replace null with proper value + //string username = null; + //string password = null; + //var response = instance.LoginUser(username, password); + //Assert.IsType(response); + } + + /// + /// Test LogoutUser + /// + [Test] + public void LogoutUserTest() + { + // TODO uncomment below to test the method and replace null with proper value + //instance.LogoutUser(); + } + + /// + /// Test UpdateUser + /// + [Test] + public void UpdateUserTest() + { + // TODO uncomment below to test the method and replace null with proper value + //string username = null; + //User user = null; + //instance.UpdateUser(username, user); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs new file mode 100644 index 00000000000..2cbfde17b03 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ActivityOutputElementRepresentation + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ActivityOutputElementRepresentationTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ActivityOutputElementRepresentation + //private ActivityOutputElementRepresentation instance; + + public ActivityOutputElementRepresentationTests() + { + // TODO uncomment below to create an instance of ActivityOutputElementRepresentation + //instance = new ActivityOutputElementRepresentation(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ActivityOutputElementRepresentation + /// + [Test] + public void ActivityOutputElementRepresentationInstanceTest() + { + // TODO uncomment below to test "IsType" ActivityOutputElementRepresentation + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Prop1' + /// + [Test] + public void Prop1Test() + { + // TODO unit test for the property 'Prop1' + } + /// + /// Test the property 'Prop2' + /// + [Test] + public void Prop2Test() + { + // TODO unit test for the property 'Prop2' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs new file mode 100644 index 00000000000..deeed412e65 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Activity + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ActivityTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Activity + //private Activity instance; + + public ActivityTests() + { + // TODO uncomment below to create an instance of Activity + //instance = new Activity(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Activity + /// + [Test] + public void ActivityInstanceTest() + { + // TODO uncomment below to test "IsType" Activity + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ActivityOutputs' + /// + [Test] + public void ActivityOutputsTest() + { + // TODO unit test for the property 'ActivityOutputs' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs new file mode 100644 index 00000000000..5a474328dec --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs @@ -0,0 +1,123 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AdditionalPropertiesClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AdditionalPropertiesClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AdditionalPropertiesClass + //private AdditionalPropertiesClass instance; + + public AdditionalPropertiesClassTests() + { + // TODO uncomment below to create an instance of AdditionalPropertiesClass + //instance = new AdditionalPropertiesClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AdditionalPropertiesClass + /// + [Test] + public void AdditionalPropertiesClassInstanceTest() + { + // TODO uncomment below to test "IsType" AdditionalPropertiesClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'MapProperty' + /// + [Test] + public void MapPropertyTest() + { + // TODO unit test for the property 'MapProperty' + } + /// + /// Test the property 'MapOfMapProperty' + /// + [Test] + public void MapOfMapPropertyTest() + { + // TODO unit test for the property 'MapOfMapProperty' + } + /// + /// Test the property 'Anytype1' + /// + [Test] + public void Anytype1Test() + { + // TODO unit test for the property 'Anytype1' + } + /// + /// Test the property 'MapWithUndeclaredPropertiesAnytype1' + /// + [Test] + public void MapWithUndeclaredPropertiesAnytype1Test() + { + // TODO unit test for the property 'MapWithUndeclaredPropertiesAnytype1' + } + /// + /// Test the property 'MapWithUndeclaredPropertiesAnytype2' + /// + [Test] + public void MapWithUndeclaredPropertiesAnytype2Test() + { + // TODO unit test for the property 'MapWithUndeclaredPropertiesAnytype2' + } + /// + /// Test the property 'MapWithUndeclaredPropertiesAnytype3' + /// + [Test] + public void MapWithUndeclaredPropertiesAnytype3Test() + { + // TODO unit test for the property 'MapWithUndeclaredPropertiesAnytype3' + } + /// + /// Test the property 'EmptyMap' + /// + [Test] + public void EmptyMapTest() + { + // TODO unit test for the property 'EmptyMap' + } + /// + /// Test the property 'MapWithUndeclaredPropertiesString' + /// + [Test] + public void MapWithUndeclaredPropertiesStringTest() + { + // TODO unit test for the property 'MapWithUndeclaredPropertiesString' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs new file mode 100644 index 00000000000..f4224abd70f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs @@ -0,0 +1,93 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Animal + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AnimalTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Animal + //private Animal instance; + + public AnimalTests() + { + // TODO uncomment below to create an instance of Animal + //instance = new Animal(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Animal + /// + [Test] + public void AnimalInstanceTest() + { + // TODO uncomment below to test "IsType" Animal + //Assert.IsType(instance); + } + + /// + /// Test deserialize a Cat from type Animal + /// + [Test] + public void CatDeserializeFromAnimalTest() + { + // TODO uncomment below to test deserialize a Cat from type Animal + //Assert.IsType(JsonConvert.DeserializeObject(new Cat().ToJson())); + } + /// + /// Test deserialize a Dog from type Animal + /// + [Test] + public void DogDeserializeFromAnimalTest() + { + // TODO uncomment below to test deserialize a Dog from type Animal + //Assert.IsType(JsonConvert.DeserializeObject(new Dog().ToJson())); + } + + /// + /// Test the property 'ClassName' + /// + [Test] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + /// + /// Test the property 'Color' + /// + [Test] + public void ColorTest() + { + // TODO unit test for the property 'Color' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs new file mode 100644 index 00000000000..9562b8029bc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs @@ -0,0 +1,83 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ApiResponse + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ApiResponseTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ApiResponse + //private ApiResponse instance; + + public ApiResponseTests() + { + // TODO uncomment below to create an instance of ApiResponse + //instance = new ApiResponse(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ApiResponse + /// + [Test] + public void ApiResponseInstanceTest() + { + // TODO uncomment below to test "IsType" ApiResponse + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Code' + /// + [Test] + public void CodeTest() + { + // TODO unit test for the property 'Code' + } + /// + /// Test the property 'Type' + /// + [Test] + public void TypeTest() + { + // TODO unit test for the property 'Type' + } + /// + /// Test the property 'Message' + /// + [Test] + public void MessageTest() + { + // TODO unit test for the property 'Message' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs new file mode 100644 index 00000000000..26ba6e79e24 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing AppleReq + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AppleReqTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AppleReq + //private AppleReq instance; + + public AppleReqTests() + { + // TODO uncomment below to create an instance of AppleReq + //instance = new AppleReq(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AppleReq + /// + [Test] + public void AppleReqInstanceTest() + { + // TODO uncomment below to test "IsType" AppleReq + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Cultivar' + /// + [Test] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + /// + /// Test the property 'Mealy' + /// + [Test] + public void MealyTest() + { + // TODO unit test for the property 'Mealy' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs new file mode 100644 index 00000000000..0c5ba63b2cf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Apple + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AppleTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Apple + //private Apple instance; + + public AppleTests() + { + // TODO uncomment below to create an instance of Apple + //instance = new Apple(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Apple + /// + [Test] + public void AppleInstanceTest() + { + // TODO uncomment below to test "IsType" Apple + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Cultivar' + /// + [Test] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + /// + /// Test the property 'Origin' + /// + [Test] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs new file mode 100644 index 00000000000..5800f457b15 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ArrayOfArrayOfNumberOnly + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ArrayOfArrayOfNumberOnlyTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ArrayOfArrayOfNumberOnly + //private ArrayOfArrayOfNumberOnly instance; + + public ArrayOfArrayOfNumberOnlyTests() + { + // TODO uncomment below to create an instance of ArrayOfArrayOfNumberOnly + //instance = new ArrayOfArrayOfNumberOnly(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ArrayOfArrayOfNumberOnly + /// + [Test] + public void ArrayOfArrayOfNumberOnlyInstanceTest() + { + // TODO uncomment below to test "IsType" ArrayOfArrayOfNumberOnly + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ArrayArrayNumber' + /// + [Test] + public void ArrayArrayNumberTest() + { + // TODO unit test for the property 'ArrayArrayNumber' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs new file mode 100644 index 00000000000..4cdbd60a826 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ArrayOfNumberOnly + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ArrayOfNumberOnlyTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ArrayOfNumberOnly + //private ArrayOfNumberOnly instance; + + public ArrayOfNumberOnlyTests() + { + // TODO uncomment below to create an instance of ArrayOfNumberOnly + //instance = new ArrayOfNumberOnly(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ArrayOfNumberOnly + /// + [Test] + public void ArrayOfNumberOnlyInstanceTest() + { + // TODO uncomment below to test "IsType" ArrayOfNumberOnly + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ArrayNumber' + /// + [Test] + public void ArrayNumberTest() + { + // TODO unit test for the property 'ArrayNumber' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs new file mode 100644 index 00000000000..c274c6ab67c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs @@ -0,0 +1,83 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ArrayTest + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ArrayTestTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ArrayTest + //private ArrayTest instance; + + public ArrayTestTests() + { + // TODO uncomment below to create an instance of ArrayTest + //instance = new ArrayTest(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ArrayTest + /// + [Test] + public void ArrayTestInstanceTest() + { + // TODO uncomment below to test "IsType" ArrayTest + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ArrayOfString' + /// + [Test] + public void ArrayOfStringTest() + { + // TODO unit test for the property 'ArrayOfString' + } + /// + /// Test the property 'ArrayArrayOfInteger' + /// + [Test] + public void ArrayArrayOfIntegerTest() + { + // TODO unit test for the property 'ArrayArrayOfInteger' + } + /// + /// Test the property 'ArrayArrayOfModel' + /// + [Test] + public void ArrayArrayOfModelTest() + { + // TODO unit test for the property 'ArrayArrayOfModel' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs new file mode 100644 index 00000000000..058d71226a2 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing BananaReq + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class BananaReqTests : IDisposable + { + // TODO uncomment below to declare an instance variable for BananaReq + //private BananaReq instance; + + public BananaReqTests() + { + // TODO uncomment below to create an instance of BananaReq + //instance = new BananaReq(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of BananaReq + /// + [Test] + public void BananaReqInstanceTest() + { + // TODO uncomment below to test "IsType" BananaReq + //Assert.IsType(instance); + } + + + /// + /// Test the property 'LengthCm' + /// + [Test] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + /// + /// Test the property 'Sweet' + /// + [Test] + public void SweetTest() + { + // TODO unit test for the property 'Sweet' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs new file mode 100644 index 00000000000..d5112b7a47a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Banana + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class BananaTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Banana + //private Banana instance; + + public BananaTests() + { + // TODO uncomment below to create an instance of Banana + //instance = new Banana(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Banana + /// + [Test] + public void BananaInstanceTest() + { + // TODO uncomment below to test "IsType" Banana + //Assert.IsType(instance); + } + + + /// + /// Test the property 'LengthCm' + /// + [Test] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs new file mode 100644 index 00000000000..2cb313e243d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing BasquePig + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class BasquePigTests : IDisposable + { + // TODO uncomment below to declare an instance variable for BasquePig + //private BasquePig instance; + + public BasquePigTests() + { + // TODO uncomment below to create an instance of BasquePig + //instance = new BasquePig(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of BasquePig + /// + [Test] + public void BasquePigInstanceTest() + { + // TODO uncomment below to test "IsType" BasquePig + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ClassName' + /// + [Test] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs new file mode 100644 index 00000000000..5d7c929f9ef --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs @@ -0,0 +1,107 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Capitalization + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class CapitalizationTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Capitalization + //private Capitalization instance; + + public CapitalizationTests() + { + // TODO uncomment below to create an instance of Capitalization + //instance = new Capitalization(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Capitalization + /// + [Test] + public void CapitalizationInstanceTest() + { + // TODO uncomment below to test "IsType" Capitalization + //Assert.IsType(instance); + } + + + /// + /// Test the property 'SmallCamel' + /// + [Test] + public void SmallCamelTest() + { + // TODO unit test for the property 'SmallCamel' + } + /// + /// Test the property 'CapitalCamel' + /// + [Test] + public void CapitalCamelTest() + { + // TODO unit test for the property 'CapitalCamel' + } + /// + /// Test the property 'SmallSnake' + /// + [Test] + public void SmallSnakeTest() + { + // TODO unit test for the property 'SmallSnake' + } + /// + /// Test the property 'CapitalSnake' + /// + [Test] + public void CapitalSnakeTest() + { + // TODO unit test for the property 'CapitalSnake' + } + /// + /// Test the property 'SCAETHFlowPoints' + /// + [Test] + public void SCAETHFlowPointsTest() + { + // TODO unit test for the property 'SCAETHFlowPoints' + } + /// + /// Test the property 'ATT_NAME' + /// + [Test] + public void ATT_NAMETest() + { + // TODO unit test for the property 'ATT_NAME' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs new file mode 100644 index 00000000000..1c3850b8cb9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing CatAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class CatAllOfTests : IDisposable + { + // TODO uncomment below to declare an instance variable for CatAllOf + //private CatAllOf instance; + + public CatAllOfTests() + { + // TODO uncomment below to create an instance of CatAllOf + //instance = new CatAllOf(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of CatAllOf + /// + [Test] + public void CatAllOfInstanceTest() + { + // TODO uncomment below to test "IsType" CatAllOf + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Declawed' + /// + [Test] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs new file mode 100644 index 00000000000..67ceac90588 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Cat + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class CatTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Cat + //private Cat instance; + + public CatTests() + { + // TODO uncomment below to create an instance of Cat + //instance = new Cat(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Cat + /// + [Test] + public void CatInstanceTest() + { + // TODO uncomment below to test "IsType" Cat + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Declawed' + /// + [Test] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs new file mode 100644 index 00000000000..a8ffd8b5dfd --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Category + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class CategoryTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Category + //private Category instance; + + public CategoryTests() + { + // TODO uncomment below to create an instance of Category + //instance = new Category(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Category + /// + [Test] + public void CategoryInstanceTest() + { + // TODO uncomment below to test "IsType" Category + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Id' + /// + [Test] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + /// + /// Test the property 'Name' + /// + [Test] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs new file mode 100644 index 00000000000..e5ad6c39f83 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ChildCatAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ChildCatAllOfTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ChildCatAllOf + //private ChildCatAllOf instance; + + public ChildCatAllOfTests() + { + // TODO uncomment below to create an instance of ChildCatAllOf + //instance = new ChildCatAllOf(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ChildCatAllOf + /// + [Test] + public void ChildCatAllOfInstanceTest() + { + // TODO uncomment below to test "IsType" ChildCatAllOf + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Name' + /// + [Test] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + /// + /// Test the property 'PetType' + /// + [Test] + public void PetTypeTest() + { + // TODO unit test for the property 'PetType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs new file mode 100644 index 00000000000..cd37ee5fddf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ChildCat + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ChildCatTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ChildCat + //private ChildCat instance; + + public ChildCatTests() + { + // TODO uncomment below to create an instance of ChildCat + //instance = new ChildCat(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ChildCat + /// + [Test] + public void ChildCatInstanceTest() + { + // TODO uncomment below to test "IsType" ChildCat + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Name' + /// + [Test] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + /// + /// Test the property 'PetType' + /// + [Test] + public void PetTypeTest() + { + // TODO unit test for the property 'PetType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs new file mode 100644 index 00000000000..0ff535c000f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ClassModel + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ClassModelTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ClassModel + //private ClassModel instance; + + public ClassModelTests() + { + // TODO uncomment below to create an instance of ClassModel + //instance = new ClassModel(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ClassModel + /// + [Test] + public void ClassModelInstanceTest() + { + // TODO uncomment below to test "IsType" ClassModel + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Class' + /// + [Test] + public void ClassTest() + { + // TODO unit test for the property 'Class' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs new file mode 100644 index 00000000000..b0238f3f2ab --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ComplexQuadrilateral + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ComplexQuadrilateralTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ComplexQuadrilateral + //private ComplexQuadrilateral instance; + + public ComplexQuadrilateralTests() + { + // TODO uncomment below to create an instance of ComplexQuadrilateral + //instance = new ComplexQuadrilateral(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ComplexQuadrilateral + /// + [Test] + public void ComplexQuadrilateralInstanceTest() + { + // TODO uncomment below to test "IsType" ComplexQuadrilateral + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'QuadrilateralType' + /// + [Test] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs new file mode 100644 index 00000000000..cd9cf8f5429 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing DanishPig + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class DanishPigTests : IDisposable + { + // TODO uncomment below to declare an instance variable for DanishPig + //private DanishPig instance; + + public DanishPigTests() + { + // TODO uncomment below to create an instance of DanishPig + //instance = new DanishPig(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of DanishPig + /// + [Test] + public void DanishPigInstanceTest() + { + // TODO uncomment below to test "IsType" DanishPig + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ClassName' + /// + [Test] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs new file mode 100644 index 00000000000..5a39eded762 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing DateOnlyClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class DateOnlyClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for DateOnlyClass + //private DateOnlyClass instance; + + public DateOnlyClassTests() + { + // TODO uncomment below to create an instance of DateOnlyClass + //instance = new DateOnlyClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of DateOnlyClass + /// + [Test] + public void DateOnlyClassInstanceTest() + { + // TODO uncomment below to test "IsType" DateOnlyClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'DateOnlyProperty' + /// + [Test] + public void DateOnlyPropertyTest() + { + // TODO unit test for the property 'DateOnlyProperty' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs new file mode 100644 index 00000000000..422afdae10c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing DeprecatedObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class DeprecatedObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for DeprecatedObject + //private DeprecatedObject instance; + + public DeprecatedObjectTests() + { + // TODO uncomment below to create an instance of DeprecatedObject + //instance = new DeprecatedObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of DeprecatedObject + /// + [Test] + public void DeprecatedObjectInstanceTest() + { + // TODO uncomment below to test "IsType" DeprecatedObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Name' + /// + [Test] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs new file mode 100644 index 00000000000..4eb50bfe931 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing DogAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class DogAllOfTests : IDisposable + { + // TODO uncomment below to declare an instance variable for DogAllOf + //private DogAllOf instance; + + public DogAllOfTests() + { + // TODO uncomment below to create an instance of DogAllOf + //instance = new DogAllOf(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of DogAllOf + /// + [Test] + public void DogAllOfInstanceTest() + { + // TODO uncomment below to test "IsType" DogAllOf + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Breed' + /// + [Test] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs new file mode 100644 index 00000000000..ef33138673e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Dog + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class DogTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Dog + //private Dog instance; + + public DogTests() + { + // TODO uncomment below to create an instance of Dog + //instance = new Dog(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Dog + /// + [Test] + public void DogInstanceTest() + { + // TODO uncomment below to test "IsType" Dog + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Breed' + /// + [Test] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs new file mode 100644 index 00000000000..e0d787fff17 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Drawing + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class DrawingTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Drawing + //private Drawing instance; + + public DrawingTests() + { + // TODO uncomment below to create an instance of Drawing + //instance = new Drawing(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Drawing + /// + [Test] + public void DrawingInstanceTest() + { + // TODO uncomment below to test "IsType" Drawing + //Assert.IsType(instance); + } + + + /// + /// Test the property 'MainShape' + /// + [Test] + public void MainShapeTest() + { + // TODO unit test for the property 'MainShape' + } + /// + /// Test the property 'ShapeOrNull' + /// + [Test] + public void ShapeOrNullTest() + { + // TODO unit test for the property 'ShapeOrNull' + } + /// + /// Test the property 'NullableShape' + /// + [Test] + public void NullableShapeTest() + { + // TODO unit test for the property 'NullableShape' + } + /// + /// Test the property 'Shapes' + /// + [Test] + public void ShapesTest() + { + // TODO unit test for the property 'Shapes' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs new file mode 100644 index 00000000000..caa95abbb23 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing EnumArrays + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class EnumArraysTests : IDisposable + { + // TODO uncomment below to declare an instance variable for EnumArrays + //private EnumArrays instance; + + public EnumArraysTests() + { + // TODO uncomment below to create an instance of EnumArrays + //instance = new EnumArrays(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of EnumArrays + /// + [Test] + public void EnumArraysInstanceTest() + { + // TODO uncomment below to test "IsType" EnumArrays + //Assert.IsType(instance); + } + + + /// + /// Test the property 'JustSymbol' + /// + [Test] + public void JustSymbolTest() + { + // TODO unit test for the property 'JustSymbol' + } + /// + /// Test the property 'ArrayEnum' + /// + [Test] + public void ArrayEnumTest() + { + // TODO unit test for the property 'ArrayEnum' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs new file mode 100644 index 00000000000..a273865be5e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs @@ -0,0 +1,59 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing EnumClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class EnumClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for EnumClass + //private EnumClass instance; + + public EnumClassTests() + { + // TODO uncomment below to create an instance of EnumClass + //instance = new EnumClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of EnumClass + /// + [Test] + public void EnumClassInstanceTest() + { + // TODO uncomment below to test "IsType" EnumClass + //Assert.IsType(instance); + } + + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs new file mode 100644 index 00000000000..7ae3a87006f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs @@ -0,0 +1,131 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing EnumTest + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class EnumTestTests : IDisposable + { + // TODO uncomment below to declare an instance variable for EnumTest + //private EnumTest instance; + + public EnumTestTests() + { + // TODO uncomment below to create an instance of EnumTest + //instance = new EnumTest(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of EnumTest + /// + [Test] + public void EnumTestInstanceTest() + { + // TODO uncomment below to test "IsType" EnumTest + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EnumString' + /// + [Test] + public void EnumStringTest() + { + // TODO unit test for the property 'EnumString' + } + /// + /// Test the property 'EnumStringRequired' + /// + [Test] + public void EnumStringRequiredTest() + { + // TODO unit test for the property 'EnumStringRequired' + } + /// + /// Test the property 'EnumInteger' + /// + [Test] + public void EnumIntegerTest() + { + // TODO unit test for the property 'EnumInteger' + } + /// + /// Test the property 'EnumIntegerOnly' + /// + [Test] + public void EnumIntegerOnlyTest() + { + // TODO unit test for the property 'EnumIntegerOnly' + } + /// + /// Test the property 'EnumNumber' + /// + [Test] + public void EnumNumberTest() + { + // TODO unit test for the property 'EnumNumber' + } + /// + /// Test the property 'OuterEnum' + /// + [Test] + public void OuterEnumTest() + { + // TODO unit test for the property 'OuterEnum' + } + /// + /// Test the property 'OuterEnumInteger' + /// + [Test] + public void OuterEnumIntegerTest() + { + // TODO unit test for the property 'OuterEnumInteger' + } + /// + /// Test the property 'OuterEnumDefaultValue' + /// + [Test] + public void OuterEnumDefaultValueTest() + { + // TODO unit test for the property 'OuterEnumDefaultValue' + } + /// + /// Test the property 'OuterEnumIntegerDefaultValue' + /// + [Test] + public void OuterEnumIntegerDefaultValueTest() + { + // TODO unit test for the property 'OuterEnumIntegerDefaultValue' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs new file mode 100644 index 00000000000..7530ad8087c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing EquilateralTriangle + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class EquilateralTriangleTests : IDisposable + { + // TODO uncomment below to declare an instance variable for EquilateralTriangle + //private EquilateralTriangle instance; + + public EquilateralTriangleTests() + { + // TODO uncomment below to create an instance of EquilateralTriangle + //instance = new EquilateralTriangle(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of EquilateralTriangle + /// + [Test] + public void EquilateralTriangleInstanceTest() + { + // TODO uncomment below to test "IsType" EquilateralTriangle + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'TriangleType' + /// + [Test] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs new file mode 100644 index 00000000000..971b8adbc9f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing FileSchemaTestClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class FileSchemaTestClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for FileSchemaTestClass + //private FileSchemaTestClass instance; + + public FileSchemaTestClassTests() + { + // TODO uncomment below to create an instance of FileSchemaTestClass + //instance = new FileSchemaTestClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of FileSchemaTestClass + /// + [Test] + public void FileSchemaTestClassInstanceTest() + { + // TODO uncomment below to test "IsType" FileSchemaTestClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'File' + /// + [Test] + public void FileTest() + { + // TODO unit test for the property 'File' + } + /// + /// Test the property 'Files' + /// + [Test] + public void FilesTest() + { + // TODO unit test for the property 'Files' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs new file mode 100644 index 00000000000..27d417cf409 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing File + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class FileTests : IDisposable + { + // TODO uncomment below to declare an instance variable for File + //private File instance; + + public FileTests() + { + // TODO uncomment below to create an instance of File + //instance = new File(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of File + /// + [Test] + public void FileInstanceTest() + { + // TODO uncomment below to test "IsType" File + //Assert.IsType(instance); + } + + + /// + /// Test the property 'SourceURI' + /// + [Test] + public void SourceURITest() + { + // TODO unit test for the property 'SourceURI' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs new file mode 100644 index 00000000000..6c2350cd28c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing FooGetDefaultResponse + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class FooGetDefaultResponseTests : IDisposable + { + // TODO uncomment below to declare an instance variable for FooGetDefaultResponse + //private FooGetDefaultResponse instance; + + public FooGetDefaultResponseTests() + { + // TODO uncomment below to create an instance of FooGetDefaultResponse + //instance = new FooGetDefaultResponse(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of FooGetDefaultResponse + /// + [Test] + public void FooGetDefaultResponseInstanceTest() + { + // TODO uncomment below to test "IsType" FooGetDefaultResponse + //Assert.IsType(instance); + } + + + /// + /// Test the property 'String' + /// + [Test] + public void StringTest() + { + // TODO unit test for the property 'String' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs new file mode 100644 index 00000000000..fb264e72f61 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Foo + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class FooTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Foo + //private Foo instance; + + public FooTests() + { + // TODO uncomment below to create an instance of Foo + //instance = new Foo(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Foo + /// + [Test] + public void FooInstanceTest() + { + // TODO uncomment below to test "IsType" Foo + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Bar' + /// + [Test] + public void BarTest() + { + // TODO unit test for the property 'Bar' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs new file mode 100644 index 00000000000..2d797f8b1a3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs @@ -0,0 +1,187 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing FormatTest + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class FormatTestTests : IDisposable + { + // TODO uncomment below to declare an instance variable for FormatTest + //private FormatTest instance; + + public FormatTestTests() + { + // TODO uncomment below to create an instance of FormatTest + //instance = new FormatTest(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of FormatTest + /// + [Test] + public void FormatTestInstanceTest() + { + // TODO uncomment below to test "IsType" FormatTest + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Integer' + /// + [Test] + public void IntegerTest() + { + // TODO unit test for the property 'Integer' + } + /// + /// Test the property 'Int32' + /// + [Test] + public void Int32Test() + { + // TODO unit test for the property 'Int32' + } + /// + /// Test the property 'Int64' + /// + [Test] + public void Int64Test() + { + // TODO unit test for the property 'Int64' + } + /// + /// Test the property 'Number' + /// + [Test] + public void NumberTest() + { + // TODO unit test for the property 'Number' + } + /// + /// Test the property 'Float' + /// + [Test] + public void FloatTest() + { + // TODO unit test for the property 'Float' + } + /// + /// Test the property 'Double' + /// + [Test] + public void DoubleTest() + { + // TODO unit test for the property 'Double' + } + /// + /// Test the property 'Decimal' + /// + [Test] + public void DecimalTest() + { + // TODO unit test for the property 'Decimal' + } + /// + /// Test the property 'String' + /// + [Test] + public void StringTest() + { + // TODO unit test for the property 'String' + } + /// + /// Test the property 'Byte' + /// + [Test] + public void ByteTest() + { + // TODO unit test for the property 'Byte' + } + /// + /// Test the property 'Binary' + /// + [Test] + public void BinaryTest() + { + // TODO unit test for the property 'Binary' + } + /// + /// Test the property 'Date' + /// + [Test] + public void DateTest() + { + // TODO unit test for the property 'Date' + } + /// + /// Test the property 'DateTime' + /// + [Test] + public void DateTimeTest() + { + // TODO unit test for the property 'DateTime' + } + /// + /// Test the property 'Uuid' + /// + [Test] + public void UuidTest() + { + // TODO unit test for the property 'Uuid' + } + /// + /// Test the property 'Password' + /// + [Test] + public void PasswordTest() + { + // TODO unit test for the property 'Password' + } + /// + /// Test the property 'PatternWithDigits' + /// + [Test] + public void PatternWithDigitsTest() + { + // TODO unit test for the property 'PatternWithDigits' + } + /// + /// Test the property 'PatternWithDigitsAndDelimiter' + /// + [Test] + public void PatternWithDigitsAndDelimiterTest() + { + // TODO unit test for the property 'PatternWithDigitsAndDelimiter' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs new file mode 100644 index 00000000000..216f6e9ed23 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing FruitReq + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class FruitReqTests : IDisposable + { + // TODO uncomment below to declare an instance variable for FruitReq + //private FruitReq instance; + + public FruitReqTests() + { + // TODO uncomment below to create an instance of FruitReq + //instance = new FruitReq(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of FruitReq + /// + [Test] + public void FruitReqInstanceTest() + { + // TODO uncomment below to test "IsType" FruitReq + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Cultivar' + /// + [Test] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + /// + /// Test the property 'Mealy' + /// + [Test] + public void MealyTest() + { + // TODO unit test for the property 'Mealy' + } + /// + /// Test the property 'LengthCm' + /// + [Test] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + /// + /// Test the property 'Sweet' + /// + [Test] + public void SweetTest() + { + // TODO unit test for the property 'Sweet' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs new file mode 100644 index 00000000000..35c0fd5df7e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Fruit + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class FruitTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Fruit + //private Fruit instance; + + public FruitTests() + { + // TODO uncomment below to create an instance of Fruit + //instance = new Fruit(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Fruit + /// + [Test] + public void FruitInstanceTest() + { + // TODO uncomment below to test "IsType" Fruit + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Color' + /// + [Test] + public void ColorTest() + { + // TODO unit test for the property 'Color' + } + /// + /// Test the property 'Cultivar' + /// + [Test] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + /// + /// Test the property 'Origin' + /// + [Test] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } + /// + /// Test the property 'LengthCm' + /// + [Test] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs new file mode 100644 index 00000000000..34dbc9d271f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing GmFruit + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class GmFruitTests : IDisposable + { + // TODO uncomment below to declare an instance variable for GmFruit + //private GmFruit instance; + + public GmFruitTests() + { + // TODO uncomment below to create an instance of GmFruit + //instance = new GmFruit(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of GmFruit + /// + [Test] + public void GmFruitInstanceTest() + { + // TODO uncomment below to test "IsType" GmFruit + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Color' + /// + [Test] + public void ColorTest() + { + // TODO unit test for the property 'Color' + } + /// + /// Test the property 'Cultivar' + /// + [Test] + public void CultivarTest() + { + // TODO unit test for the property 'Cultivar' + } + /// + /// Test the property 'Origin' + /// + [Test] + public void OriginTest() + { + // TODO unit test for the property 'Origin' + } + /// + /// Test the property 'LengthCm' + /// + [Test] + public void LengthCmTest() + { + // TODO unit test for the property 'LengthCm' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs new file mode 100644 index 00000000000..c66e6d56f66 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs @@ -0,0 +1,85 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing GrandparentAnimal + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class GrandparentAnimalTests : IDisposable + { + // TODO uncomment below to declare an instance variable for GrandparentAnimal + //private GrandparentAnimal instance; + + public GrandparentAnimalTests() + { + // TODO uncomment below to create an instance of GrandparentAnimal + //instance = new GrandparentAnimal(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of GrandparentAnimal + /// + [Test] + public void GrandparentAnimalInstanceTest() + { + // TODO uncomment below to test "IsType" GrandparentAnimal + //Assert.IsType(instance); + } + + /// + /// Test deserialize a ChildCat from type ParentPet + /// + [Test] + public void ChildCatDeserializeFromParentPetTest() + { + // TODO uncomment below to test deserialize a ChildCat from type ParentPet + //Assert.IsType(JsonConvert.DeserializeObject(new ChildCat().ToJson())); + } + /// + /// Test deserialize a ParentPet from type GrandparentAnimal + /// + [Test] + public void ParentPetDeserializeFromGrandparentAnimalTest() + { + // TODO uncomment below to test deserialize a ParentPet from type GrandparentAnimal + //Assert.IsType(JsonConvert.DeserializeObject(new ParentPet().ToJson())); + } + + /// + /// Test the property 'PetType' + /// + [Test] + public void PetTypeTest() + { + // TODO unit test for the property 'PetType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs new file mode 100644 index 00000000000..2dd8cc591f8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing HasOnlyReadOnly + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class HasOnlyReadOnlyTests : IDisposable + { + // TODO uncomment below to declare an instance variable for HasOnlyReadOnly + //private HasOnlyReadOnly instance; + + public HasOnlyReadOnlyTests() + { + // TODO uncomment below to create an instance of HasOnlyReadOnly + //instance = new HasOnlyReadOnly(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of HasOnlyReadOnly + /// + [Test] + public void HasOnlyReadOnlyInstanceTest() + { + // TODO uncomment below to test "IsType" HasOnlyReadOnly + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Bar' + /// + [Test] + public void BarTest() + { + // TODO unit test for the property 'Bar' + } + /// + /// Test the property 'Foo' + /// + [Test] + public void FooTest() + { + // TODO unit test for the property 'Foo' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs new file mode 100644 index 00000000000..80ebb93e08e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing HealthCheckResult + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class HealthCheckResultTests : IDisposable + { + // TODO uncomment below to declare an instance variable for HealthCheckResult + //private HealthCheckResult instance; + + public HealthCheckResultTests() + { + // TODO uncomment below to create an instance of HealthCheckResult + //instance = new HealthCheckResult(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of HealthCheckResult + /// + [Test] + public void HealthCheckResultInstanceTest() + { + // TODO uncomment below to test "IsType" HealthCheckResult + //Assert.IsType(instance); + } + + + /// + /// Test the property 'NullableMessage' + /// + [Test] + public void NullableMessageTest() + { + // TODO unit test for the property 'NullableMessage' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs new file mode 100644 index 00000000000..b7ba1a6794d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing IsoscelesTriangle + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class IsoscelesTriangleTests : IDisposable + { + // TODO uncomment below to declare an instance variable for IsoscelesTriangle + //private IsoscelesTriangle instance; + + public IsoscelesTriangleTests() + { + // TODO uncomment below to create an instance of IsoscelesTriangle + //instance = new IsoscelesTriangle(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of IsoscelesTriangle + /// + [Test] + public void IsoscelesTriangleInstanceTest() + { + // TODO uncomment below to test "IsType" IsoscelesTriangle + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'TriangleType' + /// + [Test] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs new file mode 100644 index 00000000000..d4b921008ff --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing List + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for List + //private List instance; + + public ListTests() + { + // TODO uncomment below to create an instance of List + //instance = new List(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of List + /// + [Test] + public void ListInstanceTest() + { + // TODO uncomment below to test "IsType" List + //Assert.IsType(instance); + } + + + /// + /// Test the property '_123List' + /// + [Test] + public void _123ListTest() + { + // TODO unit test for the property '_123List' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs new file mode 100644 index 00000000000..17eb2fb79b6 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Mammal + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MammalTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Mammal + //private Mammal instance; + + public MammalTests() + { + // TODO uncomment below to create an instance of Mammal + //instance = new Mammal(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Mammal + /// + [Test] + public void MammalInstanceTest() + { + // TODO uncomment below to test "IsType" Mammal + //Assert.IsType(instance); + } + + + /// + /// Test the property 'HasBaleen' + /// + [Test] + public void HasBaleenTest() + { + // TODO unit test for the property 'HasBaleen' + } + /// + /// Test the property 'HasTeeth' + /// + [Test] + public void HasTeethTest() + { + // TODO unit test for the property 'HasTeeth' + } + /// + /// Test the property 'ClassName' + /// + [Test] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + /// + /// Test the property 'Type' + /// + [Test] + public void TypeTest() + { + // TODO unit test for the property 'Type' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs new file mode 100644 index 00000000000..b76e755c815 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MapTest + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MapTestTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MapTest + //private MapTest instance; + + public MapTestTests() + { + // TODO uncomment below to create an instance of MapTest + //instance = new MapTest(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MapTest + /// + [Test] + public void MapTestInstanceTest() + { + // TODO uncomment below to test "IsType" MapTest + //Assert.IsType(instance); + } + + + /// + /// Test the property 'MapMapOfString' + /// + [Test] + public void MapMapOfStringTest() + { + // TODO unit test for the property 'MapMapOfString' + } + /// + /// Test the property 'MapOfEnumString' + /// + [Test] + public void MapOfEnumStringTest() + { + // TODO unit test for the property 'MapOfEnumString' + } + /// + /// Test the property 'DirectMap' + /// + [Test] + public void DirectMapTest() + { + // TODO unit test for the property 'DirectMap' + } + /// + /// Test the property 'IndirectMap' + /// + [Test] + public void IndirectMapTest() + { + // TODO unit test for the property 'IndirectMap' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs new file mode 100644 index 00000000000..42ea53f9da3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing MixedPropertiesAndAdditionalPropertiesClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class MixedPropertiesAndAdditionalPropertiesClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for MixedPropertiesAndAdditionalPropertiesClass + //private MixedPropertiesAndAdditionalPropertiesClass instance; + + public MixedPropertiesAndAdditionalPropertiesClassTests() + { + // TODO uncomment below to create an instance of MixedPropertiesAndAdditionalPropertiesClass + //instance = new MixedPropertiesAndAdditionalPropertiesClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of MixedPropertiesAndAdditionalPropertiesClass + /// + [Test] + public void MixedPropertiesAndAdditionalPropertiesClassInstanceTest() + { + // TODO uncomment below to test "IsType" MixedPropertiesAndAdditionalPropertiesClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'UuidWithPattern' + /// + [Test] + public void UuidWithPatternTest() + { + // TODO unit test for the property 'UuidWithPattern' + } + /// + /// Test the property 'Uuid' + /// + [Test] + public void UuidTest() + { + // TODO unit test for the property 'Uuid' + } + /// + /// Test the property 'DateTime' + /// + [Test] + public void DateTimeTest() + { + // TODO unit test for the property 'DateTime' + } + /// + /// Test the property 'Map' + /// + [Test] + public void MapTest() + { + // TODO unit test for the property 'Map' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs new file mode 100644 index 00000000000..ef14ea7ce6f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Model200Response + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class Model200ResponseTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Model200Response + //private Model200Response instance; + + public Model200ResponseTests() + { + // TODO uncomment below to create an instance of Model200Response + //instance = new Model200Response(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Model200Response + /// + [Test] + public void Model200ResponseInstanceTest() + { + // TODO uncomment below to test "IsType" Model200Response + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Name' + /// + [Test] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + /// + /// Test the property 'Class' + /// + [Test] + public void ClassTest() + { + // TODO unit test for the property 'Class' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs new file mode 100644 index 00000000000..16393b85aaf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ModelClient + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ModelClientTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ModelClient + //private ModelClient instance; + + public ModelClientTests() + { + // TODO uncomment below to create an instance of ModelClient + //instance = new ModelClient(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ModelClient + /// + [Test] + public void ModelClientInstanceTest() + { + // TODO uncomment below to test "IsType" ModelClient + //Assert.IsType(instance); + } + + + /// + /// Test the property '_Client' + /// + [Test] + public void _ClientTest() + { + // TODO unit test for the property '_Client' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs new file mode 100644 index 00000000000..7131673e7bf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Name + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class NameTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Name + //private Name instance; + + public NameTests() + { + // TODO uncomment below to create an instance of Name + //instance = new Name(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Name + /// + [Test] + public void NameInstanceTest() + { + // TODO uncomment below to test "IsType" Name + //Assert.IsType(instance); + } + + + /// + /// Test the property '_Name' + /// + [Test] + public void _NameTest() + { + // TODO unit test for the property '_Name' + } + /// + /// Test the property 'SnakeCase' + /// + [Test] + public void SnakeCaseTest() + { + // TODO unit test for the property 'SnakeCase' + } + /// + /// Test the property 'Property' + /// + [Test] + public void PropertyTest() + { + // TODO unit test for the property 'Property' + } + /// + /// Test the property '_123Number' + /// + [Test] + public void _123NumberTest() + { + // TODO unit test for the property '_123Number' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs new file mode 100644 index 00000000000..029631e7671 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs @@ -0,0 +1,155 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing NullableClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class NullableClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for NullableClass + //private NullableClass instance; + + public NullableClassTests() + { + // TODO uncomment below to create an instance of NullableClass + //instance = new NullableClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of NullableClass + /// + [Test] + public void NullableClassInstanceTest() + { + // TODO uncomment below to test "IsType" NullableClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'IntegerProp' + /// + [Test] + public void IntegerPropTest() + { + // TODO unit test for the property 'IntegerProp' + } + /// + /// Test the property 'NumberProp' + /// + [Test] + public void NumberPropTest() + { + // TODO unit test for the property 'NumberProp' + } + /// + /// Test the property 'BooleanProp' + /// + [Test] + public void BooleanPropTest() + { + // TODO unit test for the property 'BooleanProp' + } + /// + /// Test the property 'StringProp' + /// + [Test] + public void StringPropTest() + { + // TODO unit test for the property 'StringProp' + } + /// + /// Test the property 'DateProp' + /// + [Test] + public void DatePropTest() + { + // TODO unit test for the property 'DateProp' + } + /// + /// Test the property 'DatetimeProp' + /// + [Test] + public void DatetimePropTest() + { + // TODO unit test for the property 'DatetimeProp' + } + /// + /// Test the property 'ArrayNullableProp' + /// + [Test] + public void ArrayNullablePropTest() + { + // TODO unit test for the property 'ArrayNullableProp' + } + /// + /// Test the property 'ArrayAndItemsNullableProp' + /// + [Test] + public void ArrayAndItemsNullablePropTest() + { + // TODO unit test for the property 'ArrayAndItemsNullableProp' + } + /// + /// Test the property 'ArrayItemsNullable' + /// + [Test] + public void ArrayItemsNullableTest() + { + // TODO unit test for the property 'ArrayItemsNullable' + } + /// + /// Test the property 'ObjectNullableProp' + /// + [Test] + public void ObjectNullablePropTest() + { + // TODO unit test for the property 'ObjectNullableProp' + } + /// + /// Test the property 'ObjectAndItemsNullableProp' + /// + [Test] + public void ObjectAndItemsNullablePropTest() + { + // TODO unit test for the property 'ObjectAndItemsNullableProp' + } + /// + /// Test the property 'ObjectItemsNullable' + /// + [Test] + public void ObjectItemsNullableTest() + { + // TODO unit test for the property 'ObjectItemsNullable' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs new file mode 100644 index 00000000000..c6835470618 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing NullableGuidClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class NullableGuidClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for NullableGuidClass + //private NullableGuidClass instance; + + public NullableGuidClassTests() + { + // TODO uncomment below to create an instance of NullableGuidClass + //instance = new NullableGuidClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of NullableGuidClass + /// + [Test] + public void NullableGuidClassInstanceTest() + { + // TODO uncomment below to test "IsType" NullableGuidClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Uuid' + /// + [Test] + public void UuidTest() + { + // TODO unit test for the property 'Uuid' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs new file mode 100644 index 00000000000..278ebdb2d8a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing NullableShape + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class NullableShapeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for NullableShape + //private NullableShape instance; + + public NullableShapeTests() + { + // TODO uncomment below to create an instance of NullableShape + //instance = new NullableShape(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of NullableShape + /// + [Test] + public void NullableShapeInstanceTest() + { + // TODO uncomment below to test "IsType" NullableShape + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'QuadrilateralType' + /// + [Test] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs new file mode 100644 index 00000000000..cbead7232a9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing NumberOnly + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class NumberOnlyTests : IDisposable + { + // TODO uncomment below to declare an instance variable for NumberOnly + //private NumberOnly instance; + + public NumberOnlyTests() + { + // TODO uncomment below to create an instance of NumberOnly + //instance = new NumberOnly(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of NumberOnly + /// + [Test] + public void NumberOnlyInstanceTest() + { + // TODO uncomment below to test "IsType" NumberOnly + //Assert.IsType(instance); + } + + + /// + /// Test the property 'JustNumber' + /// + [Test] + public void JustNumberTest() + { + // TODO unit test for the property 'JustNumber' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs new file mode 100644 index 00000000000..d3b17323263 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs @@ -0,0 +1,91 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ObjectWithDeprecatedFields + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ObjectWithDeprecatedFieldsTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ObjectWithDeprecatedFields + //private ObjectWithDeprecatedFields instance; + + public ObjectWithDeprecatedFieldsTests() + { + // TODO uncomment below to create an instance of ObjectWithDeprecatedFields + //instance = new ObjectWithDeprecatedFields(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ObjectWithDeprecatedFields + /// + [Test] + public void ObjectWithDeprecatedFieldsInstanceTest() + { + // TODO uncomment below to test "IsType" ObjectWithDeprecatedFields + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Uuid' + /// + [Test] + public void UuidTest() + { + // TODO unit test for the property 'Uuid' + } + /// + /// Test the property 'Id' + /// + [Test] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + /// + /// Test the property 'DeprecatedRef' + /// + [Test] + public void DeprecatedRefTest() + { + // TODO unit test for the property 'DeprecatedRef' + } + /// + /// Test the property 'Bars' + /// + [Test] + public void BarsTest() + { + // TODO unit test for the property 'Bars' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs new file mode 100644 index 00000000000..683d422a3f4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs @@ -0,0 +1,107 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Order + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class OrderTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Order + //private Order instance; + + public OrderTests() + { + // TODO uncomment below to create an instance of Order + //instance = new Order(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Order + /// + [Test] + public void OrderInstanceTest() + { + // TODO uncomment below to test "IsType" Order + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Id' + /// + [Test] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + /// + /// Test the property 'PetId' + /// + [Test] + public void PetIdTest() + { + // TODO unit test for the property 'PetId' + } + /// + /// Test the property 'Quantity' + /// + [Test] + public void QuantityTest() + { + // TODO unit test for the property 'Quantity' + } + /// + /// Test the property 'ShipDate' + /// + [Test] + public void ShipDateTest() + { + // TODO unit test for the property 'ShipDate' + } + /// + /// Test the property 'Status' + /// + [Test] + public void StatusTest() + { + // TODO unit test for the property 'Status' + } + /// + /// Test the property 'Complete' + /// + [Test] + public void CompleteTest() + { + // TODO unit test for the property 'Complete' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs new file mode 100644 index 00000000000..39c7730a0f2 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs @@ -0,0 +1,83 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing OuterComposite + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class OuterCompositeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for OuterComposite + //private OuterComposite instance; + + public OuterCompositeTests() + { + // TODO uncomment below to create an instance of OuterComposite + //instance = new OuterComposite(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of OuterComposite + /// + [Test] + public void OuterCompositeInstanceTest() + { + // TODO uncomment below to test "IsType" OuterComposite + //Assert.IsType(instance); + } + + + /// + /// Test the property 'MyNumber' + /// + [Test] + public void MyNumberTest() + { + // TODO unit test for the property 'MyNumber' + } + /// + /// Test the property 'MyString' + /// + [Test] + public void MyStringTest() + { + // TODO unit test for the property 'MyString' + } + /// + /// Test the property 'MyBoolean' + /// + [Test] + public void MyBooleanTest() + { + // TODO unit test for the property 'MyBoolean' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs new file mode 100644 index 00000000000..6376c258476 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs @@ -0,0 +1,59 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing OuterEnumDefaultValue + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class OuterEnumDefaultValueTests : IDisposable + { + // TODO uncomment below to declare an instance variable for OuterEnumDefaultValue + //private OuterEnumDefaultValue instance; + + public OuterEnumDefaultValueTests() + { + // TODO uncomment below to create an instance of OuterEnumDefaultValue + //instance = new OuterEnumDefaultValue(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of OuterEnumDefaultValue + /// + [Test] + public void OuterEnumDefaultValueInstanceTest() + { + // TODO uncomment below to test "IsType" OuterEnumDefaultValue + //Assert.IsType(instance); + } + + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs new file mode 100644 index 00000000000..b8fd4b863dc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs @@ -0,0 +1,59 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing OuterEnumIntegerDefaultValue + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class OuterEnumIntegerDefaultValueTests : IDisposable + { + // TODO uncomment below to declare an instance variable for OuterEnumIntegerDefaultValue + //private OuterEnumIntegerDefaultValue instance; + + public OuterEnumIntegerDefaultValueTests() + { + // TODO uncomment below to create an instance of OuterEnumIntegerDefaultValue + //instance = new OuterEnumIntegerDefaultValue(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of OuterEnumIntegerDefaultValue + /// + [Test] + public void OuterEnumIntegerDefaultValueInstanceTest() + { + // TODO uncomment below to test "IsType" OuterEnumIntegerDefaultValue + //Assert.IsType(instance); + } + + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs new file mode 100644 index 00000000000..3cfb128a9e2 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs @@ -0,0 +1,59 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing OuterEnumInteger + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class OuterEnumIntegerTests : IDisposable + { + // TODO uncomment below to declare an instance variable for OuterEnumInteger + //private OuterEnumInteger instance; + + public OuterEnumIntegerTests() + { + // TODO uncomment below to create an instance of OuterEnumInteger + //instance = new OuterEnumInteger(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of OuterEnumInteger + /// + [Test] + public void OuterEnumIntegerInstanceTest() + { + // TODO uncomment below to test "IsType" OuterEnumInteger + //Assert.IsType(instance); + } + + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs new file mode 100644 index 00000000000..a13bfd83401 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs @@ -0,0 +1,59 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing OuterEnum + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class OuterEnumTests : IDisposable + { + // TODO uncomment below to declare an instance variable for OuterEnum + //private OuterEnum instance; + + public OuterEnumTests() + { + // TODO uncomment below to create an instance of OuterEnum + //instance = new OuterEnum(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of OuterEnum + /// + [Test] + public void OuterEnumInstanceTest() + { + // TODO uncomment below to test "IsType" OuterEnum + //Assert.IsType(instance); + } + + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs new file mode 100644 index 00000000000..1f16980516b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ParentPet + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ParentPetTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ParentPet + //private ParentPet instance; + + public ParentPetTests() + { + // TODO uncomment below to create an instance of ParentPet + //instance = new ParentPet(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ParentPet + /// + [Test] + public void ParentPetInstanceTest() + { + // TODO uncomment below to test "IsType" ParentPet + //Assert.IsType(instance); + } + + /// + /// Test deserialize a ChildCat from type ParentPet + /// + [Test] + public void ChildCatDeserializeFromParentPetTest() + { + // TODO uncomment below to test deserialize a ChildCat from type ParentPet + //Assert.IsType(JsonConvert.DeserializeObject(new ChildCat().ToJson())); + } + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs new file mode 100644 index 00000000000..7b7fff9cf81 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs @@ -0,0 +1,107 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Pet + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class PetTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Pet + //private Pet instance; + + public PetTests() + { + // TODO uncomment below to create an instance of Pet + //instance = new Pet(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Pet + /// + [Test] + public void PetInstanceTest() + { + // TODO uncomment below to test "IsType" Pet + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Id' + /// + [Test] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + /// + /// Test the property 'Category' + /// + [Test] + public void CategoryTest() + { + // TODO unit test for the property 'Category' + } + /// + /// Test the property 'Name' + /// + [Test] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + /// + /// Test the property 'PhotoUrls' + /// + [Test] + public void PhotoUrlsTest() + { + // TODO unit test for the property 'PhotoUrls' + } + /// + /// Test the property 'Tags' + /// + [Test] + public void TagsTest() + { + // TODO unit test for the property 'Tags' + } + /// + /// Test the property 'Status' + /// + [Test] + public void StatusTest() + { + // TODO unit test for the property 'Status' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs new file mode 100644 index 00000000000..a18f7330cef --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Pig + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class PigTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Pig + //private Pig instance; + + public PigTests() + { + // TODO uncomment below to create an instance of Pig + //instance = new Pig(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Pig + /// + [Test] + public void PigInstanceTest() + { + // TODO uncomment below to test "IsType" Pig + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ClassName' + /// + [Test] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs new file mode 100644 index 00000000000..435a70afe61 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs @@ -0,0 +1,59 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing PolymorphicProperty + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class PolymorphicPropertyTests : IDisposable + { + // TODO uncomment below to declare an instance variable for PolymorphicProperty + //private PolymorphicProperty instance; + + public PolymorphicPropertyTests() + { + // TODO uncomment below to create an instance of PolymorphicProperty + //instance = new PolymorphicProperty(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of PolymorphicProperty + /// + [Test] + public void PolymorphicPropertyInstanceTest() + { + // TODO uncomment below to test "IsType" PolymorphicProperty + //Assert.IsType(instance); + } + + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs new file mode 100644 index 00000000000..079fc105426 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing QuadrilateralInterface + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class QuadrilateralInterfaceTests : IDisposable + { + // TODO uncomment below to declare an instance variable for QuadrilateralInterface + //private QuadrilateralInterface instance; + + public QuadrilateralInterfaceTests() + { + // TODO uncomment below to create an instance of QuadrilateralInterface + //instance = new QuadrilateralInterface(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of QuadrilateralInterface + /// + [Test] + public void QuadrilateralInterfaceInstanceTest() + { + // TODO uncomment below to test "IsType" QuadrilateralInterface + //Assert.IsType(instance); + } + + + /// + /// Test the property 'QuadrilateralType' + /// + [Test] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs new file mode 100644 index 00000000000..cc2f53d3d68 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Quadrilateral + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class QuadrilateralTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Quadrilateral + //private Quadrilateral instance; + + public QuadrilateralTests() + { + // TODO uncomment below to create an instance of Quadrilateral + //instance = new Quadrilateral(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Quadrilateral + /// + [Test] + public void QuadrilateralInstanceTest() + { + // TODO uncomment below to test "IsType" Quadrilateral + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'QuadrilateralType' + /// + [Test] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs new file mode 100644 index 00000000000..1d73a2e93e0 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ReadOnlyFirst + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ReadOnlyFirstTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ReadOnlyFirst + //private ReadOnlyFirst instance; + + public ReadOnlyFirstTests() + { + // TODO uncomment below to create an instance of ReadOnlyFirst + //instance = new ReadOnlyFirst(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ReadOnlyFirst + /// + [Test] + public void ReadOnlyFirstInstanceTest() + { + // TODO uncomment below to test "IsType" ReadOnlyFirst + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Bar' + /// + [Test] + public void BarTest() + { + // TODO unit test for the property 'Bar' + } + /// + /// Test the property 'Baz' + /// + [Test] + public void BazTest() + { + // TODO unit test for the property 'Baz' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs new file mode 100644 index 00000000000..1ad460b5392 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Return + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ReturnTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Return + //private Return instance; + + public ReturnTests() + { + // TODO uncomment below to create an instance of Return + //instance = new Return(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Return + /// + [Test] + public void ReturnInstanceTest() + { + // TODO uncomment below to test "IsType" Return + //Assert.IsType(instance); + } + + + /// + /// Test the property '_Return' + /// + [Test] + public void _ReturnTest() + { + // TODO unit test for the property '_Return' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs new file mode 100644 index 00000000000..4eef3141e21 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ScaleneTriangle + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ScaleneTriangleTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ScaleneTriangle + //private ScaleneTriangle instance; + + public ScaleneTriangleTests() + { + // TODO uncomment below to create an instance of ScaleneTriangle + //instance = new ScaleneTriangle(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ScaleneTriangle + /// + [Test] + public void ScaleneTriangleInstanceTest() + { + // TODO uncomment below to test "IsType" ScaleneTriangle + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'TriangleType' + /// + [Test] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs new file mode 100644 index 00000000000..d0e787e2a98 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ShapeInterface + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ShapeInterfaceTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ShapeInterface + //private ShapeInterface instance; + + public ShapeInterfaceTests() + { + // TODO uncomment below to create an instance of ShapeInterface + //instance = new ShapeInterface(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ShapeInterface + /// + [Test] + public void ShapeInterfaceInstanceTest() + { + // TODO uncomment below to test "IsType" ShapeInterface + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs new file mode 100644 index 00000000000..5bfd6b024fc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing ShapeOrNull + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ShapeOrNullTests : IDisposable + { + // TODO uncomment below to declare an instance variable for ShapeOrNull + //private ShapeOrNull instance; + + public ShapeOrNullTests() + { + // TODO uncomment below to create an instance of ShapeOrNull + //instance = new ShapeOrNull(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of ShapeOrNull + /// + [Test] + public void ShapeOrNullInstanceTest() + { + // TODO uncomment below to test "IsType" ShapeOrNull + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'QuadrilateralType' + /// + [Test] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs new file mode 100644 index 00000000000..0a00f468ec0 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Shape + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ShapeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Shape + //private Shape instance; + + public ShapeTests() + { + // TODO uncomment below to create an instance of Shape + //instance = new Shape(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Shape + /// + [Test] + public void ShapeInstanceTest() + { + // TODO uncomment below to test "IsType" Shape + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'QuadrilateralType' + /// + [Test] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs new file mode 100644 index 00000000000..0477e530d9f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing SimpleQuadrilateral + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class SimpleQuadrilateralTests : IDisposable + { + // TODO uncomment below to declare an instance variable for SimpleQuadrilateral + //private SimpleQuadrilateral instance; + + public SimpleQuadrilateralTests() + { + // TODO uncomment below to create an instance of SimpleQuadrilateral + //instance = new SimpleQuadrilateral(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of SimpleQuadrilateral + /// + [Test] + public void SimpleQuadrilateralInstanceTest() + { + // TODO uncomment below to test "IsType" SimpleQuadrilateral + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'QuadrilateralType' + /// + [Test] + public void QuadrilateralTypeTest() + { + // TODO unit test for the property 'QuadrilateralType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs new file mode 100644 index 00000000000..1f3dc827152 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing SpecialModelName + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class SpecialModelNameTests : IDisposable + { + // TODO uncomment below to declare an instance variable for SpecialModelName + //private SpecialModelName instance; + + public SpecialModelNameTests() + { + // TODO uncomment below to create an instance of SpecialModelName + //instance = new SpecialModelName(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of SpecialModelName + /// + [Test] + public void SpecialModelNameInstanceTest() + { + // TODO uncomment below to test "IsType" SpecialModelName + //Assert.IsType(instance); + } + + + /// + /// Test the property 'SpecialPropertyName' + /// + [Test] + public void SpecialPropertyNameTest() + { + // TODO unit test for the property 'SpecialPropertyName' + } + /// + /// Test the property '_SpecialModelName' + /// + [Test] + public void _SpecialModelNameTest() + { + // TODO unit test for the property '_SpecialModelName' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs new file mode 100644 index 00000000000..e956f3b15a2 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Tag + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TagTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Tag + //private Tag instance; + + public TagTests() + { + // TODO uncomment below to create an instance of Tag + //instance = new Tag(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Tag + /// + [Test] + public void TagInstanceTest() + { + // TODO uncomment below to test "IsType" Tag + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Id' + /// + [Test] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + /// + /// Test the property 'Name' + /// + [Test] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs new file mode 100644 index 00000000000..73b7803a431 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TriangleInterface + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TriangleInterfaceTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TriangleInterface + //private TriangleInterface instance; + + public TriangleInterfaceTests() + { + // TODO uncomment below to create an instance of TriangleInterface + //instance = new TriangleInterface(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TriangleInterface + /// + [Test] + public void TriangleInterfaceInstanceTest() + { + // TODO uncomment below to test "IsType" TriangleInterface + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TriangleType' + /// + [Test] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs new file mode 100644 index 00000000000..f2ca943e59b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Triangle + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TriangleTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Triangle + //private Triangle instance; + + public TriangleTests() + { + // TODO uncomment below to create an instance of Triangle + //instance = new Triangle(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Triangle + /// + [Test] + public void TriangleInstanceTest() + { + // TODO uncomment below to test "IsType" Triangle + //Assert.IsType(instance); + } + + + /// + /// Test the property 'ShapeType' + /// + [Test] + public void ShapeTypeTest() + { + // TODO unit test for the property 'ShapeType' + } + /// + /// Test the property 'TriangleType' + /// + [Test] + public void TriangleTypeTest() + { + // TODO unit test for the property 'TriangleType' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs new file mode 100644 index 00000000000..1859aad97fe --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs @@ -0,0 +1,155 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing User + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class UserTests : IDisposable + { + // TODO uncomment below to declare an instance variable for User + //private User instance; + + public UserTests() + { + // TODO uncomment below to create an instance of User + //instance = new User(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of User + /// + [Test] + public void UserInstanceTest() + { + // TODO uncomment below to test "IsType" User + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Id' + /// + [Test] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + /// + /// Test the property 'Username' + /// + [Test] + public void UsernameTest() + { + // TODO unit test for the property 'Username' + } + /// + /// Test the property 'FirstName' + /// + [Test] + public void FirstNameTest() + { + // TODO unit test for the property 'FirstName' + } + /// + /// Test the property 'LastName' + /// + [Test] + public void LastNameTest() + { + // TODO unit test for the property 'LastName' + } + /// + /// Test the property 'Email' + /// + [Test] + public void EmailTest() + { + // TODO unit test for the property 'Email' + } + /// + /// Test the property 'Password' + /// + [Test] + public void PasswordTest() + { + // TODO unit test for the property 'Password' + } + /// + /// Test the property 'Phone' + /// + [Test] + public void PhoneTest() + { + // TODO unit test for the property 'Phone' + } + /// + /// Test the property 'UserStatus' + /// + [Test] + public void UserStatusTest() + { + // TODO unit test for the property 'UserStatus' + } + /// + /// Test the property 'ObjectWithNoDeclaredProps' + /// + [Test] + public void ObjectWithNoDeclaredPropsTest() + { + // TODO unit test for the property 'ObjectWithNoDeclaredProps' + } + /// + /// Test the property 'ObjectWithNoDeclaredPropsNullable' + /// + [Test] + public void ObjectWithNoDeclaredPropsNullableTest() + { + // TODO unit test for the property 'ObjectWithNoDeclaredPropsNullable' + } + /// + /// Test the property 'AnyTypeProp' + /// + [Test] + public void AnyTypePropTest() + { + // TODO unit test for the property 'AnyTypeProp' + } + /// + /// Test the property 'AnyTypePropNullable' + /// + [Test] + public void AnyTypePropNullableTest() + { + // TODO unit test for the property 'AnyTypePropNullable' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs new file mode 100644 index 00000000000..2be2a2dd8cc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs @@ -0,0 +1,83 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Whale + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class WhaleTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Whale + //private Whale instance; + + public WhaleTests() + { + // TODO uncomment below to create an instance of Whale + //instance = new Whale(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Whale + /// + [Test] + public void WhaleInstanceTest() + { + // TODO uncomment below to test "IsType" Whale + //Assert.IsType(instance); + } + + + /// + /// Test the property 'HasBaleen' + /// + [Test] + public void HasBaleenTest() + { + // TODO unit test for the property 'HasBaleen' + } + /// + /// Test the property 'HasTeeth' + /// + [Test] + public void HasTeethTest() + { + // TODO unit test for the property 'HasTeeth' + } + /// + /// Test the property 'ClassName' + /// + [Test] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs new file mode 100644 index 00000000000..ff81e57c0b5 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs @@ -0,0 +1,75 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Zebra + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class ZebraTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Zebra + //private Zebra instance; + + public ZebraTests() + { + // TODO uncomment below to create an instance of Zebra + //instance = new Zebra(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Zebra + /// + [Test] + public void ZebraInstanceTest() + { + // TODO uncomment below to test "IsType" Zebra + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Type' + /// + [Test] + public void TypeTest() + { + // TODO unit test for the property 'Type' + } + /// + /// Test the property 'ClassName' + /// + [Test] + public void ClassNameTest() + { + // TODO unit test for the property 'ClassName' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef new file mode 100644 index 00000000000..464bf977d5b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef @@ -0,0 +1,15 @@ +{ + "name": "Org.OpenAPITools.Test", + "references": [ + "Org.OpenAPITools", + "UnityEngine.TestRunner" + ], + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll", + "Newtonsoft.Json.dll" + ], + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ] +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs new file mode 100644 index 00000000000..285d9313360 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -0,0 +1,355 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Api +{ + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IAnotherFakeApiSync : IApiAccessor + { + #region Synchronous Operations + /// + /// To test special tags + /// + /// + /// To test special tags and operation ID starting with number + /// + /// Thrown when fails to make API call + /// client model + /// ModelClient + ModelClient Call123TestSpecialTags(ModelClient modelClient); + + /// + /// To test special tags + /// + /// + /// To test special tags and operation ID starting with number + /// + /// Thrown when fails to make API call + /// client model + /// ApiResponse of ModelClient + ApiResponse Call123TestSpecialTagsWithHttpInfo(ModelClient modelClient); + #endregion Synchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IAnotherFakeApiAsync : IApiAccessor + { + #region Asynchronous Operations + /// + /// To test special tags + /// + /// + /// To test special tags and operation ID starting with number + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ModelClient + System.Threading.Tasks.Task Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// To test special tags + /// + /// + /// To test special tags and operation ID starting with number + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ModelClient) + System.Threading.Tasks.Task> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + #endregion Asynchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IAnotherFakeApi : IAnotherFakeApiSync, IAnotherFakeApiAsync + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public partial class AnotherFakeApi : IDisposable, IAnotherFakeApi + { + private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// + public AnotherFakeApi() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// The target service's base path in URL format. + /// + /// + public AnotherFakeApi(string basePath) + { + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + new Org.OpenAPITools.Client.Configuration { BasePath = basePath } + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class using Configuration object. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// An instance of Configuration. + /// + /// + public AnotherFakeApi(Org.OpenAPITools.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + configuration + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access. + /// The client interface for asynchronous API access. + /// The configuration object. + /// + public AnotherFakeApi(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + this.AsynchronousClient = asyncClient; + this.Configuration = configuration; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + this.ApiClient?.Dispose(); + } + + /// + /// Holds the ApiClient if created + /// + public Org.OpenAPITools.Client.ApiClient ApiClient { get; set; } = null; + + /// + /// The client for accessing this underlying API asynchronously. + /// + public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; } + + /// + /// The client for accessing this underlying API synchronously. + /// + public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + /// + /// To test special tags To test special tags and operation ID starting with number + /// + /// Thrown when fails to make API call + /// client model + /// ModelClient + public ModelClient Call123TestSpecialTags(ModelClient modelClient) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = Call123TestSpecialTagsWithHttpInfo(modelClient); + return localVarResponse.Data; + } + + /// + /// To test special tags To test special tags and operation ID starting with number + /// + /// Thrown when fails to make API call + /// client model + /// ApiResponse of ModelClient + public Org.OpenAPITools.Client.ApiResponse Call123TestSpecialTagsWithHttpInfo(ModelClient modelClient) + { + // verify the required parameter 'modelClient' is set + if (modelClient == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'modelClient' when calling AnotherFakeApi->Call123TestSpecialTags"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = modelClient; + + + // make the HTTP request + var localVarResponse = this.Client.Patch("/another-fake/dummy", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Call123TestSpecialTags", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// To test special tags To test special tags and operation ID starting with number + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ModelClient + public async System.Threading.Tasks.Task Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// To test special tags To test special tags and operation ID starting with number + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ModelClient) + public async System.Threading.Tasks.Task> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'modelClient' is set + if (modelClient == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'modelClient' when calling AnotherFakeApi->Call123TestSpecialTags"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = modelClient; + + + // make the HTTP request + + var task = this.AsynchronousClient.PatchAsync("/another-fake/dummy", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Call123TestSpecialTags", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs new file mode 100644 index 00000000000..6b7114a739b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -0,0 +1,497 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Api +{ + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IDefaultApiSync : IApiAccessor + { + #region Synchronous Operations + /// + /// + /// + /// Thrown when fails to make API call + /// FooGetDefaultResponse + FooGetDefaultResponse FooGet(); + + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ApiResponse of FooGetDefaultResponse + ApiResponse FooGetWithHttpInfo(); + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + void GetCountry(string country); + + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// + /// ApiResponse of Object(void) + ApiResponse GetCountryWithHttpInfo(string country); + #endregion Synchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IDefaultApiAsync : IApiAccessor + { + #region Asynchronous Operations + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of FooGetDefaultResponse + System.Threading.Tasks.Task FooGetAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (FooGetDefaultResponse) + System.Threading.Tasks.Task> FooGetWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task GetCountryAsync(string country, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + #endregion Asynchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IDefaultApi : IDefaultApiSync, IDefaultApiAsync + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public partial class DefaultApi : IDisposable, IDefaultApi + { + private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// + public DefaultApi() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// The target service's base path in URL format. + /// + /// + public DefaultApi(string basePath) + { + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + new Org.OpenAPITools.Client.Configuration { BasePath = basePath } + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class using Configuration object. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// An instance of Configuration. + /// + /// + public DefaultApi(Org.OpenAPITools.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + configuration + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access. + /// The client interface for asynchronous API access. + /// The configuration object. + /// + public DefaultApi(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + this.AsynchronousClient = asyncClient; + this.Configuration = configuration; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + this.ApiClient?.Dispose(); + } + + /// + /// Holds the ApiClient if created + /// + public Org.OpenAPITools.Client.ApiClient ApiClient { get; set; } = null; + + /// + /// The client for accessing this underlying API asynchronously. + /// + public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; } + + /// + /// The client for accessing this underlying API synchronously. + /// + public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + /// + /// + /// + /// Thrown when fails to make API call + /// FooGetDefaultResponse + public FooGetDefaultResponse FooGet() + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = FooGetWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// + /// + /// Thrown when fails to make API call + /// ApiResponse of FooGetDefaultResponse + public Org.OpenAPITools.Client.ApiResponse FooGetWithHttpInfo() + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + var localVarResponse = this.Client.Get("/foo", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FooGet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of FooGetDefaultResponse + public async System.Threading.Tasks.Task FooGetAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = FooGetWithHttpInfoAsync(cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (FooGetDefaultResponse) + public async System.Threading.Tasks.Task> FooGetWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/foo", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FooGet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + public void GetCountry(string country) + { + GetCountryWithHttpInfo(country); + } + + /// + /// + /// + /// Thrown when fails to make API call + /// + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse GetCountryWithHttpInfo(string country) + { + // verify the required parameter 'country' is set + if (country == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'country' when calling DefaultApi->GetCountry"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.FormParameters.Add("country", Org.OpenAPITools.Client.ClientUtils.ParameterToString(country)); // form parameter + + + // make the HTTP request + var localVarResponse = this.Client.Post("/country", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetCountry", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// + /// + /// Thrown when fails to make API call + /// + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task GetCountryAsync(string country, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = GetCountryWithHttpInfoAsync(country, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// + /// + /// Thrown when fails to make API call + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'country' is set + if (country == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'country' when calling DefaultApi->GetCountry"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.FormParameters.Add("country", Org.OpenAPITools.Client.ClientUtils.ParameterToString(country)); // form parameter + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/country", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetCountry", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs new file mode 100644 index 00000000000..c09437cad92 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs @@ -0,0 +1,3148 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Api +{ + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IFakeApiSync : IApiAccessor + { + #region Synchronous Operations + /// + /// Health check endpoint + /// + /// Thrown when fails to make API call + /// HealthCheckResult + HealthCheckResult FakeHealthGet(); + + /// + /// Health check endpoint + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ApiResponse of HealthCheckResult + ApiResponse FakeHealthGetWithHttpInfo(); + /// + /// + /// + /// + /// Test serialization of outer boolean types + /// + /// Thrown when fails to make API call + /// Input boolean as post body (optional) + /// bool + bool FakeOuterBooleanSerialize(bool? body = default(bool?)); + + /// + /// + /// + /// + /// Test serialization of outer boolean types + /// + /// Thrown when fails to make API call + /// Input boolean as post body (optional) + /// ApiResponse of bool + ApiResponse FakeOuterBooleanSerializeWithHttpInfo(bool? body = default(bool?)); + /// + /// + /// + /// + /// Test serialization of object with outer number type + /// + /// Thrown when fails to make API call + /// Input composite as post body (optional) + /// OuterComposite + OuterComposite FakeOuterCompositeSerialize(OuterComposite outerComposite = default(OuterComposite)); + + /// + /// + /// + /// + /// Test serialization of object with outer number type + /// + /// Thrown when fails to make API call + /// Input composite as post body (optional) + /// ApiResponse of OuterComposite + ApiResponse FakeOuterCompositeSerializeWithHttpInfo(OuterComposite outerComposite = default(OuterComposite)); + /// + /// + /// + /// + /// Test serialization of outer number types + /// + /// Thrown when fails to make API call + /// Input number as post body (optional) + /// decimal + decimal FakeOuterNumberSerialize(decimal? body = default(decimal?)); + + /// + /// + /// + /// + /// Test serialization of outer number types + /// + /// Thrown when fails to make API call + /// Input number as post body (optional) + /// ApiResponse of decimal + ApiResponse FakeOuterNumberSerializeWithHttpInfo(decimal? body = default(decimal?)); + /// + /// + /// + /// + /// Test serialization of outer string types + /// + /// Thrown when fails to make API call + /// Required UUID String + /// Input string as post body (optional) + /// string + string FakeOuterStringSerialize(Guid requiredStringUuid, string body = default(string)); + + /// + /// + /// + /// + /// Test serialization of outer string types + /// + /// Thrown when fails to make API call + /// Required UUID String + /// Input string as post body (optional) + /// ApiResponse of string + ApiResponse FakeOuterStringSerializeWithHttpInfo(Guid requiredStringUuid, string body = default(string)); + /// + /// Array of Enums + /// + /// Thrown when fails to make API call + /// List<OuterEnum> + List GetArrayOfEnums(); + + /// + /// Array of Enums + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ApiResponse of List<OuterEnum> + ApiResponse> GetArrayOfEnumsWithHttpInfo(); + /// + /// + /// + /// + /// For this test, the body for this request much reference a schema named `File`. + /// + /// Thrown when fails to make API call + /// + /// + void TestBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass); + + /// + /// + /// + /// + /// For this test, the body for this request much reference a schema named `File`. + /// + /// Thrown when fails to make API call + /// + /// ApiResponse of Object(void) + ApiResponse TestBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass fileSchemaTestClass); + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + /// + void TestBodyWithQueryParams(string query, User user); + + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + /// ApiResponse of Object(void) + ApiResponse TestBodyWithQueryParamsWithHttpInfo(string query, User user); + /// + /// To test \"client\" model + /// + /// + /// To test \"client\" model + /// + /// Thrown when fails to make API call + /// client model + /// ModelClient + ModelClient TestClientModel(ModelClient modelClient); + + /// + /// To test \"client\" model + /// + /// + /// To test \"client\" model + /// + /// Thrown when fails to make API call + /// client model + /// ApiResponse of ModelClient + ApiResponse TestClientModelWithHttpInfo(ModelClient modelClient); + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// Thrown when fails to make API call + /// None + /// None + /// None + /// None + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional, default to "2010-02-01T10:20:10.111110+01:00") + /// None (optional) + /// None (optional) + /// + void TestEndpointParameters(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? _float = default(float?), string _string = default(string), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string password = default(string), string callback = default(string)); + + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// Thrown when fails to make API call + /// None + /// None + /// None + /// None + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional, default to "2010-02-01T10:20:10.111110+01:00") + /// None (optional) + /// None (optional) + /// ApiResponse of Object(void) + ApiResponse TestEndpointParametersWithHttpInfo(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? _float = default(float?), string _string = default(string), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string password = default(string), string callback = default(string)); + /// + /// To test enum parameters + /// + /// + /// To test enum parameters + /// + /// Thrown when fails to make API call + /// Header parameter enum test (string array) (optional) + /// Header parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (string array) (optional) + /// Query parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (double) (optional) + /// Query parameter enum test (double) (optional) + /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string) (optional, default to -efg) + /// + void TestEnumParameters(List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); + + /// + /// To test enum parameters + /// + /// + /// To test enum parameters + /// + /// Thrown when fails to make API call + /// Header parameter enum test (string array) (optional) + /// Header parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (string array) (optional) + /// Query parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (double) (optional) + /// Query parameter enum test (double) (optional) + /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string) (optional, default to -efg) + /// ApiResponse of Object(void) + ApiResponse TestEnumParametersWithHttpInfo(List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); + /// + /// Fake endpoint to test group parameters (optional) + /// + /// + /// Fake endpoint to test group parameters (optional) + /// + /// Thrown when fails to make API call + /// Required String in group parameters + /// Required Boolean in group parameters + /// Required Integer in group parameters + /// String in group parameters (optional) + /// Boolean in group parameters (optional) + /// Integer in group parameters (optional) + /// + void TestGroupParameters(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = default(int?), bool? booleanGroup = default(bool?), long? int64Group = default(long?)); + + /// + /// Fake endpoint to test group parameters (optional) + /// + /// + /// Fake endpoint to test group parameters (optional) + /// + /// Thrown when fails to make API call + /// Required String in group parameters + /// Required Boolean in group parameters + /// Required Integer in group parameters + /// String in group parameters (optional) + /// Boolean in group parameters (optional) + /// Integer in group parameters (optional) + /// ApiResponse of Object(void) + ApiResponse TestGroupParametersWithHttpInfo(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = default(int?), bool? booleanGroup = default(bool?), long? int64Group = default(long?)); + /// + /// test inline additionalProperties + /// + /// Thrown when fails to make API call + /// request body + /// + void TestInlineAdditionalProperties(Dictionary requestBody); + + /// + /// test inline additionalProperties + /// + /// + /// + /// + /// Thrown when fails to make API call + /// request body + /// ApiResponse of Object(void) + ApiResponse TestInlineAdditionalPropertiesWithHttpInfo(Dictionary requestBody); + /// + /// test json serialization of form data + /// + /// Thrown when fails to make API call + /// field1 + /// field2 + /// + void TestJsonFormData(string param, string param2); + + /// + /// test json serialization of form data + /// + /// + /// + /// + /// Thrown when fails to make API call + /// field1 + /// field2 + /// ApiResponse of Object(void) + ApiResponse TestJsonFormDataWithHttpInfo(string param, string param2); + /// + /// + /// + /// + /// To test the collection format in query parameters + /// + /// Thrown when fails to make API call + /// + /// + /// + /// + /// + /// + void TestQueryParameterCollectionFormat(List pipe, List ioutil, List http, List url, List context); + + /// + /// + /// + /// + /// To test the collection format in query parameters + /// + /// Thrown when fails to make API call + /// + /// + /// + /// + /// + /// ApiResponse of Object(void) + ApiResponse TestQueryParameterCollectionFormatWithHttpInfo(List pipe, List ioutil, List http, List url, List context); + #endregion Synchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IFakeApiAsync : IApiAccessor + { + #region Asynchronous Operations + /// + /// Health check endpoint + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of HealthCheckResult + System.Threading.Tasks.Task FakeHealthGetAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Health check endpoint + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (HealthCheckResult) + System.Threading.Tasks.Task> FakeHealthGetWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// + /// + /// + /// Test serialization of outer boolean types + /// + /// Thrown when fails to make API call + /// Input boolean as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of bool + System.Threading.Tasks.Task FakeOuterBooleanSerializeAsync(bool? body = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// Test serialization of outer boolean types + /// + /// Thrown when fails to make API call + /// Input boolean as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (bool) + System.Threading.Tasks.Task> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// + /// + /// + /// Test serialization of object with outer number type + /// + /// Thrown when fails to make API call + /// Input composite as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of OuterComposite + System.Threading.Tasks.Task FakeOuterCompositeSerializeAsync(OuterComposite outerComposite = default(OuterComposite), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// Test serialization of object with outer number type + /// + /// Thrown when fails to make API call + /// Input composite as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (OuterComposite) + System.Threading.Tasks.Task> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite outerComposite = default(OuterComposite), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// + /// + /// + /// Test serialization of outer number types + /// + /// Thrown when fails to make API call + /// Input number as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of decimal + System.Threading.Tasks.Task FakeOuterNumberSerializeAsync(decimal? body = default(decimal?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// Test serialization of outer number types + /// + /// Thrown when fails to make API call + /// Input number as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (decimal) + System.Threading.Tasks.Task> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = default(decimal?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// + /// + /// + /// Test serialization of outer string types + /// + /// Thrown when fails to make API call + /// Required UUID String + /// Input string as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of string + System.Threading.Tasks.Task FakeOuterStringSerializeAsync(Guid requiredStringUuid, string body = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// Test serialization of outer string types + /// + /// Thrown when fails to make API call + /// Required UUID String + /// Input string as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (string) + System.Threading.Tasks.Task> FakeOuterStringSerializeWithHttpInfoAsync(Guid requiredStringUuid, string body = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Array of Enums + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of List<OuterEnum> + System.Threading.Tasks.Task> GetArrayOfEnumsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Array of Enums + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<OuterEnum>) + System.Threading.Tasks.Task>> GetArrayOfEnumsWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// + /// + /// + /// For this test, the body for this request much reference a schema named `File`. + /// + /// Thrown when fails to make API call + /// + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// For this test, the body for this request much reference a schema named `File`. + /// + /// Thrown when fails to make API call + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> TestBodyWithQueryParamsWithHttpInfoAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// To test \"client\" model + /// + /// + /// To test \"client\" model + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ModelClient + System.Threading.Tasks.Task TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// To test \"client\" model + /// + /// + /// To test \"client\" model + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ModelClient) + System.Threading.Tasks.Task> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// Thrown when fails to make API call + /// None + /// None + /// None + /// None + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional, default to "2010-02-01T10:20:10.111110+01:00") + /// None (optional) + /// None (optional) + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? _float = default(float?), string _string = default(string), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string password = default(string), string callback = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// Thrown when fails to make API call + /// None + /// None + /// None + /// None + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional, default to "2010-02-01T10:20:10.111110+01:00") + /// None (optional) + /// None (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> TestEndpointParametersWithHttpInfoAsync(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? _float = default(float?), string _string = default(string), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string password = default(string), string callback = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// To test enum parameters + /// + /// + /// To test enum parameters + /// + /// Thrown when fails to make API call + /// Header parameter enum test (string array) (optional) + /// Header parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (string array) (optional) + /// Query parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (double) (optional) + /// Query parameter enum test (double) (optional) + /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string) (optional, default to -efg) + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task TestEnumParametersAsync(List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// To test enum parameters + /// + /// + /// To test enum parameters + /// + /// Thrown when fails to make API call + /// Header parameter enum test (string array) (optional) + /// Header parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (string array) (optional) + /// Query parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (double) (optional) + /// Query parameter enum test (double) (optional) + /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string) (optional, default to -efg) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> TestEnumParametersWithHttpInfoAsync(List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Fake endpoint to test group parameters (optional) + /// + /// + /// Fake endpoint to test group parameters (optional) + /// + /// Thrown when fails to make API call + /// Required String in group parameters + /// Required Boolean in group parameters + /// Required Integer in group parameters + /// String in group parameters (optional) + /// Boolean in group parameters (optional) + /// Integer in group parameters (optional) + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = default(int?), bool? booleanGroup = default(bool?), long? int64Group = default(long?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Fake endpoint to test group parameters (optional) + /// + /// + /// Fake endpoint to test group parameters (optional) + /// + /// Thrown when fails to make API call + /// Required String in group parameters + /// Required Boolean in group parameters + /// Required Integer in group parameters + /// String in group parameters (optional) + /// Boolean in group parameters (optional) + /// Integer in group parameters (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = default(int?), bool? booleanGroup = default(bool?), long? int64Group = default(long?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// test inline additionalProperties + /// + /// + /// + /// + /// Thrown when fails to make API call + /// request body + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task TestInlineAdditionalPropertiesAsync(Dictionary requestBody, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// test inline additionalProperties + /// + /// + /// + /// + /// Thrown when fails to make API call + /// request body + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary requestBody, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// test json serialization of form data + /// + /// + /// + /// + /// Thrown when fails to make API call + /// field1 + /// field2 + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// test json serialization of form data + /// + /// + /// + /// + /// Thrown when fails to make API call + /// field1 + /// field2 + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// + /// + /// + /// To test the collection format in query parameters + /// + /// Thrown when fails to make API call + /// + /// + /// + /// + /// + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task TestQueryParameterCollectionFormatAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// + /// + /// + /// To test the collection format in query parameters + /// + /// Thrown when fails to make API call + /// + /// + /// + /// + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> TestQueryParameterCollectionFormatWithHttpInfoAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + #endregion Asynchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IFakeApi : IFakeApiSync, IFakeApiAsync + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public partial class FakeApi : IDisposable, IFakeApi + { + private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// + public FakeApi() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// The target service's base path in URL format. + /// + /// + public FakeApi(string basePath) + { + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + new Org.OpenAPITools.Client.Configuration { BasePath = basePath } + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class using Configuration object. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// An instance of Configuration. + /// + /// + public FakeApi(Org.OpenAPITools.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + configuration + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access. + /// The client interface for asynchronous API access. + /// The configuration object. + /// + public FakeApi(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + this.AsynchronousClient = asyncClient; + this.Configuration = configuration; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + this.ApiClient?.Dispose(); + } + + /// + /// Holds the ApiClient if created + /// + public Org.OpenAPITools.Client.ApiClient ApiClient { get; set; } = null; + + /// + /// The client for accessing this underlying API asynchronously. + /// + public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; } + + /// + /// The client for accessing this underlying API synchronously. + /// + public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + /// + /// Health check endpoint + /// + /// Thrown when fails to make API call + /// HealthCheckResult + public HealthCheckResult FakeHealthGet() + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = FakeHealthGetWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Health check endpoint + /// + /// Thrown when fails to make API call + /// ApiResponse of HealthCheckResult + public Org.OpenAPITools.Client.ApiResponse FakeHealthGetWithHttpInfo() + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + var localVarResponse = this.Client.Get("/fake/health", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeHealthGet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Health check endpoint + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of HealthCheckResult + public async System.Threading.Tasks.Task FakeHealthGetAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = FakeHealthGetWithHttpInfoAsync(cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Health check endpoint + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (HealthCheckResult) + public async System.Threading.Tasks.Task> FakeHealthGetWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/fake/health", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeHealthGet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Test serialization of outer boolean types + /// + /// Thrown when fails to make API call + /// Input boolean as post body (optional) + /// bool + public bool FakeOuterBooleanSerialize(bool? body = default(bool?)) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = FakeOuterBooleanSerializeWithHttpInfo(body); + return localVarResponse.Data; + } + + /// + /// Test serialization of outer boolean types + /// + /// Thrown when fails to make API call + /// Input boolean as post body (optional) + /// ApiResponse of bool + public Org.OpenAPITools.Client.ApiResponse FakeOuterBooleanSerializeWithHttpInfo(bool? body = default(bool?)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "*/*" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = body; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/fake/outer/boolean", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeOuterBooleanSerialize", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Test serialization of outer boolean types + /// + /// Thrown when fails to make API call + /// Input boolean as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of bool + public async System.Threading.Tasks.Task FakeOuterBooleanSerializeAsync(bool? body = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Test serialization of outer boolean types + /// + /// Thrown when fails to make API call + /// Input boolean as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (bool) + public async System.Threading.Tasks.Task> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "*/*" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = body; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/fake/outer/boolean", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeOuterBooleanSerialize", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Test serialization of object with outer number type + /// + /// Thrown when fails to make API call + /// Input composite as post body (optional) + /// OuterComposite + public OuterComposite FakeOuterCompositeSerialize(OuterComposite outerComposite = default(OuterComposite)) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = FakeOuterCompositeSerializeWithHttpInfo(outerComposite); + return localVarResponse.Data; + } + + /// + /// Test serialization of object with outer number type + /// + /// Thrown when fails to make API call + /// Input composite as post body (optional) + /// ApiResponse of OuterComposite + public Org.OpenAPITools.Client.ApiResponse FakeOuterCompositeSerializeWithHttpInfo(OuterComposite outerComposite = default(OuterComposite)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "*/*" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = outerComposite; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/fake/outer/composite", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeOuterCompositeSerialize", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Test serialization of object with outer number type + /// + /// Thrown when fails to make API call + /// Input composite as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of OuterComposite + public async System.Threading.Tasks.Task FakeOuterCompositeSerializeAsync(OuterComposite outerComposite = default(OuterComposite), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Test serialization of object with outer number type + /// + /// Thrown when fails to make API call + /// Input composite as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (OuterComposite) + public async System.Threading.Tasks.Task> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite outerComposite = default(OuterComposite), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "*/*" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = outerComposite; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/fake/outer/composite", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeOuterCompositeSerialize", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Test serialization of outer number types + /// + /// Thrown when fails to make API call + /// Input number as post body (optional) + /// decimal + public decimal FakeOuterNumberSerialize(decimal? body = default(decimal?)) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = FakeOuterNumberSerializeWithHttpInfo(body); + return localVarResponse.Data; + } + + /// + /// Test serialization of outer number types + /// + /// Thrown when fails to make API call + /// Input number as post body (optional) + /// ApiResponse of decimal + public Org.OpenAPITools.Client.ApiResponse FakeOuterNumberSerializeWithHttpInfo(decimal? body = default(decimal?)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "*/*" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = body; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/fake/outer/number", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeOuterNumberSerialize", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Test serialization of outer number types + /// + /// Thrown when fails to make API call + /// Input number as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of decimal + public async System.Threading.Tasks.Task FakeOuterNumberSerializeAsync(decimal? body = default(decimal?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Test serialization of outer number types + /// + /// Thrown when fails to make API call + /// Input number as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (decimal) + public async System.Threading.Tasks.Task> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = default(decimal?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "*/*" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = body; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/fake/outer/number", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeOuterNumberSerialize", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Test serialization of outer string types + /// + /// Thrown when fails to make API call + /// Required UUID String + /// Input string as post body (optional) + /// string + public string FakeOuterStringSerialize(Guid requiredStringUuid, string body = default(string)) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = FakeOuterStringSerializeWithHttpInfo(requiredStringUuid, body); + return localVarResponse.Data; + } + + /// + /// Test serialization of outer string types + /// + /// Thrown when fails to make API call + /// Required UUID String + /// Input string as post body (optional) + /// ApiResponse of string + public Org.OpenAPITools.Client.ApiResponse FakeOuterStringSerializeWithHttpInfo(Guid requiredStringUuid, string body = default(string)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "*/*" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "required_string_uuid", requiredStringUuid)); + localVarRequestOptions.Data = body; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/fake/outer/string", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeOuterStringSerialize", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Test serialization of outer string types + /// + /// Thrown when fails to make API call + /// Required UUID String + /// Input string as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of string + public async System.Threading.Tasks.Task FakeOuterStringSerializeAsync(Guid requiredStringUuid, string body = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Test serialization of outer string types + /// + /// Thrown when fails to make API call + /// Required UUID String + /// Input string as post body (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (string) + public async System.Threading.Tasks.Task> FakeOuterStringSerializeWithHttpInfoAsync(Guid requiredStringUuid, string body = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "*/*" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "required_string_uuid", requiredStringUuid)); + localVarRequestOptions.Data = body; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/fake/outer/string", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FakeOuterStringSerialize", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Array of Enums + /// + /// Thrown when fails to make API call + /// List<OuterEnum> + public List GetArrayOfEnums() + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = GetArrayOfEnumsWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Array of Enums + /// + /// Thrown when fails to make API call + /// ApiResponse of List<OuterEnum> + public Org.OpenAPITools.Client.ApiResponse> GetArrayOfEnumsWithHttpInfo() + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/fake/array-of-enums", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetArrayOfEnums", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Array of Enums + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of List<OuterEnum> + public async System.Threading.Tasks.Task> GetArrayOfEnumsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = GetArrayOfEnumsWithHttpInfoAsync(cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Array of Enums + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<OuterEnum>) + public async System.Threading.Tasks.Task>> GetArrayOfEnumsWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync>("/fake/array-of-enums", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetArrayOfEnums", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// For this test, the body for this request much reference a schema named `File`. + /// + /// Thrown when fails to make API call + /// + /// + public void TestBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass) + { + TestBodyWithFileSchemaWithHttpInfo(fileSchemaTestClass); + } + + /// + /// For this test, the body for this request much reference a schema named `File`. + /// + /// Thrown when fails to make API call + /// + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse TestBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass fileSchemaTestClass) + { + // verify the required parameter 'fileSchemaTestClass' is set + if (fileSchemaTestClass == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'fileSchemaTestClass' when calling FakeApi->TestBodyWithFileSchema"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = fileSchemaTestClass; + + + // make the HTTP request + var localVarResponse = this.Client.Put("/fake/body-with-file-schema", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestBodyWithFileSchema", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// For this test, the body for this request much reference a schema named `File`. + /// + /// Thrown when fails to make API call + /// + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// For this test, the body for this request much reference a schema named `File`. + /// + /// Thrown when fails to make API call + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'fileSchemaTestClass' is set + if (fileSchemaTestClass == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'fileSchemaTestClass' when calling FakeApi->TestBodyWithFileSchema"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = fileSchemaTestClass; + + + // make the HTTP request + + var task = this.AsynchronousClient.PutAsync("/fake/body-with-file-schema", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestBodyWithFileSchema", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + /// + public void TestBodyWithQueryParams(string query, User user) + { + TestBodyWithQueryParamsWithHttpInfo(query, user); + } + + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse TestBodyWithQueryParamsWithHttpInfo(string query, User user) + { + // verify the required parameter 'query' is set + if (query == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'query' when calling FakeApi->TestBodyWithQueryParams"); + + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling FakeApi->TestBodyWithQueryParams"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "query", query)); + localVarRequestOptions.Data = user; + + + // make the HTTP request + var localVarResponse = this.Client.Put("/fake/body-with-query-params", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestBodyWithQueryParams", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task TestBodyWithQueryParamsAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// + /// + /// Thrown when fails to make API call + /// + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> TestBodyWithQueryParamsWithHttpInfoAsync(string query, User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'query' is set + if (query == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'query' when calling FakeApi->TestBodyWithQueryParams"); + + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling FakeApi->TestBodyWithQueryParams"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "query", query)); + localVarRequestOptions.Data = user; + + + // make the HTTP request + + var task = this.AsynchronousClient.PutAsync("/fake/body-with-query-params", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestBodyWithQueryParams", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// To test \"client\" model To test \"client\" model + /// + /// Thrown when fails to make API call + /// client model + /// ModelClient + public ModelClient TestClientModel(ModelClient modelClient) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = TestClientModelWithHttpInfo(modelClient); + return localVarResponse.Data; + } + + /// + /// To test \"client\" model To test \"client\" model + /// + /// Thrown when fails to make API call + /// client model + /// ApiResponse of ModelClient + public Org.OpenAPITools.Client.ApiResponse TestClientModelWithHttpInfo(ModelClient modelClient) + { + // verify the required parameter 'modelClient' is set + if (modelClient == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'modelClient' when calling FakeApi->TestClientModel"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = modelClient; + + + // make the HTTP request + var localVarResponse = this.Client.Patch("/fake", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestClientModel", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// To test \"client\" model To test \"client\" model + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ModelClient + public async System.Threading.Tasks.Task TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestClientModelWithHttpInfoAsync(modelClient, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// To test \"client\" model To test \"client\" model + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ModelClient) + public async System.Threading.Tasks.Task> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'modelClient' is set + if (modelClient == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'modelClient' when calling FakeApi->TestClientModel"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = modelClient; + + + // make the HTTP request + + var task = this.AsynchronousClient.PatchAsync("/fake", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestClientModel", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// Thrown when fails to make API call + /// None + /// None + /// None + /// None + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional, default to "2010-02-01T10:20:10.111110+01:00") + /// None (optional) + /// None (optional) + /// + public void TestEndpointParameters(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? _float = default(float?), string _string = default(string), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string password = default(string), string callback = default(string)) + { + TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback); + } + + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// Thrown when fails to make API call + /// None + /// None + /// None + /// None + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional, default to "2010-02-01T10:20:10.111110+01:00") + /// None (optional) + /// None (optional) + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse TestEndpointParametersWithHttpInfo(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? _float = default(float?), string _string = default(string), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string password = default(string), string callback = default(string)) + { + // verify the required parameter 'patternWithoutDelimiter' is set + if (patternWithoutDelimiter == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'patternWithoutDelimiter' when calling FakeApi->TestEndpointParameters"); + + // verify the required parameter '_byte' is set + if (_byte == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter '_byte' when calling FakeApi->TestEndpointParameters"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + if (integer != null) + { + localVarRequestOptions.FormParameters.Add("integer", Org.OpenAPITools.Client.ClientUtils.ParameterToString(integer)); // form parameter + } + if (int32 != null) + { + localVarRequestOptions.FormParameters.Add("int32", Org.OpenAPITools.Client.ClientUtils.ParameterToString(int32)); // form parameter + } + if (int64 != null) + { + localVarRequestOptions.FormParameters.Add("int64", Org.OpenAPITools.Client.ClientUtils.ParameterToString(int64)); // form parameter + } + localVarRequestOptions.FormParameters.Add("number", Org.OpenAPITools.Client.ClientUtils.ParameterToString(number)); // form parameter + if (_float != null) + { + localVarRequestOptions.FormParameters.Add("float", Org.OpenAPITools.Client.ClientUtils.ParameterToString(_float)); // form parameter + } + localVarRequestOptions.FormParameters.Add("double", Org.OpenAPITools.Client.ClientUtils.ParameterToString(_double)); // form parameter + if (_string != null) + { + localVarRequestOptions.FormParameters.Add("string", Org.OpenAPITools.Client.ClientUtils.ParameterToString(_string)); // form parameter + } + localVarRequestOptions.FormParameters.Add("pattern_without_delimiter", Org.OpenAPITools.Client.ClientUtils.ParameterToString(patternWithoutDelimiter)); // form parameter + localVarRequestOptions.FormParameters.Add("byte", Org.OpenAPITools.Client.ClientUtils.ParameterToString(_byte)); // form parameter + if (binary != null) + { + } + if (date != null) + { + localVarRequestOptions.FormParameters.Add("date", Org.OpenAPITools.Client.ClientUtils.ParameterToString(date)); // form parameter + } + if (dateTime != null) + { + localVarRequestOptions.FormParameters.Add("dateTime", Org.OpenAPITools.Client.ClientUtils.ParameterToString(dateTime)); // form parameter + } + if (password != null) + { + localVarRequestOptions.FormParameters.Add("password", Org.OpenAPITools.Client.ClientUtils.ParameterToString(password)); // form parameter + } + if (callback != null) + { + localVarRequestOptions.FormParameters.Add("callback", Org.OpenAPITools.Client.ClientUtils.ParameterToString(callback)); // form parameter + } + + // authentication (http_basic_test) required + // http basic authentication required + if (!string.IsNullOrEmpty(this.Configuration.Username) || !string.IsNullOrEmpty(this.Configuration.Password) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Basic " + Org.OpenAPITools.Client.ClientUtils.Base64Encode(this.Configuration.Username + ":" + this.Configuration.Password)); + } + + // make the HTTP request + var localVarResponse = this.Client.Post("/fake", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestEndpointParameters", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// Thrown when fails to make API call + /// None + /// None + /// None + /// None + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional, default to "2010-02-01T10:20:10.111110+01:00") + /// None (optional) + /// None (optional) + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? _float = default(float?), string _string = default(string), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string password = default(string), string callback = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + /// + /// Thrown when fails to make API call + /// None + /// None + /// None + /// None + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional) + /// None (optional, default to "2010-02-01T10:20:10.111110+01:00") + /// None (optional) + /// None (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> TestEndpointParametersWithHttpInfoAsync(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? _float = default(float?), string _string = default(string), System.IO.Stream binary = default(System.IO.Stream), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string password = default(string), string callback = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'patternWithoutDelimiter' is set + if (patternWithoutDelimiter == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'patternWithoutDelimiter' when calling FakeApi->TestEndpointParameters"); + + // verify the required parameter '_byte' is set + if (_byte == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter '_byte' when calling FakeApi->TestEndpointParameters"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + if (integer != null) + { + localVarRequestOptions.FormParameters.Add("integer", Org.OpenAPITools.Client.ClientUtils.ParameterToString(integer)); // form parameter + } + if (int32 != null) + { + localVarRequestOptions.FormParameters.Add("int32", Org.OpenAPITools.Client.ClientUtils.ParameterToString(int32)); // form parameter + } + if (int64 != null) + { + localVarRequestOptions.FormParameters.Add("int64", Org.OpenAPITools.Client.ClientUtils.ParameterToString(int64)); // form parameter + } + localVarRequestOptions.FormParameters.Add("number", Org.OpenAPITools.Client.ClientUtils.ParameterToString(number)); // form parameter + if (_float != null) + { + localVarRequestOptions.FormParameters.Add("float", Org.OpenAPITools.Client.ClientUtils.ParameterToString(_float)); // form parameter + } + localVarRequestOptions.FormParameters.Add("double", Org.OpenAPITools.Client.ClientUtils.ParameterToString(_double)); // form parameter + if (_string != null) + { + localVarRequestOptions.FormParameters.Add("string", Org.OpenAPITools.Client.ClientUtils.ParameterToString(_string)); // form parameter + } + localVarRequestOptions.FormParameters.Add("pattern_without_delimiter", Org.OpenAPITools.Client.ClientUtils.ParameterToString(patternWithoutDelimiter)); // form parameter + localVarRequestOptions.FormParameters.Add("byte", Org.OpenAPITools.Client.ClientUtils.ParameterToString(_byte)); // form parameter + if (binary != null) + { + } + if (date != null) + { + localVarRequestOptions.FormParameters.Add("date", Org.OpenAPITools.Client.ClientUtils.ParameterToString(date)); // form parameter + } + if (dateTime != null) + { + localVarRequestOptions.FormParameters.Add("dateTime", Org.OpenAPITools.Client.ClientUtils.ParameterToString(dateTime)); // form parameter + } + if (password != null) + { + localVarRequestOptions.FormParameters.Add("password", Org.OpenAPITools.Client.ClientUtils.ParameterToString(password)); // form parameter + } + if (callback != null) + { + localVarRequestOptions.FormParameters.Add("callback", Org.OpenAPITools.Client.ClientUtils.ParameterToString(callback)); // form parameter + } + + // authentication (http_basic_test) required + // http basic authentication required + if (!string.IsNullOrEmpty(this.Configuration.Username) || !string.IsNullOrEmpty(this.Configuration.Password) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Basic " + Org.OpenAPITools.Client.ClientUtils.Base64Encode(this.Configuration.Username + ":" + this.Configuration.Password)); + } + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/fake", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestEndpointParameters", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// To test enum parameters To test enum parameters + /// + /// Thrown when fails to make API call + /// Header parameter enum test (string array) (optional) + /// Header parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (string array) (optional) + /// Query parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (double) (optional) + /// Query parameter enum test (double) (optional) + /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string) (optional, default to -efg) + /// + public void TestEnumParameters(List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) + { + TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + } + + /// + /// To test enum parameters To test enum parameters + /// + /// Thrown when fails to make API call + /// Header parameter enum test (string array) (optional) + /// Header parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (string array) (optional) + /// Query parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (double) (optional) + /// Query parameter enum test (double) (optional) + /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string) (optional, default to -efg) + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse TestEnumParametersWithHttpInfo(List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + if (enumQueryStringArray != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "enum_query_string_array", enumQueryStringArray)); + } + if (enumQueryString != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "enum_query_string", enumQueryString)); + } + if (enumQueryInteger != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "enum_query_integer", enumQueryInteger)); + } + if (enumQueryDouble != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "enum_query_double", enumQueryDouble)); + } + if (enumHeaderStringArray != null) + { + localVarRequestOptions.HeaderParameters.Add("enum_header_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumHeaderStringArray)); // header parameter + } + if (enumHeaderString != null) + { + localVarRequestOptions.HeaderParameters.Add("enum_header_string", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumHeaderString)); // header parameter + } + if (enumFormStringArray != null) + { + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + } + if (enumFormString != null) + { + localVarRequestOptions.FormParameters.Add("enum_form_string", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormString)); // form parameter + } + + + // make the HTTP request + var localVarResponse = this.Client.Get("/fake", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestEnumParameters", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// To test enum parameters To test enum parameters + /// + /// Thrown when fails to make API call + /// Header parameter enum test (string array) (optional) + /// Header parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (string array) (optional) + /// Query parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (double) (optional) + /// Query parameter enum test (double) (optional) + /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string) (optional, default to -efg) + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task TestEnumParametersAsync(List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// To test enum parameters To test enum parameters + /// + /// Thrown when fails to make API call + /// Header parameter enum test (string array) (optional) + /// Header parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (string array) (optional) + /// Query parameter enum test (string) (optional, default to -efg) + /// Query parameter enum test (double) (optional) + /// Query parameter enum test (double) (optional) + /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string) (optional, default to -efg) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> TestEnumParametersWithHttpInfoAsync(List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + if (enumQueryStringArray != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "enum_query_string_array", enumQueryStringArray)); + } + if (enumQueryString != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "enum_query_string", enumQueryString)); + } + if (enumQueryInteger != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "enum_query_integer", enumQueryInteger)); + } + if (enumQueryDouble != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "enum_query_double", enumQueryDouble)); + } + if (enumHeaderStringArray != null) + { + localVarRequestOptions.HeaderParameters.Add("enum_header_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumHeaderStringArray)); // header parameter + } + if (enumHeaderString != null) + { + localVarRequestOptions.HeaderParameters.Add("enum_header_string", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumHeaderString)); // header parameter + } + if (enumFormStringArray != null) + { + localVarRequestOptions.FormParameters.Add("enum_form_string_array", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormStringArray)); // form parameter + } + if (enumFormString != null) + { + localVarRequestOptions.FormParameters.Add("enum_form_string", Org.OpenAPITools.Client.ClientUtils.ParameterToString(enumFormString)); // form parameter + } + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/fake", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestEnumParameters", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional) + /// + /// Thrown when fails to make API call + /// Required String in group parameters + /// Required Boolean in group parameters + /// Required Integer in group parameters + /// String in group parameters (optional) + /// Boolean in group parameters (optional) + /// Integer in group parameters (optional) + /// + public void TestGroupParameters(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = default(int?), bool? booleanGroup = default(bool?), long? int64Group = default(long?)) + { + TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + } + + /// + /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional) + /// + /// Thrown when fails to make API call + /// Required String in group parameters + /// Required Boolean in group parameters + /// Required Integer in group parameters + /// String in group parameters (optional) + /// Boolean in group parameters (optional) + /// Integer in group parameters (optional) + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse TestGroupParametersWithHttpInfo(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = default(int?), bool? booleanGroup = default(bool?), long? int64Group = default(long?)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "required_string_group", requiredStringGroup)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "required_int64_group", requiredInt64Group)); + if (stringGroup != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "string_group", stringGroup)); + } + if (int64Group != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "int64_group", int64Group)); + } + localVarRequestOptions.HeaderParameters.Add("required_boolean_group", Org.OpenAPITools.Client.ClientUtils.ParameterToString(requiredBooleanGroup)); // header parameter + if (booleanGroup != null) + { + localVarRequestOptions.HeaderParameters.Add("boolean_group", Org.OpenAPITools.Client.ClientUtils.ParameterToString(booleanGroup)); // header parameter + } + + // authentication (bearer_test) required + // bearer authentication required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + var localVarResponse = this.Client.Delete("/fake", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestGroupParameters", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional) + /// + /// Thrown when fails to make API call + /// Required String in group parameters + /// Required Boolean in group parameters + /// Required Integer in group parameters + /// String in group parameters (optional) + /// Boolean in group parameters (optional) + /// Integer in group parameters (optional) + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task TestGroupParametersAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = default(int?), bool? booleanGroup = default(bool?), long? int64Group = default(long?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Fake endpoint to test group parameters (optional) Fake endpoint to test group parameters (optional) + /// + /// Thrown when fails to make API call + /// Required String in group parameters + /// Required Boolean in group parameters + /// Required Integer in group parameters + /// String in group parameters (optional) + /// Boolean in group parameters (optional) + /// Integer in group parameters (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = default(int?), bool? booleanGroup = default(bool?), long? int64Group = default(long?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "required_string_group", requiredStringGroup)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "required_int64_group", requiredInt64Group)); + if (stringGroup != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "string_group", stringGroup)); + } + if (int64Group != null) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "int64_group", int64Group)); + } + localVarRequestOptions.HeaderParameters.Add("required_boolean_group", Org.OpenAPITools.Client.ClientUtils.ParameterToString(requiredBooleanGroup)); // header parameter + if (booleanGroup != null) + { + localVarRequestOptions.HeaderParameters.Add("boolean_group", Org.OpenAPITools.Client.ClientUtils.ParameterToString(booleanGroup)); // header parameter + } + + // authentication (bearer_test) required + // bearer authentication required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + + var task = this.AsynchronousClient.DeleteAsync("/fake", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestGroupParameters", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// test inline additionalProperties + /// + /// Thrown when fails to make API call + /// request body + /// + public void TestInlineAdditionalProperties(Dictionary requestBody) + { + TestInlineAdditionalPropertiesWithHttpInfo(requestBody); + } + + /// + /// test inline additionalProperties + /// + /// Thrown when fails to make API call + /// request body + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse TestInlineAdditionalPropertiesWithHttpInfo(Dictionary requestBody) + { + // verify the required parameter 'requestBody' is set + if (requestBody == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'requestBody' when calling FakeApi->TestInlineAdditionalProperties"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = requestBody; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/fake/inline-additionalProperties", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestInlineAdditionalProperties", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// test inline additionalProperties + /// + /// Thrown when fails to make API call + /// request body + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task TestInlineAdditionalPropertiesAsync(Dictionary requestBody, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// test inline additionalProperties + /// + /// Thrown when fails to make API call + /// request body + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary requestBody, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'requestBody' is set + if (requestBody == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'requestBody' when calling FakeApi->TestInlineAdditionalProperties"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = requestBody; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/fake/inline-additionalProperties", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestInlineAdditionalProperties", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// test json serialization of form data + /// + /// Thrown when fails to make API call + /// field1 + /// field2 + /// + public void TestJsonFormData(string param, string param2) + { + TestJsonFormDataWithHttpInfo(param, param2); + } + + /// + /// test json serialization of form data + /// + /// Thrown when fails to make API call + /// field1 + /// field2 + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse TestJsonFormDataWithHttpInfo(string param, string param2) + { + // verify the required parameter 'param' is set + if (param == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'param' when calling FakeApi->TestJsonFormData"); + + // verify the required parameter 'param2' is set + if (param2 == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'param2' when calling FakeApi->TestJsonFormData"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.FormParameters.Add("param", Org.OpenAPITools.Client.ClientUtils.ParameterToString(param)); // form parameter + localVarRequestOptions.FormParameters.Add("param2", Org.OpenAPITools.Client.ClientUtils.ParameterToString(param2)); // form parameter + + + // make the HTTP request + var localVarResponse = this.Client.Get("/fake/jsonFormData", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestJsonFormData", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// test json serialization of form data + /// + /// Thrown when fails to make API call + /// field1 + /// field2 + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// test json serialization of form data + /// + /// Thrown when fails to make API call + /// field1 + /// field2 + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'param' is set + if (param == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'param' when calling FakeApi->TestJsonFormData"); + + // verify the required parameter 'param2' is set + if (param2 == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'param2' when calling FakeApi->TestJsonFormData"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.FormParameters.Add("param", Org.OpenAPITools.Client.ClientUtils.ParameterToString(param)); // form parameter + localVarRequestOptions.FormParameters.Add("param2", Org.OpenAPITools.Client.ClientUtils.ParameterToString(param2)); // form parameter + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/fake/jsonFormData", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestJsonFormData", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// To test the collection format in query parameters + /// + /// Thrown when fails to make API call + /// + /// + /// + /// + /// + /// + public void TestQueryParameterCollectionFormat(List pipe, List ioutil, List http, List url, List context) + { + TestQueryParameterCollectionFormatWithHttpInfo(pipe, ioutil, http, url, context); + } + + /// + /// To test the collection format in query parameters + /// + /// Thrown when fails to make API call + /// + /// + /// + /// + /// + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse TestQueryParameterCollectionFormatWithHttpInfo(List pipe, List ioutil, List http, List url, List context) + { + // verify the required parameter 'pipe' is set + if (pipe == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'pipe' when calling FakeApi->TestQueryParameterCollectionFormat"); + + // verify the required parameter 'ioutil' is set + if (ioutil == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'ioutil' when calling FakeApi->TestQueryParameterCollectionFormat"); + + // verify the required parameter 'http' is set + if (http == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'http' when calling FakeApi->TestQueryParameterCollectionFormat"); + + // verify the required parameter 'url' is set + if (url == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'url' when calling FakeApi->TestQueryParameterCollectionFormat"); + + // verify the required parameter 'context' is set + if (context == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'context' when calling FakeApi->TestQueryParameterCollectionFormat"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "pipe", pipe)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "ioutil", ioutil)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("ssv", "http", http)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "url", url)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "context", context)); + + + // make the HTTP request + var localVarResponse = this.Client.Put("/fake/test-query-parameters", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestQueryParameterCollectionFormat", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// To test the collection format in query parameters + /// + /// Thrown when fails to make API call + /// + /// + /// + /// + /// + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task TestQueryParameterCollectionFormatAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// To test the collection format in query parameters + /// + /// Thrown when fails to make API call + /// + /// + /// + /// + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> TestQueryParameterCollectionFormatWithHttpInfoAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'pipe' is set + if (pipe == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'pipe' when calling FakeApi->TestQueryParameterCollectionFormat"); + + // verify the required parameter 'ioutil' is set + if (ioutil == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'ioutil' when calling FakeApi->TestQueryParameterCollectionFormat"); + + // verify the required parameter 'http' is set + if (http == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'http' when calling FakeApi->TestQueryParameterCollectionFormat"); + + // verify the required parameter 'url' is set + if (url == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'url' when calling FakeApi->TestQueryParameterCollectionFormat"); + + // verify the required parameter 'context' is set + if (context == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'context' when calling FakeApi->TestQueryParameterCollectionFormat"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "pipe", pipe)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "ioutil", ioutil)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("ssv", "http", http)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "url", url)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "context", context)); + + + // make the HTTP request + + var task = this.AsynchronousClient.PutAsync("/fake/test-query-parameters", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestQueryParameterCollectionFormat", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs new file mode 100644 index 00000000000..b575ceab22a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -0,0 +1,365 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Api +{ + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IFakeClassnameTags123ApiSync : IApiAccessor + { + #region Synchronous Operations + /// + /// To test class name in snake case + /// + /// + /// To test class name in snake case + /// + /// Thrown when fails to make API call + /// client model + /// ModelClient + ModelClient TestClassname(ModelClient modelClient); + + /// + /// To test class name in snake case + /// + /// + /// To test class name in snake case + /// + /// Thrown when fails to make API call + /// client model + /// ApiResponse of ModelClient + ApiResponse TestClassnameWithHttpInfo(ModelClient modelClient); + #endregion Synchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IFakeClassnameTags123ApiAsync : IApiAccessor + { + #region Asynchronous Operations + /// + /// To test class name in snake case + /// + /// + /// To test class name in snake case + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ModelClient + System.Threading.Tasks.Task TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// To test class name in snake case + /// + /// + /// To test class name in snake case + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ModelClient) + System.Threading.Tasks.Task> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + #endregion Asynchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IFakeClassnameTags123Api : IFakeClassnameTags123ApiSync, IFakeClassnameTags123ApiAsync + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public partial class FakeClassnameTags123Api : IDisposable, IFakeClassnameTags123Api + { + private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// + public FakeClassnameTags123Api() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// The target service's base path in URL format. + /// + /// + public FakeClassnameTags123Api(string basePath) + { + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + new Org.OpenAPITools.Client.Configuration { BasePath = basePath } + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class using Configuration object. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// An instance of Configuration. + /// + /// + public FakeClassnameTags123Api(Org.OpenAPITools.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + configuration + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access. + /// The client interface for asynchronous API access. + /// The configuration object. + /// + public FakeClassnameTags123Api(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + this.AsynchronousClient = asyncClient; + this.Configuration = configuration; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + this.ApiClient?.Dispose(); + } + + /// + /// Holds the ApiClient if created + /// + public Org.OpenAPITools.Client.ApiClient ApiClient { get; set; } = null; + + /// + /// The client for accessing this underlying API asynchronously. + /// + public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; } + + /// + /// The client for accessing this underlying API synchronously. + /// + public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + /// + /// To test class name in snake case To test class name in snake case + /// + /// Thrown when fails to make API call + /// client model + /// ModelClient + public ModelClient TestClassname(ModelClient modelClient) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = TestClassnameWithHttpInfo(modelClient); + return localVarResponse.Data; + } + + /// + /// To test class name in snake case To test class name in snake case + /// + /// Thrown when fails to make API call + /// client model + /// ApiResponse of ModelClient + public Org.OpenAPITools.Client.ApiResponse TestClassnameWithHttpInfo(ModelClient modelClient) + { + // verify the required parameter 'modelClient' is set + if (modelClient == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'modelClient' when calling FakeClassnameTags123Api->TestClassname"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = modelClient; + + // authentication (api_key_query) required + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key_query"))) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "api_key_query", this.Configuration.GetApiKeyWithPrefix("api_key_query"))); + } + + // make the HTTP request + var localVarResponse = this.Client.Patch("/fake_classname_test", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestClassname", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// To test class name in snake case To test class name in snake case + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ModelClient + public async System.Threading.Tasks.Task TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = TestClassnameWithHttpInfoAsync(modelClient, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// To test class name in snake case To test class name in snake case + /// + /// Thrown when fails to make API call + /// client model + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ModelClient) + public async System.Threading.Tasks.Task> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'modelClient' is set + if (modelClient == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'modelClient' when calling FakeClassnameTags123Api->TestClassname"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = modelClient; + + // authentication (api_key_query) required + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key_query"))) + { + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "api_key_query", this.Configuration.GetApiKeyWithPrefix("api_key_query"))); + } + + // make the HTTP request + + var task = this.AsynchronousClient.PatchAsync("/fake_classname_test", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("TestClassname", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs new file mode 100644 index 00000000000..4e9580620b4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs @@ -0,0 +1,2013 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Api +{ + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IPetApiSync : IApiAccessor + { + #region Synchronous Operations + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// + void AddPet(Pet pet); + + /// + /// Add a new pet to the store + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// ApiResponse of Object(void) + ApiResponse AddPetWithHttpInfo(Pet pet); + /// + /// Deletes a pet + /// + /// Thrown when fails to make API call + /// Pet id to delete + /// (optional) + /// + void DeletePet(long petId, string apiKey = default(string)); + + /// + /// Deletes a pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet id to delete + /// (optional) + /// ApiResponse of Object(void) + ApiResponse DeletePetWithHttpInfo(long petId, string apiKey = default(string)); + /// + /// Finds Pets by status + /// + /// + /// Multiple status values can be provided with comma separated strings + /// + /// Thrown when fails to make API call + /// Status values that need to be considered for filter (deprecated) + /// List<Pet> + List FindPetsByStatus(List status); + + /// + /// Finds Pets by status + /// + /// + /// Multiple status values can be provided with comma separated strings + /// + /// Thrown when fails to make API call + /// Status values that need to be considered for filter (deprecated) + /// ApiResponse of List<Pet> + ApiResponse> FindPetsByStatusWithHttpInfo(List status); + /// + /// Finds Pets by tags + /// + /// + /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// + /// Thrown when fails to make API call + /// Tags to filter by + /// List<Pet> + [Obsolete] + List FindPetsByTags(List tags); + + /// + /// Finds Pets by tags + /// + /// + /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// + /// Thrown when fails to make API call + /// Tags to filter by + /// ApiResponse of List<Pet> + [Obsolete] + ApiResponse> FindPetsByTagsWithHttpInfo(List tags); + /// + /// Find pet by ID + /// + /// + /// Returns a single pet + /// + /// Thrown when fails to make API call + /// ID of pet to return + /// Pet + Pet GetPetById(long petId); + + /// + /// Find pet by ID + /// + /// + /// Returns a single pet + /// + /// Thrown when fails to make API call + /// ID of pet to return + /// ApiResponse of Pet + ApiResponse GetPetByIdWithHttpInfo(long petId); + /// + /// Update an existing pet + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// + void UpdatePet(Pet pet); + + /// + /// Update an existing pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// ApiResponse of Object(void) + ApiResponse UpdatePetWithHttpInfo(Pet pet); + /// + /// Updates a pet in the store with form data + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be updated + /// Updated name of the pet (optional) + /// Updated status of the pet (optional) + /// + void UpdatePetWithForm(long petId, string name = default(string), string status = default(string)); + + /// + /// Updates a pet in the store with form data + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be updated + /// Updated name of the pet (optional) + /// Updated status of the pet (optional) + /// ApiResponse of Object(void) + ApiResponse UpdatePetWithFormWithHttpInfo(long petId, string name = default(string), string status = default(string)); + /// + /// uploads an image + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// Additional data to pass to server (optional) + /// file to upload (optional) + /// ApiResponse + ApiResponse UploadFile(long petId, string additionalMetadata = default(string), System.IO.Stream file = default(System.IO.Stream)); + + /// + /// uploads an image + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// Additional data to pass to server (optional) + /// file to upload (optional) + /// ApiResponse of ApiResponse + ApiResponse UploadFileWithHttpInfo(long petId, string additionalMetadata = default(string), System.IO.Stream file = default(System.IO.Stream)); + /// + /// uploads an image (required) + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// file to upload + /// Additional data to pass to server (optional) + /// ApiResponse + ApiResponse UploadFileWithRequiredFile(long petId, System.IO.Stream requiredFile, string additionalMetadata = default(string)); + + /// + /// uploads an image (required) + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// file to upload + /// Additional data to pass to server (optional) + /// ApiResponse of ApiResponse + ApiResponse UploadFileWithRequiredFileWithHttpInfo(long petId, System.IO.Stream requiredFile, string additionalMetadata = default(string)); + #endregion Synchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IPetApiAsync : IApiAccessor + { + #region Asynchronous Operations + /// + /// Add a new pet to the store + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task AddPetAsync(Pet pet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Add a new pet to the store + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Deletes a pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet id to delete + /// (optional) + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task DeletePetAsync(long petId, string apiKey = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Deletes a pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet id to delete + /// (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> DeletePetWithHttpInfoAsync(long petId, string apiKey = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Finds Pets by status + /// + /// + /// Multiple status values can be provided with comma separated strings + /// + /// Thrown when fails to make API call + /// Status values that need to be considered for filter (deprecated) + /// Cancellation Token to cancel the request. + /// Task of List<Pet> + System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Finds Pets by status + /// + /// + /// Multiple status values can be provided with comma separated strings + /// + /// Thrown when fails to make API call + /// Status values that need to be considered for filter (deprecated) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Pet>) + System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Finds Pets by tags + /// + /// + /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// + /// Thrown when fails to make API call + /// Tags to filter by + /// Cancellation Token to cancel the request. + /// Task of List<Pet> + [Obsolete] + System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Finds Pets by tags + /// + /// + /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// + /// Thrown when fails to make API call + /// Tags to filter by + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Pet>) + [Obsolete] + System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Find pet by ID + /// + /// + /// Returns a single pet + /// + /// Thrown when fails to make API call + /// ID of pet to return + /// Cancellation Token to cancel the request. + /// Task of Pet + System.Threading.Tasks.Task GetPetByIdAsync(long petId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Find pet by ID + /// + /// + /// Returns a single pet + /// + /// Thrown when fails to make API call + /// ID of pet to return + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Pet) + System.Threading.Tasks.Task> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Update an existing pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task UpdatePetAsync(Pet pet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Update an existing pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Updates a pet in the store with form data + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be updated + /// Updated name of the pet (optional) + /// Updated status of the pet (optional) + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, string name = default(string), string status = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Updates a pet in the store with form data + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be updated + /// Updated name of the pet (optional) + /// Updated status of the pet (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = default(string), string status = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// uploads an image + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// Additional data to pass to server (optional) + /// file to upload (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task UploadFileAsync(long petId, string additionalMetadata = default(string), System.IO.Stream file = default(System.IO.Stream), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// uploads an image + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// Additional data to pass to server (optional) + /// file to upload (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ApiResponse) + System.Threading.Tasks.Task> UploadFileWithHttpInfoAsync(long petId, string additionalMetadata = default(string), System.IO.Stream file = default(System.IO.Stream), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// uploads an image (required) + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// file to upload + /// Additional data to pass to server (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, string additionalMetadata = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// uploads an image (required) + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// file to upload + /// Additional data to pass to server (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ApiResponse) + System.Threading.Tasks.Task> UploadFileWithRequiredFileWithHttpInfoAsync(long petId, System.IO.Stream requiredFile, string additionalMetadata = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + #endregion Asynchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IPetApi : IPetApiSync, IPetApiAsync + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public partial class PetApi : IDisposable, IPetApi + { + private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// + public PetApi() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// The target service's base path in URL format. + /// + /// + public PetApi(string basePath) + { + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + new Org.OpenAPITools.Client.Configuration { BasePath = basePath } + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class using Configuration object. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// An instance of Configuration. + /// + /// + public PetApi(Org.OpenAPITools.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + configuration + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access. + /// The client interface for asynchronous API access. + /// The configuration object. + /// + public PetApi(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + this.AsynchronousClient = asyncClient; + this.Configuration = configuration; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + this.ApiClient?.Dispose(); + } + + /// + /// Holds the ApiClient if created + /// + public Org.OpenAPITools.Client.ApiClient ApiClient { get; set; } = null; + + /// + /// The client for accessing this underlying API asynchronously. + /// + public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; } + + /// + /// The client for accessing this underlying API synchronously. + /// + public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// + public void AddPet(Pet pet) + { + AddPetWithHttpInfo(pet); + } + + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse AddPetWithHttpInfo(Pet pet) + { + // verify the required parameter 'pet' is set + if (pet == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'pet' when calling PetApi->AddPet"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json", + "application/xml" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = pet; + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + // authentication (http_signature_test) required + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "POST", "/pet", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + + // make the HTTP request + var localVarResponse = this.Client.Post("/pet", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("AddPet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task AddPetAsync(Pet pet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = AddPetWithHttpInfoAsync(pet, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'pet' is set + if (pet == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'pet' when calling PetApi->AddPet"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json", + "application/xml" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = pet; + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + // authentication (http_signature_test) required + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "POST", "/pet", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/pet", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("AddPet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Deletes a pet + /// + /// Thrown when fails to make API call + /// Pet id to delete + /// (optional) + /// + public void DeletePet(long petId, string apiKey = default(string)) + { + DeletePetWithHttpInfo(petId, apiKey); + } + + /// + /// Deletes a pet + /// + /// Thrown when fails to make API call + /// Pet id to delete + /// (optional) + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse DeletePetWithHttpInfo(long petId, string apiKey = default(string)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + if (apiKey != null) + { + localVarRequestOptions.HeaderParameters.Add("api_key", Org.OpenAPITools.Client.ClientUtils.ParameterToString(apiKey)); // header parameter + } + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + var localVarResponse = this.Client.Delete("/pet/{petId}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("DeletePet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Deletes a pet + /// + /// Thrown when fails to make API call + /// Pet id to delete + /// (optional) + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task DeletePetAsync(long petId, string apiKey = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Deletes a pet + /// + /// Thrown when fails to make API call + /// Pet id to delete + /// (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> DeletePetWithHttpInfoAsync(long petId, string apiKey = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + if (apiKey != null) + { + localVarRequestOptions.HeaderParameters.Add("api_key", Org.OpenAPITools.Client.ClientUtils.ParameterToString(apiKey)); // header parameter + } + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + + var task = this.AsynchronousClient.DeleteAsync("/pet/{petId}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("DeletePet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Finds Pets by status Multiple status values can be provided with comma separated strings + /// + /// Thrown when fails to make API call + /// Status values that need to be considered for filter (deprecated) + /// List<Pet> + public List FindPetsByStatus(List status) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByStatusWithHttpInfo(status); + return localVarResponse.Data; + } + + /// + /// Finds Pets by status Multiple status values can be provided with comma separated strings + /// + /// Thrown when fails to make API call + /// Status values that need to be considered for filter (deprecated) + /// ApiResponse of List<Pet> + public Org.OpenAPITools.Client.ApiResponse> FindPetsByStatusWithHttpInfo(List status) + { + // verify the required parameter 'status' is set + if (status == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'status' when calling PetApi->FindPetsByStatus"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "status", status)); + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + // authentication (http_signature_test) required + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "GET", "/pet/findByStatus", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + + // make the HTTP request + var localVarResponse = this.Client.Get>("/pet/findByStatus", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FindPetsByStatus", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Finds Pets by status Multiple status values can be provided with comma separated strings + /// + /// Thrown when fails to make API call + /// Status values that need to be considered for filter (deprecated) + /// Cancellation Token to cancel the request. + /// Task of List<Pet> + public async System.Threading.Tasks.Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = FindPetsByStatusWithHttpInfoAsync(status, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Finds Pets by status Multiple status values can be provided with comma separated strings + /// + /// Thrown when fails to make API call + /// Status values that need to be considered for filter (deprecated) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Pet>) + public async System.Threading.Tasks.Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'status' is set + if (status == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'status' when calling PetApi->FindPetsByStatus"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "status", status)); + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + // authentication (http_signature_test) required + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "GET", "/pet/findByStatus", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync>("/pet/findByStatus", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FindPetsByStatus", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// + /// Thrown when fails to make API call + /// Tags to filter by + /// List<Pet> + [Obsolete] + public List FindPetsByTags(List tags) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = FindPetsByTagsWithHttpInfo(tags); + return localVarResponse.Data; + } + + /// + /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// + /// Thrown when fails to make API call + /// Tags to filter by + /// ApiResponse of List<Pet> + [Obsolete] + public Org.OpenAPITools.Client.ApiResponse> FindPetsByTagsWithHttpInfo(List tags) + { + // verify the required parameter 'tags' is set + if (tags == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'tags' when calling PetApi->FindPetsByTags"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "tags", tags)); + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + // authentication (http_signature_test) required + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "GET", "/pet/findByTags", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + + // make the HTTP request + var localVarResponse = this.Client.Get>("/pet/findByTags", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FindPetsByTags", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// + /// Thrown when fails to make API call + /// Tags to filter by + /// Cancellation Token to cancel the request. + /// Task of List<Pet> + [Obsolete] + public async System.Threading.Tasks.Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// + /// Thrown when fails to make API call + /// Tags to filter by + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Pet>) + [Obsolete] + public async System.Threading.Tasks.Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'tags' is set + if (tags == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'tags' when calling PetApi->FindPetsByTags"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "tags", tags)); + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + // authentication (http_signature_test) required + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "GET", "/pet/findByTags", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync>("/pet/findByTags", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("FindPetsByTags", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Find pet by ID Returns a single pet + /// + /// Thrown when fails to make API call + /// ID of pet to return + /// Pet + public Pet GetPetById(long petId) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = GetPetByIdWithHttpInfo(petId); + return localVarResponse.Data; + } + + /// + /// Find pet by ID Returns a single pet + /// + /// Thrown when fails to make API call + /// ID of pet to return + /// ApiResponse of Pet + public Org.OpenAPITools.Client.ApiResponse GetPetByIdWithHttpInfo(long petId) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + + // authentication (api_key) required + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key"))) + { + localVarRequestOptions.HeaderParameters.Add("api_key", this.Configuration.GetApiKeyWithPrefix("api_key")); + } + + // make the HTTP request + var localVarResponse = this.Client.Get("/pet/{petId}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetPetById", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Find pet by ID Returns a single pet + /// + /// Thrown when fails to make API call + /// ID of pet to return + /// Cancellation Token to cancel the request. + /// Task of Pet + public async System.Threading.Tasks.Task GetPetByIdAsync(long petId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = GetPetByIdWithHttpInfoAsync(petId, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Find pet by ID Returns a single pet + /// + /// Thrown when fails to make API call + /// ID of pet to return + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Pet) + public async System.Threading.Tasks.Task> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + + // authentication (api_key) required + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key"))) + { + localVarRequestOptions.HeaderParameters.Add("api_key", this.Configuration.GetApiKeyWithPrefix("api_key")); + } + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/pet/{petId}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetPetById", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Update an existing pet + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// + public void UpdatePet(Pet pet) + { + UpdatePetWithHttpInfo(pet); + } + + /// + /// Update an existing pet + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse UpdatePetWithHttpInfo(Pet pet) + { + // verify the required parameter 'pet' is set + if (pet == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'pet' when calling PetApi->UpdatePet"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json", + "application/xml" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = pet; + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + // authentication (http_signature_test) required + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "PUT", "/pet", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + + // make the HTTP request + var localVarResponse = this.Client.Put("/pet", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UpdatePet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Update an existing pet + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task UpdatePetAsync(Pet pet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = UpdatePetWithHttpInfoAsync(pet, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Update an existing pet + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'pet' is set + if (pet == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'pet' when calling PetApi->UpdatePet"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json", + "application/xml" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = pet; + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + // authentication (http_signature_test) required + if (this.Configuration.HttpSigningConfiguration != null) + { + var HttpSigningHeaders = this.Configuration.HttpSigningConfiguration.GetHttpSignedHeader(this.Configuration.BasePath, "PUT", "/pet", localVarRequestOptions); + foreach (var headerItem in HttpSigningHeaders) + { + if (localVarRequestOptions.HeaderParameters.ContainsKey(headerItem.Key)) + { + localVarRequestOptions.HeaderParameters[headerItem.Key] = new List() { headerItem.Value }; + } + else + { + localVarRequestOptions.HeaderParameters.Add(headerItem.Key, headerItem.Value); + } + } + } + + // make the HTTP request + + var task = this.AsynchronousClient.PutAsync("/pet", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UpdatePet", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Updates a pet in the store with form data + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be updated + /// Updated name of the pet (optional) + /// Updated status of the pet (optional) + /// + public void UpdatePetWithForm(long petId, string name = default(string), string status = default(string)) + { + UpdatePetWithFormWithHttpInfo(petId, name, status); + } + + /// + /// Updates a pet in the store with form data + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be updated + /// Updated name of the pet (optional) + /// Updated status of the pet (optional) + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse UpdatePetWithFormWithHttpInfo(long petId, string name = default(string), string status = default(string)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + if (name != null) + { + localVarRequestOptions.FormParameters.Add("name", Org.OpenAPITools.Client.ClientUtils.ParameterToString(name)); // form parameter + } + if (status != null) + { + localVarRequestOptions.FormParameters.Add("status", Org.OpenAPITools.Client.ClientUtils.ParameterToString(status)); // form parameter + } + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + var localVarResponse = this.Client.Post("/pet/{petId}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UpdatePetWithForm", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Updates a pet in the store with form data + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be updated + /// Updated name of the pet (optional) + /// Updated status of the pet (optional) + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, string name = default(string), string status = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Updates a pet in the store with form data + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be updated + /// Updated name of the pet (optional) + /// Updated status of the pet (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = default(string), string status = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/x-www-form-urlencoded" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + if (name != null) + { + localVarRequestOptions.FormParameters.Add("name", Org.OpenAPITools.Client.ClientUtils.ParameterToString(name)); // form parameter + } + if (status != null) + { + localVarRequestOptions.FormParameters.Add("status", Org.OpenAPITools.Client.ClientUtils.ParameterToString(status)); // form parameter + } + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/pet/{petId}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UpdatePetWithForm", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// uploads an image + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// Additional data to pass to server (optional) + /// file to upload (optional) + /// ApiResponse + public ApiResponse UploadFile(long petId, string additionalMetadata = default(string), System.IO.Stream file = default(System.IO.Stream)) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = UploadFileWithHttpInfo(petId, additionalMetadata, file); + return localVarResponse.Data; + } + + /// + /// uploads an image + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// Additional data to pass to server (optional) + /// file to upload (optional) + /// ApiResponse of ApiResponse + public Org.OpenAPITools.Client.ApiResponse UploadFileWithHttpInfo(long petId, string additionalMetadata = default(string), System.IO.Stream file = default(System.IO.Stream)) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "multipart/form-data" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + if (additionalMetadata != null) + { + localVarRequestOptions.FormParameters.Add("additionalMetadata", Org.OpenAPITools.Client.ClientUtils.ParameterToString(additionalMetadata)); // form parameter + } + if (file != null) + { + } + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + var localVarResponse = this.Client.Post("/pet/{petId}/uploadImage", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UploadFile", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// uploads an image + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// Additional data to pass to server (optional) + /// file to upload (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task UploadFileAsync(long petId, string additionalMetadata = default(string), System.IO.Stream file = default(System.IO.Stream), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// uploads an image + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// Additional data to pass to server (optional) + /// file to upload (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ApiResponse) + public async System.Threading.Tasks.Task> UploadFileWithHttpInfoAsync(long petId, string additionalMetadata = default(string), System.IO.Stream file = default(System.IO.Stream), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "multipart/form-data" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + if (additionalMetadata != null) + { + localVarRequestOptions.FormParameters.Add("additionalMetadata", Org.OpenAPITools.Client.ClientUtils.ParameterToString(additionalMetadata)); // form parameter + } + if (file != null) + { + } + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/pet/{petId}/uploadImage", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UploadFile", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// uploads an image (required) + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// file to upload + /// Additional data to pass to server (optional) + /// ApiResponse + public ApiResponse UploadFileWithRequiredFile(long petId, System.IO.Stream requiredFile, string additionalMetadata = default(string)) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata); + return localVarResponse.Data; + } + + /// + /// uploads an image (required) + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// file to upload + /// Additional data to pass to server (optional) + /// ApiResponse of ApiResponse + public Org.OpenAPITools.Client.ApiResponse UploadFileWithRequiredFileWithHttpInfo(long petId, System.IO.Stream requiredFile, string additionalMetadata = default(string)) + { + // verify the required parameter 'requiredFile' is set + if (requiredFile == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'requiredFile' when calling PetApi->UploadFileWithRequiredFile"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "multipart/form-data" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json", + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + if (additionalMetadata != null) + { + localVarRequestOptions.FormParameters.Add("additionalMetadata", Org.OpenAPITools.Client.ClientUtils.ParameterToString(additionalMetadata)); // form parameter + } + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + var localVarResponse = this.Client.Post("/fake/{petId}/uploadImageWithRequiredFile", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UploadFileWithRequiredFile", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// uploads an image (required) + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// file to upload + /// Additional data to pass to server (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task UploadFileWithRequiredFileAsync(long petId, System.IO.Stream requiredFile, string additionalMetadata = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// uploads an image (required) + /// + /// Thrown when fails to make API call + /// ID of pet to update + /// file to upload + /// Additional data to pass to server (optional) + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (ApiResponse) + public async System.Threading.Tasks.Task> UploadFileWithRequiredFileWithHttpInfoAsync(long petId, System.IO.Stream requiredFile, string additionalMetadata = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'requiredFile' is set + if (requiredFile == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'requiredFile' when calling PetApi->UploadFileWithRequiredFile"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "multipart/form-data" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json", + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("petId", Org.OpenAPITools.Client.ClientUtils.ParameterToString(petId)); // path parameter + if (additionalMetadata != null) + { + localVarRequestOptions.FormParameters.Add("additionalMetadata", Org.OpenAPITools.Client.ClientUtils.ParameterToString(additionalMetadata)); // form parameter + } + + // authentication (petstore_auth) required + // oauth required + if (!string.IsNullOrEmpty(this.Configuration.AccessToken) && !localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/fake/{petId}/uploadImageWithRequiredFile", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UploadFileWithRequiredFile", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs new file mode 100644 index 00000000000..812ad3827e7 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs @@ -0,0 +1,846 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Api +{ + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IStoreApiSync : IApiAccessor + { + #region Synchronous Operations + /// + /// Delete purchase order by ID + /// + /// + /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + /// Thrown when fails to make API call + /// ID of the order that needs to be deleted + /// + void DeleteOrder(string orderId); + + /// + /// Delete purchase order by ID + /// + /// + /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + /// Thrown when fails to make API call + /// ID of the order that needs to be deleted + /// ApiResponse of Object(void) + ApiResponse DeleteOrderWithHttpInfo(string orderId); + /// + /// Returns pet inventories by status + /// + /// + /// Returns a map of status codes to quantities + /// + /// Thrown when fails to make API call + /// Dictionary<string, int> + Dictionary GetInventory(); + + /// + /// Returns pet inventories by status + /// + /// + /// Returns a map of status codes to quantities + /// + /// Thrown when fails to make API call + /// ApiResponse of Dictionary<string, int> + ApiResponse> GetInventoryWithHttpInfo(); + /// + /// Find purchase order by ID + /// + /// + /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be fetched + /// Order + Order GetOrderById(long orderId); + + /// + /// Find purchase order by ID + /// + /// + /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be fetched + /// ApiResponse of Order + ApiResponse GetOrderByIdWithHttpInfo(long orderId); + /// + /// Place an order for a pet + /// + /// Thrown when fails to make API call + /// order placed for purchasing the pet + /// Order + Order PlaceOrder(Order order); + + /// + /// Place an order for a pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// order placed for purchasing the pet + /// ApiResponse of Order + ApiResponse PlaceOrderWithHttpInfo(Order order); + #endregion Synchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IStoreApiAsync : IApiAccessor + { + #region Asynchronous Operations + /// + /// Delete purchase order by ID + /// + /// + /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + /// Thrown when fails to make API call + /// ID of the order that needs to be deleted + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task DeleteOrderAsync(string orderId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Delete purchase order by ID + /// + /// + /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + /// Thrown when fails to make API call + /// ID of the order that needs to be deleted + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Returns pet inventories by status + /// + /// + /// Returns a map of status codes to quantities + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of Dictionary<string, int> + System.Threading.Tasks.Task> GetInventoryAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Returns pet inventories by status + /// + /// + /// Returns a map of status codes to quantities + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Dictionary<string, int>) + System.Threading.Tasks.Task>> GetInventoryWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Find purchase order by ID + /// + /// + /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be fetched + /// Cancellation Token to cancel the request. + /// Task of Order + System.Threading.Tasks.Task GetOrderByIdAsync(long orderId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Find purchase order by ID + /// + /// + /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be fetched + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Order) + System.Threading.Tasks.Task> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Place an order for a pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// order placed for purchasing the pet + /// Cancellation Token to cancel the request. + /// Task of Order + System.Threading.Tasks.Task PlaceOrderAsync(Order order, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Place an order for a pet + /// + /// + /// + /// + /// Thrown when fails to make API call + /// order placed for purchasing the pet + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Order) + System.Threading.Tasks.Task> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + #endregion Asynchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IStoreApi : IStoreApiSync, IStoreApiAsync + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public partial class StoreApi : IDisposable, IStoreApi + { + private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// + public StoreApi() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// The target service's base path in URL format. + /// + /// + public StoreApi(string basePath) + { + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + new Org.OpenAPITools.Client.Configuration { BasePath = basePath } + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class using Configuration object. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// An instance of Configuration. + /// + /// + public StoreApi(Org.OpenAPITools.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + configuration + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access. + /// The client interface for asynchronous API access. + /// The configuration object. + /// + public StoreApi(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + this.AsynchronousClient = asyncClient; + this.Configuration = configuration; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + this.ApiClient?.Dispose(); + } + + /// + /// Holds the ApiClient if created + /// + public Org.OpenAPITools.Client.ApiClient ApiClient { get; set; } = null; + + /// + /// The client for accessing this underlying API asynchronously. + /// + public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; } + + /// + /// The client for accessing this underlying API synchronously. + /// + public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + /// + /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + /// Thrown when fails to make API call + /// ID of the order that needs to be deleted + /// + public void DeleteOrder(string orderId) + { + DeleteOrderWithHttpInfo(orderId); + } + + /// + /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + /// Thrown when fails to make API call + /// ID of the order that needs to be deleted + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse DeleteOrderWithHttpInfo(string orderId) + { + // verify the required parameter 'orderId' is set + if (orderId == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->DeleteOrder"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("order_id", Org.OpenAPITools.Client.ClientUtils.ParameterToString(orderId)); // path parameter + + + // make the HTTP request + var localVarResponse = this.Client.Delete("/store/order/{order_id}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("DeleteOrder", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + /// Thrown when fails to make API call + /// ID of the order that needs to be deleted + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task DeleteOrderAsync(string orderId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = DeleteOrderWithHttpInfoAsync(orderId, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// + /// Thrown when fails to make API call + /// ID of the order that needs to be deleted + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'orderId' is set + if (orderId == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->DeleteOrder"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("order_id", Org.OpenAPITools.Client.ClientUtils.ParameterToString(orderId)); // path parameter + + + // make the HTTP request + + var task = this.AsynchronousClient.DeleteAsync("/store/order/{order_id}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("DeleteOrder", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Returns pet inventories by status Returns a map of status codes to quantities + /// + /// Thrown when fails to make API call + /// Dictionary<string, int> + public Dictionary GetInventory() + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = GetInventoryWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Returns pet inventories by status Returns a map of status codes to quantities + /// + /// Thrown when fails to make API call + /// ApiResponse of Dictionary<string, int> + public Org.OpenAPITools.Client.ApiResponse> GetInventoryWithHttpInfo() + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + // authentication (api_key) required + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key"))) + { + localVarRequestOptions.HeaderParameters.Add("api_key", this.Configuration.GetApiKeyWithPrefix("api_key")); + } + + // make the HTTP request + var localVarResponse = this.Client.Get>("/store/inventory", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetInventory", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Returns pet inventories by status Returns a map of status codes to quantities + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of Dictionary<string, int> + public async System.Threading.Tasks.Task> GetInventoryAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = GetInventoryWithHttpInfoAsync(cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Returns pet inventories by status Returns a map of status codes to quantities + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Dictionary<string, int>) + public async System.Threading.Tasks.Task>> GetInventoryWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + // authentication (api_key) required + if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("api_key"))) + { + localVarRequestOptions.HeaderParameters.Add("api_key", this.Configuration.GetApiKeyWithPrefix("api_key")); + } + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync>("/store/inventory", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetInventory", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be fetched + /// Order + public Order GetOrderById(long orderId) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = GetOrderByIdWithHttpInfo(orderId); + return localVarResponse.Data; + } + + /// + /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be fetched + /// ApiResponse of Order + public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long orderId) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("order_id", Org.OpenAPITools.Client.ClientUtils.ParameterToString(orderId)); // path parameter + + + // make the HTTP request + var localVarResponse = this.Client.Get("/store/order/{order_id}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetOrderById", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be fetched + /// Cancellation Token to cancel the request. + /// Task of Order + public async System.Threading.Tasks.Task GetOrderByIdAsync(long orderId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// + /// Thrown when fails to make API call + /// ID of pet that needs to be fetched + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Order) + public async System.Threading.Tasks.Task> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("order_id", Org.OpenAPITools.Client.ClientUtils.ParameterToString(orderId)); // path parameter + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/store/order/{order_id}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetOrderById", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Place an order for a pet + /// + /// Thrown when fails to make API call + /// order placed for purchasing the pet + /// Order + public Order PlaceOrder(Order order) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = PlaceOrderWithHttpInfo(order); + return localVarResponse.Data; + } + + /// + /// Place an order for a pet + /// + /// Thrown when fails to make API call + /// order placed for purchasing the pet + /// ApiResponse of Order + public Org.OpenAPITools.Client.ApiResponse PlaceOrderWithHttpInfo(Order order) + { + // verify the required parameter 'order' is set + if (order == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'order' when calling StoreApi->PlaceOrder"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = order; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/store/order", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("PlaceOrder", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Place an order for a pet + /// + /// Thrown when fails to make API call + /// order placed for purchasing the pet + /// Cancellation Token to cancel the request. + /// Task of Order + public async System.Threading.Tasks.Task PlaceOrderAsync(Order order, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = PlaceOrderWithHttpInfoAsync(order, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Place an order for a pet + /// + /// Thrown when fails to make API call + /// order placed for purchasing the pet + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Order) + public async System.Threading.Tasks.Task> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'order' is set + if (order == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'order' when calling StoreApi->PlaceOrder"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = order; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/store/order", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("PlaceOrder", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs new file mode 100644 index 00000000000..c425058e2ee --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs @@ -0,0 +1,1534 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Api +{ + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IUserApiSync : IApiAccessor + { + #region Synchronous Operations + /// + /// Create user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// Created user object + /// + void CreateUser(User user); + + /// + /// Create user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// Created user object + /// ApiResponse of Object(void) + ApiResponse CreateUserWithHttpInfo(User user); + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// + void CreateUsersWithArrayInput(List user); + + /// + /// Creates list of users with given input array + /// + /// + /// + /// + /// Thrown when fails to make API call + /// List of user object + /// ApiResponse of Object(void) + ApiResponse CreateUsersWithArrayInputWithHttpInfo(List user); + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// + void CreateUsersWithListInput(List user); + + /// + /// Creates list of users with given input array + /// + /// + /// + /// + /// Thrown when fails to make API call + /// List of user object + /// ApiResponse of Object(void) + ApiResponse CreateUsersWithListInputWithHttpInfo(List user); + /// + /// Delete user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// The name that needs to be deleted + /// + void DeleteUser(string username); + + /// + /// Delete user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// The name that needs to be deleted + /// ApiResponse of Object(void) + ApiResponse DeleteUserWithHttpInfo(string username); + /// + /// Get user by user name + /// + /// Thrown when fails to make API call + /// The name that needs to be fetched. Use user1 for testing. + /// User + User GetUserByName(string username); + + /// + /// Get user by user name + /// + /// + /// + /// + /// Thrown when fails to make API call + /// The name that needs to be fetched. Use user1 for testing. + /// ApiResponse of User + ApiResponse GetUserByNameWithHttpInfo(string username); + /// + /// Logs user into the system + /// + /// Thrown when fails to make API call + /// The user name for login + /// The password for login in clear text + /// string + string LoginUser(string username, string password); + + /// + /// Logs user into the system + /// + /// + /// + /// + /// Thrown when fails to make API call + /// The user name for login + /// The password for login in clear text + /// ApiResponse of string + ApiResponse LoginUserWithHttpInfo(string username, string password); + /// + /// Logs out current logged in user session + /// + /// Thrown when fails to make API call + /// + void LogoutUser(); + + /// + /// Logs out current logged in user session + /// + /// + /// + /// + /// Thrown when fails to make API call + /// ApiResponse of Object(void) + ApiResponse LogoutUserWithHttpInfo(); + /// + /// Updated user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// name that need to be deleted + /// Updated user object + /// + void UpdateUser(string username, User user); + + /// + /// Updated user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// name that need to be deleted + /// Updated user object + /// ApiResponse of Object(void) + ApiResponse UpdateUserWithHttpInfo(string username, User user); + #endregion Synchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IUserApiAsync : IApiAccessor + { + #region Asynchronous Operations + /// + /// Create user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// Created user object + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task CreateUserAsync(User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Create user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// Created user object + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Creates list of users with given input array + /// + /// + /// + /// + /// Thrown when fails to make API call + /// List of user object + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(List user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Creates list of users with given input array + /// + /// + /// + /// + /// Thrown when fails to make API call + /// List of user object + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> CreateUsersWithArrayInputWithHttpInfoAsync(List user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Creates list of users with given input array + /// + /// + /// + /// + /// Thrown when fails to make API call + /// List of user object + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task CreateUsersWithListInputAsync(List user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Creates list of users with given input array + /// + /// + /// + /// + /// Thrown when fails to make API call + /// List of user object + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> CreateUsersWithListInputWithHttpInfoAsync(List user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Delete user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// The name that needs to be deleted + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task DeleteUserAsync(string username, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Delete user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// The name that needs to be deleted + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Get user by user name + /// + /// + /// + /// + /// Thrown when fails to make API call + /// The name that needs to be fetched. Use user1 for testing. + /// Cancellation Token to cancel the request. + /// Task of User + System.Threading.Tasks.Task GetUserByNameAsync(string username, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Get user by user name + /// + /// + /// + /// + /// Thrown when fails to make API call + /// The name that needs to be fetched. Use user1 for testing. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (User) + System.Threading.Tasks.Task> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Logs user into the system + /// + /// + /// + /// + /// Thrown when fails to make API call + /// The user name for login + /// The password for login in clear text + /// Cancellation Token to cancel the request. + /// Task of string + System.Threading.Tasks.Task LoginUserAsync(string username, string password, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Logs user into the system + /// + /// + /// + /// + /// Thrown when fails to make API call + /// The user name for login + /// The password for login in clear text + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (string) + System.Threading.Tasks.Task> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Logs out current logged in user session + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task LogoutUserAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Logs out current logged in user session + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> LogoutUserWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Updated user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// name that need to be deleted + /// Updated user object + /// Cancellation Token to cancel the request. + /// Task of void + System.Threading.Tasks.Task UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Updated user + /// + /// + /// This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// name that need to be deleted + /// Updated user object + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + System.Threading.Tasks.Task> UpdateUserWithHttpInfoAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + #endregion Asynchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IUserApi : IUserApiSync, IUserApiAsync + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public partial class UserApi : IDisposable, IUserApi + { + private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// + public UserApi() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// The target service's base path in URL format. + /// + /// + public UserApi(string basePath) + { + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + new Org.OpenAPITools.Client.Configuration { BasePath = basePath } + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class using Configuration object. + /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal. + /// It's better to reuse the HttpClient and HttpClientHandler. + /// + /// An instance of Configuration. + /// + /// + public UserApi(Org.OpenAPITools.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + configuration + ); + this.ApiClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.Client = this.ApiClient; + this.AsynchronousClient = this.ApiClient; + ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access. + /// The client interface for asynchronous API access. + /// The configuration object. + /// + public UserApi(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + this.AsynchronousClient = asyncClient; + this.Configuration = configuration; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + this.ApiClient?.Dispose(); + } + + /// + /// Holds the ApiClient if created + /// + public Org.OpenAPITools.Client.ApiClient ApiClient { get; set; } = null; + + /// + /// The client for accessing this underlying API asynchronously. + /// + public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; } + + /// + /// The client for accessing this underlying API synchronously. + /// + public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + /// + /// Create user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// Created user object + /// + public void CreateUser(User user) + { + CreateUserWithHttpInfo(user); + } + + /// + /// Create user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// Created user object + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse CreateUserWithHttpInfo(User user) + { + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUser"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = user; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/user", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("CreateUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Create user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// Created user object + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task CreateUserAsync(User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = CreateUserWithHttpInfoAsync(user, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Create user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// Created user object + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUser"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = user; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/user", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("CreateUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// + public void CreateUsersWithArrayInput(List user) + { + CreateUsersWithArrayInputWithHttpInfo(user); + } + + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse CreateUsersWithArrayInputWithHttpInfo(List user) + { + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUsersWithArrayInput"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = user; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/user/createWithArray", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("CreateUsersWithArrayInput", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(List user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> CreateUsersWithArrayInputWithHttpInfoAsync(List user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUsersWithArrayInput"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = user; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/user/createWithArray", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("CreateUsersWithArrayInput", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// + public void CreateUsersWithListInput(List user) + { + CreateUsersWithListInputWithHttpInfo(user); + } + + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse CreateUsersWithListInputWithHttpInfo(List user) + { + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUsersWithListInput"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = user; + + + // make the HTTP request + var localVarResponse = this.Client.Post("/user/createWithList", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("CreateUsersWithListInput", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task CreateUsersWithListInputAsync(List user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Creates list of users with given input array + /// + /// Thrown when fails to make API call + /// List of user object + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> CreateUsersWithListInputWithHttpInfoAsync(List user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling UserApi->CreateUsersWithListInput"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.Data = user; + + + // make the HTTP request + + var task = this.AsynchronousClient.PostAsync("/user/createWithList", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("CreateUsersWithListInput", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Delete user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// The name that needs to be deleted + /// + public void DeleteUser(string username) + { + DeleteUserWithHttpInfo(username); + } + + /// + /// Delete user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// The name that needs to be deleted + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse DeleteUserWithHttpInfo(string username) + { + // verify the required parameter 'username' is set + if (username == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'username' when calling UserApi->DeleteUser"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter + + + // make the HTTP request + var localVarResponse = this.Client.Delete("/user/{username}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("DeleteUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Delete user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// The name that needs to be deleted + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task DeleteUserAsync(string username, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = DeleteUserWithHttpInfoAsync(username, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Delete user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// The name that needs to be deleted + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'username' is set + if (username == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'username' when calling UserApi->DeleteUser"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter + + + // make the HTTP request + + var task = this.AsynchronousClient.DeleteAsync("/user/{username}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("DeleteUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Get user by user name + /// + /// Thrown when fails to make API call + /// The name that needs to be fetched. Use user1 for testing. + /// User + public User GetUserByName(string username) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = GetUserByNameWithHttpInfo(username); + return localVarResponse.Data; + } + + /// + /// Get user by user name + /// + /// Thrown when fails to make API call + /// The name that needs to be fetched. Use user1 for testing. + /// ApiResponse of User + public Org.OpenAPITools.Client.ApiResponse GetUserByNameWithHttpInfo(string username) + { + // verify the required parameter 'username' is set + if (username == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'username' when calling UserApi->GetUserByName"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter + + + // make the HTTP request + var localVarResponse = this.Client.Get("/user/{username}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetUserByName", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Get user by user name + /// + /// Thrown when fails to make API call + /// The name that needs to be fetched. Use user1 for testing. + /// Cancellation Token to cancel the request. + /// Task of User + public async System.Threading.Tasks.Task GetUserByNameAsync(string username, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = GetUserByNameWithHttpInfoAsync(username, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Get user by user name + /// + /// Thrown when fails to make API call + /// The name that needs to be fetched. Use user1 for testing. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (User) + public async System.Threading.Tasks.Task> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'username' is set + if (username == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'username' when calling UserApi->GetUserByName"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/user/{username}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("GetUserByName", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Logs user into the system + /// + /// Thrown when fails to make API call + /// The user name for login + /// The password for login in clear text + /// string + public string LoginUser(string username, string password) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = LoginUserWithHttpInfo(username, password); + return localVarResponse.Data; + } + + /// + /// Logs user into the system + /// + /// Thrown when fails to make API call + /// The user name for login + /// The password for login in clear text + /// ApiResponse of string + public Org.OpenAPITools.Client.ApiResponse LoginUserWithHttpInfo(string username, string password) + { + // verify the required parameter 'username' is set + if (username == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'username' when calling UserApi->LoginUser"); + + // verify the required parameter 'password' is set + if (password == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'password' when calling UserApi->LoginUser"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "username", username)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "password", password)); + + + // make the HTTP request + var localVarResponse = this.Client.Get("/user/login", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("LoginUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Logs user into the system + /// + /// Thrown when fails to make API call + /// The user name for login + /// The password for login in clear text + /// Cancellation Token to cancel the request. + /// Task of string + public async System.Threading.Tasks.Task LoginUserAsync(string username, string password, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = LoginUserWithHttpInfoAsync(username, password, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Logs user into the system + /// + /// Thrown when fails to make API call + /// The user name for login + /// The password for login in clear text + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (string) + public async System.Threading.Tasks.Task> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'username' is set + if (username == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'username' when calling UserApi->LoginUser"); + + // verify the required parameter 'password' is set + if (password == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'password' when calling UserApi->LoginUser"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "username", username)); + localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("", "password", password)); + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/user/login", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("LoginUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Logs out current logged in user session + /// + /// Thrown when fails to make API call + /// + public void LogoutUser() + { + LogoutUserWithHttpInfo(); + } + + /// + /// Logs out current logged in user session + /// + /// Thrown when fails to make API call + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse LogoutUserWithHttpInfo() + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + var localVarResponse = this.Client.Get("/user/logout", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("LogoutUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Logs out current logged in user session + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task LogoutUserAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = LogoutUserWithHttpInfoAsync(cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Logs out current logged in user session + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> LogoutUserWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync("/user/logout", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("LogoutUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Updated user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// name that need to be deleted + /// Updated user object + /// + public void UpdateUser(string username, User user) + { + UpdateUserWithHttpInfo(username, user); + } + + /// + /// Updated user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// name that need to be deleted + /// Updated user object + /// ApiResponse of Object(void) + public Org.OpenAPITools.Client.ApiResponse UpdateUserWithHttpInfo(string username, User user) + { + // verify the required parameter 'username' is set + if (username == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'username' when calling UserApi->UpdateUser"); + + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling UserApi->UpdateUser"); + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter + localVarRequestOptions.Data = user; + + + // make the HTTP request + var localVarResponse = this.Client.Put("/user/{username}", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UpdateUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Updated user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// name that need to be deleted + /// Updated user object + /// Cancellation Token to cancel the request. + /// Task of void + public async System.Threading.Tasks.Task UpdateUserAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = UpdateUserWithHttpInfoAsync(username, user, cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + await task.ConfigureAwait(false); +#else + await task; +#endif + } + + /// + /// Updated user This can only be done by the logged in user. + /// + /// Thrown when fails to make API call + /// name that need to be deleted + /// Updated user object + /// Cancellation Token to cancel the request. + /// Task of ApiResponse + public async System.Threading.Tasks.Task> UpdateUserWithHttpInfoAsync(string username, User user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + // verify the required parameter 'username' is set + if (username == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'username' when calling UserApi->UpdateUser"); + + // verify the required parameter 'user' is set + if (user == null) + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'user' when calling UserApi->UpdateUser"); + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + localVarRequestOptions.PathParameters.Add("username", Org.OpenAPITools.Client.ClientUtils.ParameterToString(username)); // path parameter + localVarRequestOptions.Data = user; + + + // make the HTTP request + + var task = this.AsynchronousClient.PutAsync("/user/{username}", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("UpdateUser", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs new file mode 100644 index 00000000000..7502e7fb9ac --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs @@ -0,0 +1,645 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Net; +using System.Reflection; +using System.Runtime.Serialization; +using System.Runtime.Serialization.Formatters; +using System.Text; +using System.Threading; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; +using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs; +using System.Net.Http; +using System.Net.Http.Headers; +using UnityEngine.Networking; +using UnityEngine; + +namespace Org.OpenAPITools.Client +{ + /// + /// To Serialize/Deserialize JSON using our custom logic, but only when ContentType is JSON. + /// + internal class CustomJsonCodec + { + private readonly IReadableConfiguration _configuration; + private static readonly string _contentType = "application/json"; + private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + public CustomJsonCodec(IReadableConfiguration configuration) + { + _configuration = configuration; + } + + public CustomJsonCodec(JsonSerializerSettings serializerSettings, IReadableConfiguration configuration) + { + _serializerSettings = serializerSettings; + _configuration = configuration; + } + + /// + /// Serialize the object into a JSON string. + /// + /// Object to be serialized. + /// A JSON string. + public string Serialize(object obj) + { + if (obj != null && obj is Org.OpenAPITools.Model.AbstractOpenAPISchema) + { + // the object to be serialized is an oneOf/anyOf schema + return ((Org.OpenAPITools.Model.AbstractOpenAPISchema)obj).ToJson(); + } + else + { + return JsonConvert.SerializeObject(obj, _serializerSettings); + } + } + + public T Deserialize(UnityWebRequest request) + { + var result = (T) Deserialize(request, typeof(T)); + return result; + } + + /// + /// Deserialize the JSON string into a proper object. + /// + /// The UnityWebRequest after it has a response. + /// Object type. + /// Object representation of the JSON string. + internal object Deserialize(UnityWebRequest request, Type type) + { + if (type == typeof(byte[])) // return byte array + { + return request.downloadHandler.data; + } + + // TODO: ? if (type.IsAssignableFrom(typeof(Stream))) + if (type == typeof(Stream)) + { + // NOTE: Ignoring Content-Disposition filename support, since not all platforms + // have a location on disk to write arbitrary data (tvOS, consoles). + return new MemoryStream(request.downloadHandler.data); + } + + if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object + { + return DateTime.Parse(request.downloadHandler.text, null, System.Globalization.DateTimeStyles.RoundtripKind); + } + + if (type == typeof(string) || type.Name.StartsWith("System.Nullable")) // return primitive type + { + return Convert.ChangeType(request.downloadHandler.text, type); + } + + var contentType = request.GetResponseHeader("Content-Type"); + + if (!string.IsNullOrEmpty(contentType) && contentType.Contains("application/json")) + { + var text = request.downloadHandler?.text; + + // Generated APIs that don't expect a return value provide System.Object as the type + if (type == typeof(System.Object) && (string.IsNullOrEmpty(text) || text.Trim() == "null")) + { + return null; + } + + if (request.responseCode >= 200 && request.responseCode < 300) + { + try + { + // Deserialize as a model + return JsonConvert.DeserializeObject(text, type, _serializerSettings); + } + catch (Exception e) + { + throw new UnexpectedResponseException(request, type, e.ToString()); + } + } + else + { + throw new ApiException((int)request.responseCode, request.error, text); + } + } + + if (type != typeof(System.Object) && request.responseCode >= 200 && request.responseCode < 300) + { + throw new UnexpectedResponseException(request, type); + } + + return null; + + } + + public string RootElement { get; set; } + public string Namespace { get; set; } + public string DateFormat { get; set; } + + public string ContentType + { + get { return _contentType; } + set { throw new InvalidOperationException("Not allowed to set content type."); } + } + } + /// + /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations), + /// encapsulating general REST accessor use cases. + /// + /// + /// The Dispose method will manage the HttpClient lifecycle when not passed by constructor. + /// + public partial class ApiClient : IDisposable, ISynchronousClient, IAsynchronousClient + { + private readonly string _baseUrl; + + /// + /// Specifies the settings on a object. + /// These settings can be adjusted to accommodate custom serialization rules. + /// + public JsonSerializerSettings SerializerSettings { get; set; } = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + /// + /// Initializes a new instance of the , defaulting to the global configurations' base url. + /// + public ApiClient() : + this(Org.OpenAPITools.Client.GlobalConfiguration.Instance.BasePath) + { + } + + /// + /// Initializes a new instance of the . + /// + /// The target service's base path in URL format. + /// + public ApiClient(string basePath) + { + if (string.IsNullOrEmpty(basePath)) throw new ArgumentException("basePath cannot be empty"); + + _baseUrl = basePath; + } + + /// + /// Disposes resources if they were created by us + /// + public void Dispose() + { + } + + /// + /// Provides all logic for constructing a new UnityWebRequest. + /// At this point, all information for querying the service is known. Here, it is simply + /// mapped into the UnityWebRequest. + /// + /// The http verb. + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// [private] A new UnityWebRequest instance. + /// + private UnityWebRequest NewRequest( + string method, + string path, + RequestOptions options, + IReadableConfiguration configuration) + { + if (path == null) throw new ArgumentNullException("path"); + if (options == null) throw new ArgumentNullException("options"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + WebRequestPathBuilder builder = new WebRequestPathBuilder(_baseUrl, path); + + builder.AddPathParameters(options.PathParameters); + + builder.AddQueryParameters(options.QueryParameters); + + string contentType = null; + if (options.HeaderParameters != null && options.HeaderParameters.ContainsKey("Content-Type")) + { + var contentTypes = options.HeaderParameters["Content-Type"]; + contentType = contentTypes.FirstOrDefault(); + } + + var uri = builder.GetFullUri(); + UnityWebRequest request = null; + + if (contentType == "multipart/form-data") + { + var formData = new List(); + foreach (var formParameter in options.FormParameters) + { + formData.Add(new MultipartFormDataSection(formParameter.Key, formParameter.Value)); + } + + request = UnityWebRequest.Post(uri, formData); + request.method = method; + } + else if (contentType == "application/x-www-form-urlencoded") + { + var form = new WWWForm(); + foreach (var kvp in options.FormParameters) + { + form.AddField(kvp.Key, kvp.Value); + } + + request = UnityWebRequest.Post(uri, form); + request.method = method; + } + else if (options.Data != null) + { + var serializer = new CustomJsonCodec(SerializerSettings, configuration); + var jsonData = serializer.Serialize(options.Data); + + // Making a post body application/json encoded is whack with UnityWebRequest. + // See: https://stackoverflow.com/questions/68156230/unitywebrequest-post-not-sending-body + request = UnityWebRequest.Put(uri, jsonData); + request.method = method; + request.SetRequestHeader("Content-Type", "application/json"); + } + else + { + request = new UnityWebRequest(builder.GetFullUri(), method); + } + + if (request.downloadHandler == null && typeof(T) != typeof(System.Object)) + { + request.downloadHandler = new DownloadHandlerBuffer(); + } + +#if UNITY_EDITOR || !UNITY_WEBGL + if (configuration.UserAgent != null) + { + request.SetRequestHeader("User-Agent", configuration.UserAgent); + } +#endif + + if (configuration.DefaultHeaders != null) + { + foreach (var headerParam in configuration.DefaultHeaders) + { + request.SetRequestHeader(headerParam.Key, headerParam.Value); + } + } + + if (options.HeaderParameters != null) + { + foreach (var headerParam in options.HeaderParameters) + { + foreach (var value in headerParam.Value) + { + // Todo make content headers actually content headers + request.SetRequestHeader(headerParam.Key, value); + } + } + } + + if (options.Cookies != null && options.Cookies.Count > 0) + { + #if UNITY_WEBGL + throw new System.InvalidOperationException("UnityWebRequest does not support setting cookies in WebGL"); + #else + if (options.Cookies.Count != 1) + { + UnityEngine.Debug.LogError("Only one cookie supported, ignoring others"); + } + + request.SetRequestHeader("Cookie", options.Cookies[0].ToString()); + #endif + } + + return request; + + } + + partial void InterceptRequest(UnityWebRequest req, string path, RequestOptions options, IReadableConfiguration configuration); + partial void InterceptResponse(UnityWebRequest req, string path, RequestOptions options, IReadableConfiguration configuration, ref object responseData); + + private ApiResponse ToApiResponse(UnityWebRequest request, object responseData) + { + T result = (T) responseData; + + var transformed = new ApiResponse((HttpStatusCode)request.responseCode, new Multimap(), result, request.downloadHandler?.text ?? "") + { + ErrorText = request.error, + Cookies = new List() + }; + + // process response headers, e.g. Access-Control-Allow-Methods + var responseHeaders = request.GetResponseHeaders(); + if (responseHeaders != null) + { + foreach (var responseHeader in request.GetResponseHeaders()) + { + transformed.Headers.Add(responseHeader.Key, ClientUtils.ParameterToString(responseHeader.Value)); + } + } + + return transformed; + } + + private async Task> ExecAsync( + UnityWebRequest request, + string path, + RequestOptions options, + IReadableConfiguration configuration, + System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var deserializer = new CustomJsonCodec(SerializerSettings, configuration); + + using (request) + { + if (configuration.Timeout > 0) + { + request.timeout = (int)Math.Ceiling(configuration.Timeout / 1000.0f); + } + + if (configuration.Proxy != null) + { + throw new InvalidOperationException("Configuration `Proxy` not supported by UnityWebRequest"); + } + + if (configuration.ClientCertificates != null) + { + // Only Android/iOS/tvOS/Standalone players can support certificates, and this + // implementation is intended to work on all platforms. + // + // TODO: Could optionally allow support for this on these platforms. + // + // See: https://docs.unity3d.com/ScriptReference/Networking.CertificateHandler.html + throw new InvalidOperationException("Configuration `ClientCertificates` not supported by UnityWebRequest on all platforms"); + } + + InterceptRequest(request, path, options, configuration); + + var asyncOp = request.SendWebRequest(); + + TaskCompletionSource tsc = new TaskCompletionSource(); + asyncOp.completed += (_) => tsc.TrySetResult(request.result); + + using (var tokenRegistration = cancellationToken.Register(request.Abort, true)) + { + await tsc.Task; + } + + if (request.result == UnityWebRequest.Result.ConnectionError || + request.result == UnityWebRequest.Result.DataProcessingError) + { + throw new ConnectionException(request); + } + + object responseData = deserializer.Deserialize(request); + + // if the response type is oneOf/anyOf, call FromJSON to deserialize the data + if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) + { + responseData = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { new ByteArrayContent(request.downloadHandler.data) }); + } + else if (typeof(T).Name == "Stream") // for binary response + { + responseData = (T) (object) new MemoryStream(request.downloadHandler.data); + } + + InterceptResponse(request, path, options, configuration, ref responseData); + + return ToApiResponse(request, responseData); + } + } + + #region IAsynchronousClient + /// + /// Make a HTTP GET request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> GetAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("GET", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP POST request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PostAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("POST", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP PUT request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PutAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("PUT", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP DELETE request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> DeleteAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("DELETE", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP HEAD request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> HeadAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("HEAD", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP OPTION request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> OptionsAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("OPTIONS", path, options, config), path, options, config, cancellationToken); + } + + /// + /// Make a HTTP PATCH request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PatchAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest("PATCH", path, options, config), path, options, config, cancellationToken); + } + #endregion IAsynchronousClient + + #region ISynchronousClient + /// + /// Make a HTTP GET request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Get(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP POST request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Post(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP PUT request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Put(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP DELETE request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Delete(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP HEAD request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Head(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP OPTION request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Options(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + + /// + /// Make a HTTP PATCH request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Patch(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + throw new System.NotImplementedException("UnityWebRequest does not support synchronous operation"); + } + #endregion ISynchronousClient + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs new file mode 100644 index 00000000000..67d9888d6a3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// API Exception + /// + public class ApiException : Exception + { + /// + /// Gets or sets the error code (HTTP status code) + /// + /// The error code (HTTP status code). + public int ErrorCode { get; set; } + + /// + /// Gets or sets the error content (body json object) + /// + /// The error content (Http response body). + public object ErrorContent { get; private set; } + + /// + /// Gets or sets the HTTP headers + /// + /// HTTP headers + public Multimap Headers { get; private set; } + + /// + /// Initializes a new instance of the class. + /// + public ApiException() { } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// Error message. + public ApiException(int errorCode, string message) : base(message) + { + this.ErrorCode = errorCode; + } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// Error message. + /// Error content. + /// HTTP Headers. + public ApiException(int errorCode, string message, object errorContent = null, Multimap headers = null) : base(message) + { + this.ErrorCode = errorCode; + this.ErrorContent = errorContent; + this.Headers = headers; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs new file mode 100644 index 00000000000..ca2de833a5a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs @@ -0,0 +1,166 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Net; + +namespace Org.OpenAPITools.Client +{ + /// + /// Provides a non-generic contract for the ApiResponse wrapper. + /// + public interface IApiResponse + { + /// + /// The data type of + /// + Type ResponseType { get; } + + /// + /// The content of this response + /// + Object Content { get; } + + /// + /// Gets or sets the status code (HTTP status code) + /// + /// The status code. + HttpStatusCode StatusCode { get; } + + /// + /// Gets or sets the HTTP headers + /// + /// HTTP headers + Multimap Headers { get; } + + /// + /// Gets or sets any error text defined by the calling client. + /// + string ErrorText { get; set; } + + /// + /// Gets or sets any cookies passed along on the response. + /// + List Cookies { get; set; } + + /// + /// The raw content of this response + /// + string RawContent { get; } + } + + /// + /// API Response + /// + public class ApiResponse : IApiResponse + { + #region Properties + + /// + /// Gets or sets the status code (HTTP status code) + /// + /// The status code. + public HttpStatusCode StatusCode { get; } + + /// + /// Gets or sets the HTTP headers + /// + /// HTTP headers + public Multimap Headers { get; } + + /// + /// Gets or sets the data (parsed HTTP body) + /// + /// The data. + public T Data { get; } + + /// + /// Gets or sets any error text defined by the calling client. + /// + public string ErrorText { get; set; } + + /// + /// Gets or sets any cookies passed along on the response. + /// + public List Cookies { get; set; } + + /// + /// The content of this response + /// + public Type ResponseType + { + get { return typeof(T); } + } + + /// + /// The data type of + /// + public object Content + { + get { return Data; } + } + + /// + /// The raw content + /// + public string RawContent { get; } + + #endregion Properties + + #region Constructors + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// HTTP headers. + /// Data (parsed HTTP body) + /// Raw content. + public ApiResponse(HttpStatusCode statusCode, Multimap headers, T data, string rawContent) + { + StatusCode = statusCode; + Headers = headers; + Data = data; + RawContent = rawContent; + } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// HTTP headers. + /// Data (parsed HTTP body) + public ApiResponse(HttpStatusCode statusCode, Multimap headers, T data) : this(statusCode, headers, data, null) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// Data (parsed HTTP body) + /// Raw content. + public ApiResponse(HttpStatusCode statusCode, T data, string rawContent) : this(statusCode, null, data, rawContent) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// Data (parsed HTTP body) + public ApiResponse(HttpStatusCode statusCode, T data) : this(statusCode, data, null) + { + } + + #endregion Constructors + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs new file mode 100644 index 00000000000..1572f948775 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -0,0 +1,242 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; + +namespace Org.OpenAPITools.Client +{ + /// + /// Utility functions providing some benefit to API client consumers. + /// + public static class ClientUtils + { + /// + /// Sanitize filename by removing the path + /// + /// Filename + /// Filename + public static string SanitizeFilename(string filename) + { + Match match = Regex.Match(filename, @".*[/\\](.*)$"); + return match.Success ? match.Groups[1].Value : filename; + } + + /// + /// Convert params to key/value pairs. + /// Use collectionFormat to properly format lists and collections. + /// + /// The swagger-supported collection format, one of: csv, tsv, ssv, pipes, multi + /// Key name. + /// Value object. + /// A multimap of keys with 1..n associated values. + public static Multimap ParameterToMultiMap(string collectionFormat, string name, object value) + { + var parameters = new Multimap(); + + if (value is ICollection collection && collectionFormat == "multi") + { + foreach (var item in collection) + { + parameters.Add(name, ParameterToString(item)); + } + } + else if (value is IDictionary dictionary) + { + if(collectionFormat == "deepObject") { + foreach (DictionaryEntry entry in dictionary) + { + parameters.Add(name + "[" + entry.Key + "]", ParameterToString(entry.Value)); + } + } + else { + foreach (DictionaryEntry entry in dictionary) + { + parameters.Add(entry.Key.ToString(), ParameterToString(entry.Value)); + } + } + } + else + { + parameters.Add(name, ParameterToString(value)); + } + + return parameters; + } + + /// + /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime. + /// If parameter is a list, join the list with ",". + /// Otherwise just return the string. + /// + /// The parameter (header, path, query, form). + /// An optional configuration instance, providing formatting options used in processing. + /// Formatted string. + public static string ParameterToString(object obj, IReadableConfiguration configuration = null) + { + if (obj is DateTime dateTime) + // Return a formatted date string - Can be customized with Configuration.DateTimeFormat + // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") + // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 + // For example: 2009-06-15T13:45:30.0000000 + return dateTime.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); + if (obj is DateTimeOffset dateTimeOffset) + // Return a formatted date string - Can be customized with Configuration.DateTimeFormat + // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") + // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 + // For example: 2009-06-15T13:45:30.0000000 + return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); + if (obj is bool boolean) + return boolean ? "true" : "false"; + if (obj is ICollection collection) + return string.Join(",", collection.Cast()); + if (obj is Enum && HasEnumMemberAttrValue(obj)) + return GetEnumMemberAttrValue(obj); + + return Convert.ToString(obj, CultureInfo.InvariantCulture); + } + + /// + /// Serializes the given object when not null. Otherwise return null. + /// + /// The object to serialize. + /// Serialized string. + public static string Serialize(object obj) + { + return obj != null ? Newtonsoft.Json.JsonConvert.SerializeObject(obj) : null; + } + + /// + /// Encode string in base64 format. + /// + /// string to be encoded. + /// Encoded string. + public static string Base64Encode(string text) + { + return Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(text)); + } + + /// + /// Convert stream to byte array + /// + /// Input stream to be converted + /// Byte array + public static byte[] ReadAsBytes(Stream inputStream) + { + using (var ms = new MemoryStream()) + { + inputStream.CopyTo(ms); + return ms.ToArray(); + } + } + + /// + /// Select the Content-Type header's value from the given content-type array: + /// if JSON type exists in the given array, use it; + /// otherwise use the first one defined in 'consumes' + /// + /// The Content-Type array to select from. + /// The Content-Type header to use. + public static string SelectHeaderContentType(string[] contentTypes) + { + if (contentTypes.Length == 0) + return null; + + foreach (var contentType in contentTypes) + { + if (IsJsonMime(contentType)) + return contentType; + } + + return contentTypes[0]; // use the first content type specified in 'consumes' + } + + /// + /// Select the Accept header's value from the given accepts array: + /// if JSON exists in the given array, use it; + /// otherwise use all of them (joining into a string) + /// + /// The accepts array to select from. + /// The Accept header to use. + public static string SelectHeaderAccept(string[] accepts) + { + if (accepts.Length == 0) + return null; + + if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase)) + return "application/json"; + + return string.Join(",", accepts); + } + + /// + /// Provides a case-insensitive check that a provided content type is a known JSON-like content type. + /// + public static readonly Regex JsonRegex = new Regex("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + /// + /// Check if the given MIME is a JSON MIME. + /// JSON MIME examples: + /// application/json + /// application/json; charset=UTF8 + /// APPLICATION/JSON + /// application/vnd.company+json + /// + /// MIME + /// Returns True if MIME type is json. + public static bool IsJsonMime(string mime) + { + if (string.IsNullOrWhiteSpace(mime)) return false; + + return JsonRegex.IsMatch(mime) || mime.Equals("application/json-patch+json"); + } + + /// + /// Is the Enum decorated with EnumMember Attribute + /// + /// + /// true if found + private static bool HasEnumMemberAttrValue(object enumVal) + { + if (enumVal == null) + throw new ArgumentNullException(nameof(enumVal)); + var enumType = enumVal.GetType(); + var memInfo = enumType.GetMember(enumVal.ToString() ?? throw new InvalidOperationException()); + var attr = memInfo.FirstOrDefault()?.GetCustomAttributes(false).OfType().FirstOrDefault(); + if (attr != null) return true; + return false; + } + + /// + /// Get the EnumMember value + /// + /// + /// EnumMember value as string otherwise null + private static string GetEnumMemberAttrValue(object enumVal) + { + if (enumVal == null) + throw new ArgumentNullException(nameof(enumVal)); + var enumType = enumVal.GetType(); + var memInfo = enumType.GetMember(enumVal.ToString() ?? throw new InvalidOperationException()); + var attr = memInfo.FirstOrDefault()?.GetCustomAttributes(false).OfType().FirstOrDefault(); + if (attr != null) + { + return attr.Value; + } + return null; + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs new file mode 100644 index 00000000000..5c018577557 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs @@ -0,0 +1,697 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Reflection; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Net.Http; + +namespace Org.OpenAPITools.Client +{ + /// + /// Represents a set of configuration settings + /// + public class Configuration : IReadableConfiguration + { + #region Constants + + /// + /// Version of the package. + /// + /// Version of the package. + public const string Version = "1.0.0"; + + /// + /// Identifier for ISO 8601 DateTime Format + /// + /// See https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 for more information. + // ReSharper disable once InconsistentNaming + public const string ISO8601_DATETIME_FORMAT = "o"; + + #endregion Constants + + #region Static Members + + /// + /// Default creation of exceptions for a given method name and response object + /// + public static readonly ExceptionFactory DefaultExceptionFactory = (methodName, response) => + { + var status = (int)response.StatusCode; + if (status >= 400) + { + return new ApiException(status, + string.Format("Error calling {0}: {1}", methodName, response.RawContent), + response.RawContent, response.Headers); + } + return null; + }; + + #endregion Static Members + + #region Private Members + + /// + /// Defines the base path of the target API server. + /// Example: http://localhost:3000/v1/ + /// + private string _basePath; + + /// + /// Gets or sets the API key based on the authentication name. + /// This is the key and value comprising the "secret" for accessing an API. + /// + /// The API key. + private IDictionary _apiKey; + + /// + /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name. + /// + /// The prefix of the API key. + private IDictionary _apiKeyPrefix; + + private string _dateTimeFormat = ISO8601_DATETIME_FORMAT; + private string _tempFolderPath = Path.GetTempPath(); + + /// + /// Gets or sets the servers defined in the OpenAPI spec. + /// + /// The servers + private IList> _servers; + + /// + /// Gets or sets the operation servers defined in the OpenAPI spec. + /// + /// The operation servers + private IReadOnlyDictionary>> _operationServers; + + + /// + /// HttpSigning configuration + /// + private HttpSigningConfiguration _HttpSigningConfiguration = null; + #endregion Private Members + + #region Constructors + + /// + /// Initializes a new instance of the class + /// + [System.Diagnostics.CodeAnalysis.SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")] + public Configuration() + { + Proxy = null; + UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp"); + BasePath = "http://petstore.swagger.io:80/v2"; + DefaultHeaders = new ConcurrentDictionary(); + ApiKey = new ConcurrentDictionary(); + ApiKeyPrefix = new ConcurrentDictionary(); + Servers = new List>() + { + { + new Dictionary { + {"url", "http://{server}.swagger.io:{port}/v2"}, + {"description", "petstore server"}, + { + "variables", new Dictionary { + { + "server", new Dictionary { + {"description", "No description provided"}, + {"default_value", "petstore"}, + { + "enum_values", new List() { + "petstore", + "qa-petstore", + "dev-petstore" + } + } + } + }, + { + "port", new Dictionary { + {"description", "No description provided"}, + {"default_value", "80"}, + { + "enum_values", new List() { + "80", + "8080" + } + } + } + } + } + } + } + }, + { + new Dictionary { + {"url", "https://localhost:8080/{version}"}, + {"description", "The local server"}, + { + "variables", new Dictionary { + { + "version", new Dictionary { + {"description", "No description provided"}, + {"default_value", "v2"}, + { + "enum_values", new List() { + "v1", + "v2" + } + } + } + } + } + } + } + }, + { + new Dictionary { + {"url", "https://127.0.0.1/no_variable"}, + {"description", "The local server without variables"}, + } + } + }; + OperationServers = new Dictionary>>() + { + { + "PetApi.AddPet", new List> + { + { + new Dictionary + { + {"url", "http://petstore.swagger.io/v2"}, + {"description", "No description provided"} + } + }, + { + new Dictionary + { + {"url", "http://path-server-test.petstore.local/v2"}, + {"description", "No description provided"} + } + }, + } + }, + { + "PetApi.UpdatePet", new List> + { + { + new Dictionary + { + {"url", "http://petstore.swagger.io/v2"}, + {"description", "No description provided"} + } + }, + { + new Dictionary + { + {"url", "http://path-server-test.petstore.local/v2"}, + {"description", "No description provided"} + } + }, + } + }, + }; + + // Setting Timeout has side effects (forces ApiClient creation). + Timeout = 100000; + } + + /// + /// Initializes a new instance of the class + /// + [System.Diagnostics.CodeAnalysis.SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")] + public Configuration( + IDictionary defaultHeaders, + IDictionary apiKey, + IDictionary apiKeyPrefix, + string basePath = "http://petstore.swagger.io:80/v2") : this() + { + if (string.IsNullOrWhiteSpace(basePath)) + throw new ArgumentException("The provided basePath is invalid.", "basePath"); + if (defaultHeaders == null) + throw new ArgumentNullException("defaultHeaders"); + if (apiKey == null) + throw new ArgumentNullException("apiKey"); + if (apiKeyPrefix == null) + throw new ArgumentNullException("apiKeyPrefix"); + + BasePath = basePath; + + foreach (var keyValuePair in defaultHeaders) + { + DefaultHeaders.Add(keyValuePair); + } + + foreach (var keyValuePair in apiKey) + { + ApiKey.Add(keyValuePair); + } + + foreach (var keyValuePair in apiKeyPrefix) + { + ApiKeyPrefix.Add(keyValuePair); + } + } + + #endregion Constructors + + #region Properties + + /// + /// Gets or sets the base path for API access. + /// + public virtual string BasePath { + get { return _basePath; } + set { _basePath = value; } + } + + /// + /// Gets or sets the default header. + /// + [Obsolete("Use DefaultHeaders instead.")] + public virtual IDictionary DefaultHeader + { + get + { + return DefaultHeaders; + } + set + { + DefaultHeaders = value; + } + } + + /// + /// Gets or sets the default headers. + /// + public virtual IDictionary DefaultHeaders { get; set; } + + /// + /// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds. + /// + public virtual int Timeout { get; set; } + + /// + /// Gets or sets the proxy + /// + /// Proxy. + public virtual WebProxy Proxy { get; set; } + + /// + /// Gets or sets the HTTP user agent. + /// + /// Http user agent. + public virtual string UserAgent { get; set; } + + /// + /// Gets or sets the username (HTTP basic authentication). + /// + /// The username. + public virtual string Username { get; set; } + + /// + /// Gets or sets the password (HTTP basic authentication). + /// + /// The password. + public virtual string Password { get; set; } + + /// + /// Gets the API key with prefix. + /// + /// API key identifier (authentication scheme). + /// API key with prefix. + public string GetApiKeyWithPrefix(string apiKeyIdentifier) + { + string apiKeyValue; + ApiKey.TryGetValue(apiKeyIdentifier, out apiKeyValue); + string apiKeyPrefix; + if (ApiKeyPrefix.TryGetValue(apiKeyIdentifier, out apiKeyPrefix)) + { + return apiKeyPrefix + " " + apiKeyValue; + } + + return apiKeyValue; + } + + /// + /// Gets or sets certificate collection to be sent with requests. + /// + /// X509 Certificate collection. + public X509CertificateCollection ClientCertificates { get; set; } + + /// + /// Gets or sets the access token for OAuth2 authentication. + /// + /// This helper property simplifies code generation. + /// + /// The access token. + public virtual string AccessToken { get; set; } + + /// + /// Gets or sets the temporary folder path to store the files downloaded from the server. + /// + /// Folder path. + public virtual string TempFolderPath + { + get { return _tempFolderPath; } + + set + { + if (string.IsNullOrEmpty(value)) + { + _tempFolderPath = Path.GetTempPath(); + return; + } + + // create the directory if it does not exist + if (!Directory.Exists(value)) + { + Directory.CreateDirectory(value); + } + + // check if the path contains directory separator at the end + if (value[value.Length - 1] == Path.DirectorySeparatorChar) + { + _tempFolderPath = value; + } + else + { + _tempFolderPath = value + Path.DirectorySeparatorChar; + } + } + } + + /// + /// Gets or sets the date time format used when serializing in the ApiClient + /// By default, it's set to ISO 8601 - "o", for others see: + /// https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx + /// and https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx + /// No validation is done to ensure that the string you're providing is valid + /// + /// The DateTimeFormat string + public virtual string DateTimeFormat + { + get { return _dateTimeFormat; } + set + { + if (string.IsNullOrEmpty(value)) + { + // Never allow a blank or null string, go back to the default + _dateTimeFormat = ISO8601_DATETIME_FORMAT; + return; + } + + // Caution, no validation when you choose date time format other than ISO 8601 + // Take a look at the above links + _dateTimeFormat = value; + } + } + + /// + /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name. + /// + /// Whatever you set here will be prepended to the value defined in AddApiKey. + /// + /// An example invocation here might be: + /// + /// ApiKeyPrefix["Authorization"] = "Bearer"; + /// + /// … where ApiKey["Authorization"] would then be used to set the value of your bearer token. + /// + /// + /// OAuth2 workflows should set tokens via AccessToken. + /// + /// + /// The prefix of the API key. + public virtual IDictionary ApiKeyPrefix + { + get { return _apiKeyPrefix; } + set + { + if (value == null) + { + throw new InvalidOperationException("ApiKeyPrefix collection may not be null."); + } + _apiKeyPrefix = value; + } + } + + /// + /// Gets or sets the API key based on the authentication name. + /// + /// The API key. + public virtual IDictionary ApiKey + { + get { return _apiKey; } + set + { + if (value == null) + { + throw new InvalidOperationException("ApiKey collection may not be null."); + } + _apiKey = value; + } + } + + /// + /// Gets or sets the servers. + /// + /// The servers. + public virtual IList> Servers + { + get { return _servers; } + set + { + if (value == null) + { + throw new InvalidOperationException("Servers may not be null."); + } + _servers = value; + } + } + + /// + /// Gets or sets the operation servers. + /// + /// The operation servers. + public virtual IReadOnlyDictionary>> OperationServers + { + get { return _operationServers; } + set + { + if (value == null) + { + throw new InvalidOperationException("Operation servers may not be null."); + } + _operationServers = value; + } + } + + /// + /// Returns URL based on server settings without providing values + /// for the variables + /// + /// Array index of the server settings. + /// The server URL. + public string GetServerUrl(int index) + { + return GetServerUrl(Servers, index, null); + } + + /// + /// Returns URL based on server settings. + /// + /// Array index of the server settings. + /// Dictionary of the variables and the corresponding values. + /// The server URL. + public string GetServerUrl(int index, Dictionary inputVariables) + { + return GetServerUrl(Servers, index, inputVariables); + } + + /// + /// Returns URL based on operation server settings. + /// + /// Operation associated with the request path. + /// Array index of the server settings. + /// The operation server URL. + public string GetOperationServerUrl(string operation, int index) + { + return GetOperationServerUrl(operation, index, null); + } + + /// + /// Returns URL based on operation server settings. + /// + /// Operation associated with the request path. + /// Array index of the server settings. + /// Dictionary of the variables and the corresponding values. + /// The operation server URL. + public string GetOperationServerUrl(string operation, int index, Dictionary inputVariables) + { + if (OperationServers.TryGetValue(operation, out var operationServer)) + { + return GetServerUrl(operationServer, index, inputVariables); + } + + return null; + } + + /// + /// Returns URL based on server settings. + /// + /// Dictionary of server settings. + /// Array index of the server settings. + /// Dictionary of the variables and the corresponding values. + /// The server URL. + private string GetServerUrl(IList> servers, int index, Dictionary inputVariables) + { + if (index < 0 || index >= servers.Count) + { + throw new InvalidOperationException($"Invalid index {index} when selecting the server. Must be less than {servers.Count}."); + } + + if (inputVariables == null) + { + inputVariables = new Dictionary(); + } + + IReadOnlyDictionary server = servers[index]; + string url = (string)server["url"]; + + if (server.ContainsKey("variables")) + { + // go through each variable and assign a value + foreach (KeyValuePair variable in (IReadOnlyDictionary)server["variables"]) + { + + IReadOnlyDictionary serverVariables = (IReadOnlyDictionary)(variable.Value); + + if (inputVariables.ContainsKey(variable.Key)) + { + if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + { + url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); + } + else + { + throw new InvalidOperationException($"The variable `{variable.Key}` in the server URL has invalid value #{inputVariables[variable.Key]}. Must be {(List)serverVariables["enum_values"]}"); + } + } + else + { + // use default value + url = url.Replace("{" + variable.Key + "}", (string)serverVariables["default_value"]); + } + } + } + + return url; + } + + /// + /// Gets and Sets the HttpSigningConfiguration + /// + public HttpSigningConfiguration HttpSigningConfiguration + { + get { return _HttpSigningConfiguration; } + set { _HttpSigningConfiguration = value; } + } + + #endregion Properties + + #region Methods + + /// + /// Returns a string with essential information for debugging. + /// + public static string ToDebugReport() + { + string report = "C# SDK (Org.OpenAPITools) Debug Report:\n"; + report += " OS: " + System.Environment.OSVersion + "\n"; + report += " .NET Framework Version: " + System.Environment.Version + "\n"; + report += " Version of the API: 1.0.0\n"; + report += " SDK Package Version: 1.0.0\n"; + + return report; + } + + /// + /// Add Api Key Header. + /// + /// Api Key name. + /// Api Key value. + /// + public void AddApiKey(string key, string value) + { + ApiKey[key] = value; + } + + /// + /// Sets the API key prefix. + /// + /// Api Key name. + /// Api Key value. + public void AddApiKeyPrefix(string key, string value) + { + ApiKeyPrefix[key] = value; + } + + #endregion Methods + + #region Static Members + /// + /// Merge configurations. + /// + /// First configuration. + /// Second configuration. + /// Merged configuration. + public static IReadableConfiguration MergeConfigurations(IReadableConfiguration first, IReadableConfiguration second) + { + if (second == null) return first ?? GlobalConfiguration.Instance; + + Dictionary apiKey = first.ApiKey.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + Dictionary apiKeyPrefix = first.ApiKeyPrefix.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + Dictionary defaultHeaders = first.DefaultHeaders.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + + foreach (var kvp in second.ApiKey) apiKey[kvp.Key] = kvp.Value; + foreach (var kvp in second.ApiKeyPrefix) apiKeyPrefix[kvp.Key] = kvp.Value; + foreach (var kvp in second.DefaultHeaders) defaultHeaders[kvp.Key] = kvp.Value; + + var config = new Configuration + { + ApiKey = apiKey, + ApiKeyPrefix = apiKeyPrefix, + DefaultHeaders = defaultHeaders, + BasePath = second.BasePath ?? first.BasePath, + Timeout = second.Timeout, + Proxy = second.Proxy ?? first.Proxy, + UserAgent = second.UserAgent ?? first.UserAgent, + Username = second.Username ?? first.Username, + Password = second.Password ?? first.Password, + AccessToken = second.AccessToken ?? first.AccessToken, + HttpSigningConfiguration = second.HttpSigningConfiguration ?? first.HttpSigningConfiguration, + TempFolderPath = second.TempFolderPath ?? first.TempFolderPath, + DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat, + ClientCertificates = second.ClientCertificates ?? first.ClientCertificates, + }; + return config; + } + #endregion Static Members + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs new file mode 100644 index 00000000000..568790e1b12 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs @@ -0,0 +1,29 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using UnityEngine.Networking; + +namespace Org.OpenAPITools.Client +{ + public class ConnectionException : Exception + { + public UnityWebRequest.Result Result { get; private set; } + public string Error { get; private set; } + + // NOTE: Cannot keep reference to the request since it will be disposed. + public ConnectionException(UnityWebRequest request) + : base($"result={request.result} error={request.error}") + { + Result = request.result; + Error = request.error ?? ""; + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs new file mode 100644 index 00000000000..43624dd7c86 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs @@ -0,0 +1,22 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// A delegate to ExceptionFactory method + /// + /// Method name + /// Response + /// Exceptions + public delegate Exception ExceptionFactory(string methodName, IApiResponse response); +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs new file mode 100644 index 00000000000..cbee70bca37 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs @@ -0,0 +1,67 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System.Collections.Generic; + +namespace Org.OpenAPITools.Client +{ + /// + /// provides a compile-time extension point for globally configuring + /// API Clients. + /// + /// + /// A customized implementation via partial class may reside in another file and may + /// be excluded from automatic generation via a .openapi-generator-ignore file. + /// + public partial class GlobalConfiguration : Configuration + { + #region Private Members + + private static readonly object GlobalConfigSync = new { }; + private static IReadableConfiguration _globalConfiguration; + + #endregion Private Members + + #region Constructors + + /// + private GlobalConfiguration() + { + } + + /// + public GlobalConfiguration(IDictionary defaultHeader, IDictionary apiKey, IDictionary apiKeyPrefix, string basePath = "http://localhost:3000/api") : base(defaultHeader, apiKey, apiKeyPrefix, basePath) + { + } + + static GlobalConfiguration() + { + Instance = new GlobalConfiguration(); + } + + #endregion Constructors + + /// + /// Gets or sets the default Configuration. + /// + /// Configuration. + public static IReadableConfiguration Instance + { + get { return _globalConfiguration; } + set + { + lock (GlobalConfigSync) + { + _globalConfiguration = value; + } + } + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs new file mode 100644 index 00000000000..0b3e867d0f4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -0,0 +1,774 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; +using System; +using System.Collections.Generic; +using System.IO; +using System.Runtime.InteropServices; +using System.Security; +using System.Security.Cryptography; +using System.Text; +using System.Web; + +namespace Org.OpenAPITools.Client +{ + /// + /// Class for HttpSigning auth related parameter and methods + /// + public class HttpSigningConfiguration + { + #region + /// + /// Initialize the HashAlgorithm and SigningAlgorithm to default value + /// + public HttpSigningConfiguration() + { + HashAlgorithm = HashAlgorithmName.SHA256; + SigningAlgorithm = "PKCS1-v15"; + } + #endregion + + #region Properties + /// + ///Gets the Api keyId + /// + public string KeyId { get; set; } + + /// + /// Gets the Key file path + /// + public string KeyFilePath { get; set; } + + /// + /// Gets the key pass phrase for password protected key + /// + public SecureString KeyPassPhrase { get; set; } + + /// + /// Gets the HTTP signing header + /// + public List HttpSigningHeader { get; set; } + + /// + /// Gets the hash algorithm sha256 or sha512 + /// + public HashAlgorithmName HashAlgorithm { get; set; } + + /// + /// Gets the signing algorithm + /// + public string SigningAlgorithm { get; set; } + + /// + /// Gets the Signature validity period in seconds + /// + public int SignatureValidityPeriod { get; set; } + + #endregion + + #region enum + private enum PrivateKeyType + { + None = 0, + RSA = 1, + ECDSA = 2, + } + #endregion + + #region Methods + /// + /// Gets the Headers for HttpSigning + /// + /// Base path + /// HTTP method + /// Path + /// Request options + /// Http signed headers + internal Dictionary GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions) + { + const string HEADER_REQUEST_TARGET = "(request-target)"; + //The time when the HTTP signature expires. The API server should reject HTTP requests + //that have expired. + const string HEADER_EXPIRES = "(expires)"; + //The 'Date' header. + const string HEADER_DATE = "Date"; + //The 'Host' header. + const string HEADER_HOST = "Host"; + //The time when the HTTP signature was generated. + const string HEADER_CREATED = "(created)"; + //When the 'Digest' header is included in the HTTP signature, the client automatically + //computes the digest of the HTTP request body, per RFC 3230. + const string HEADER_DIGEST = "Digest"; + //The 'Authorization' header is automatically generated by the client. It includes + //the list of signed headers and a base64-encoded signature. + const string HEADER_AUTHORIZATION = "Authorization"; + + //Hash table to store singed headers + var HttpSignedRequestHeader = new Dictionary(); + var HttpSignatureHeader = new Dictionary(); + + if (HttpSigningHeader.Count == 0) + { + HttpSigningHeader.Add("(created)"); + } + + if (requestOptions.PathParameters != null) + { + foreach (var pathParam in requestOptions.PathParameters) + { + var tempPath = path.Replace(pathParam.Key, "0"); + path = string.Format(tempPath, pathParam.Value); + } + } + + var httpValues = HttpUtility.ParseQueryString(string.Empty); + foreach (var parameter in requestOptions.QueryParameters) + { +#if (NETCOREAPP) + if (parameter.Value.Count > 1) + { // array + foreach (var value in parameter.Value) + { + httpValues.Add(HttpUtility.UrlEncode(parameter.Key) + "[]", value); + } + } + else + { + httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]); + } +#else + if (parameter.Value.Count > 1) + { // array + foreach (var value in parameter.Value) + { + httpValues.Add(parameter.Key + "[]", value); + } + } + else + { + httpValues.Add(parameter.Key, parameter.Value[0]); + } +#endif + } + var uriBuilder = new UriBuilder(string.Concat(basePath, path)); + uriBuilder.Query = httpValues.ToString().Replace("+", "%20"); + + var dateTime = DateTime.Now; + string Digest = string.Empty; + + //get the body + string requestBody = string.Empty; + if (requestOptions.Data != null) + { + var serializerSettings = new JsonSerializerSettings(); + requestBody = JsonConvert.SerializeObject(requestOptions.Data, serializerSettings); + } + + if (HashAlgorithm == HashAlgorithmName.SHA256) + { + var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody); + Digest = string.Format("SHA-256={0}", Convert.ToBase64String(bodyDigest)); + } + else if (HashAlgorithm == HashAlgorithmName.SHA512) + { + var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody); + Digest = string.Format("SHA-512={0}", Convert.ToBase64String(bodyDigest)); + } + else + { + throw new Exception(string.Format("{0} not supported", HashAlgorithm)); + } + + foreach (var header in HttpSigningHeader) + { + if (header.Equals(HEADER_REQUEST_TARGET)) + { + var targetUrl = string.Format("{0} {1}{2}", method.ToLower(), uriBuilder.Path, uriBuilder.Query); + HttpSignatureHeader.Add(header.ToLower(), targetUrl); + } + else if (header.Equals(HEADER_EXPIRES)) + { + var expireDateTime = dateTime.AddSeconds(SignatureValidityPeriod); + HttpSignatureHeader.Add(header.ToLower(), GetUnixTime(expireDateTime).ToString()); + } + else if (header.Equals(HEADER_DATE)) + { + var utcDateTime = dateTime.ToUniversalTime().ToString("r"); + HttpSignatureHeader.Add(header.ToLower(), utcDateTime); + HttpSignedRequestHeader.Add(HEADER_DATE, utcDateTime); + } + else if (header.Equals(HEADER_HOST)) + { + HttpSignatureHeader.Add(header.ToLower(), uriBuilder.Host); + HttpSignedRequestHeader.Add(HEADER_HOST, uriBuilder.Host); + } + else if (header.Equals(HEADER_CREATED)) + { + HttpSignatureHeader.Add(header.ToLower(), GetUnixTime(dateTime).ToString()); + } + else if (header.Equals(HEADER_DIGEST)) + { + HttpSignedRequestHeader.Add(HEADER_DIGEST, Digest); + HttpSignatureHeader.Add(header.ToLower(), Digest); + } + else + { + bool isHeaderFound = false; + foreach (var item in requestOptions.HeaderParameters) + { + if (string.Equals(item.Key, header, StringComparison.OrdinalIgnoreCase)) + { + HttpSignatureHeader.Add(header.ToLower(), item.Value.ToString()); + isHeaderFound = true; + break; + } + } + if (!isHeaderFound) + { + throw new Exception(string.Format("Cannot sign HTTP request.Request does not contain the {0} header.",header)); + } + } + + } + var headersKeysString = string.Join(" ", HttpSignatureHeader.Keys); + var headerValuesList = new List(); + + foreach (var keyVal in HttpSignatureHeader) + { + headerValuesList.Add(string.Format("{0}: {1}", keyVal.Key, keyVal.Value)); + } + //Concatenate headers value separated by new line + var headerValuesString = string.Join("\n", headerValuesList); + var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString); + string headerSignatureStr = null; + var keyType = GetKeyType(KeyFilePath); + + if (keyType == PrivateKeyType.RSA) + { + headerSignatureStr = GetRSASignature(signatureStringHash); + } + else if (keyType == PrivateKeyType.ECDSA) + { + headerSignatureStr = GetECDSASignature(signatureStringHash); + } + else + { + throw new Exception(string.Format("Private key type {0} not supported", keyType)); + } + const string cryptographicScheme = "hs2019"; + var authorizationHeaderValue = string.Format("Signature keyId=\"{0}\",algorithm=\"{1}\"", + KeyId, cryptographicScheme); + + if (HttpSignatureHeader.ContainsKey(HEADER_CREATED)) + { + authorizationHeaderValue += string.Format(",created={0}", HttpSignatureHeader[HEADER_CREATED]); + } + + if (HttpSignatureHeader.ContainsKey(HEADER_EXPIRES)) + { + authorizationHeaderValue += string.Format(",expires={0}", HttpSignatureHeader[HEADER_EXPIRES]); + } + + authorizationHeaderValue += string.Format(",headers=\"{0}\",signature=\"{1}\"", + headersKeysString, headerSignatureStr); + HttpSignedRequestHeader.Add(HEADER_AUTHORIZATION, authorizationHeaderValue); + return HttpSignedRequestHeader; + } + + private byte[] GetStringHash(string hashName, string stringToBeHashed) + { + var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName); + var bytes = Encoding.UTF8.GetBytes(stringToBeHashed); + var stringHash = hashAlgorithm.ComputeHash(bytes); + return stringHash; + } + + private int GetUnixTime(DateTime date2) + { + DateTime date1 = new DateTime(1970, 01, 01); + TimeSpan timeSpan = date2 - date1; + return (int)timeSpan.TotalSeconds; + } + + private string GetRSASignature(byte[] stringToSign) + { + RSA rsa = GetRSAProviderFromPemFile(KeyFilePath, KeyPassPhrase); + if (SigningAlgorithm == "RSASSA-PSS") + { + var signedbytes = rsa.SignHash(stringToSign, HashAlgorithm, RSASignaturePadding.Pss); + return Convert.ToBase64String(signedbytes); + } + else if (SigningAlgorithm == "PKCS1-v15") + { + var signedbytes = rsa.SignHash(stringToSign, HashAlgorithm, RSASignaturePadding.Pkcs1); + return Convert.ToBase64String(signedbytes); + } + else + { + return string.Empty; + } + } + + /// + /// Gets the ECDSA signature + /// + /// + /// ECDSA signature + private string GetECDSASignature(byte[] dataToSign) + { + string keyStr = string.Empty; + if (File.Exists(KeyFilePath)) + { + keyStr = File.ReadAllText(KeyFilePath); + } + else + { + keyStr = KeyFilePath; + } + + const string ecKeyHeader = "-----BEGIN EC PRIVATE KEY-----"; + const string ecKeyFooter = "-----END EC PRIVATE KEY-----"; + var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim(); + var keyBytes = System.Convert.FromBase64String(ecKeyBase64String); + var ecdsa = ECDsa.Create(); + +#if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0) + var byteCount = 0; + if (KeyPassPhrase != null) + { + IntPtr unmanagedString = IntPtr.Zero; + try + { + // convert secure string to byte array + unmanagedString = Marshal.SecureStringToGlobalAllocUnicode(KeyPassPhrase); + ecdsa.ImportEncryptedPkcs8PrivateKey(Encoding.UTF8.GetBytes(Marshal.PtrToStringUni(unmanagedString)), keyBytes, out byteCount); + } + finally + { + if (unmanagedString != IntPtr.Zero) + { + Marshal.ZeroFreeBSTR(unmanagedString); + } + } + } + else + { + ecdsa.ImportPkcs8PrivateKey(keyBytes, out byteCount); + } + var signedBytes = ecdsa.SignHash(dataToSign); + var derBytes = ConvertToECDSAANS1Format(signedBytes); + var signedString = System.Convert.ToBase64String(derBytes); + + return signedString; +#else + throw new Exception("ECDSA signing is supported only on NETCOREAPP3_0 and above"); +#endif + } + + private byte[] ConvertToECDSAANS1Format(byte[] signedBytes) + { + var derBytes = new List(); + byte derLength = 68; //default length for ECDSA code signing bit 0x44 + byte rbytesLength = 32; //R length 0x20 + byte sbytesLength = 32; //S length 0x20 + var rBytes = new List(); + var sBytes = new List(); + for (int i = 0; i < 32; i++) + { + rBytes.Add(signedBytes[i]); + } + for (int i = 32; i < 64; i++) + { + sBytes.Add(signedBytes[i]); + } + + if (rBytes[0] > 0x7F) + { + derLength++; + rbytesLength++; + var tempBytes = new List(); + tempBytes.AddRange(rBytes); + rBytes.Clear(); + rBytes.Add(0x00); + rBytes.AddRange(tempBytes); + } + + if (sBytes[0] > 0x7F) + { + derLength++; + sbytesLength++; + var tempBytes = new List(); + tempBytes.AddRange(sBytes); + sBytes.Clear(); + sBytes.Add(0x00); + sBytes.AddRange(tempBytes); + + } + + derBytes.Add(48); //start of the sequence 0x30 + derBytes.Add(derLength); //total length r length, type and r bytes + + derBytes.Add(2); //tag for integer + derBytes.Add(rbytesLength); //length of r + derBytes.AddRange(rBytes); + + derBytes.Add(2); //tag for integer + derBytes.Add(sbytesLength); //length of s + derBytes.AddRange(sBytes); + return derBytes.ToArray(); + } + + private RSACryptoServiceProvider GetRSAProviderFromPemFile(string pemfile, SecureString keyPassPhrase = null) + { + const string pempubheader = "-----BEGIN PUBLIC KEY-----"; + const string pempubfooter = "-----END PUBLIC KEY-----"; + bool isPrivateKeyFile = true; + byte[] pemkey = null; + + string pemstr = string.Empty; + if (File.Exists(pemfile)) + { + pemstr = File.ReadAllText(pemfile).Trim(); + } + else + { + pemstr = pemfile; + } + + if (pemstr.StartsWith(pempubheader) && pemstr.EndsWith(pempubfooter)) + { + isPrivateKeyFile = false; + } + + if (isPrivateKeyFile) + { + pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPhrase); + if (pemkey == null) + { + return null; + } + return DecodeRSAPrivateKey(pemkey); + } + return null; + } + + private byte[] ConvertPrivateKeyToBytes(string instr, SecureString keyPassPhrase = null) + { + const string pemprivheader = "-----BEGIN RSA PRIVATE KEY-----"; + const string pemprivfooter = "-----END RSA PRIVATE KEY-----"; + string pemstr = instr.Trim(); + byte[] binkey; + + if (!pemstr.StartsWith(pemprivheader) || !pemstr.EndsWith(pemprivfooter)) + { + return null; + } + + StringBuilder sb = new StringBuilder(pemstr); + sb.Replace(pemprivheader, ""); + sb.Replace(pemprivfooter, ""); + string pvkstr = sb.ToString().Trim(); + + try + { // if there are no PEM encryption info lines, this is an UNencrypted PEM private key + binkey = Convert.FromBase64String(pvkstr); + return binkey; + } + catch (System.FormatException) + { + StringReader str = new StringReader(pvkstr); + + //-------- read PEM encryption info. lines and extract salt ----- + if (!str.ReadLine().StartsWith("Proc-Type: 4,ENCRYPTED")) + { + return null; + } + string saltline = str.ReadLine(); + if (!saltline.StartsWith("DEK-Info: DES-EDE3-CBC,")) + { + return null; + } + string saltstr = saltline.Substring(saltline.IndexOf(",") + 1).Trim(); + byte[] salt = new byte[saltstr.Length / 2]; + for (int i = 0; i < salt.Length; i++) + salt[i] = Convert.ToByte(saltstr.Substring(i * 2, 2), 16); + if (str.ReadLine() != "") + { + return null; + } + + //------ remaining b64 data is encrypted RSA key ---- + string encryptedstr = str.ReadToEnd(); + + try + { //should have b64 encrypted RSA key now + binkey = Convert.FromBase64String(encryptedstr); + } + catch (System.FormatException) + { //data is not in base64 format + return null; + } + + byte[] deskey = GetEncryptedKey(salt, keyPassPhrase, 1, 2); // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes + if (deskey == null) + { + return null; + } + + //------ Decrypt the encrypted 3des-encrypted RSA private key ------ + byte[] rsakey = DecryptKey(binkey, deskey, salt); //OpenSSL uses salt value in PEM header also as 3DES IV + return rsakey; + } + } + + private RSACryptoServiceProvider DecodeRSAPrivateKey(byte[] privkey) + { + byte[] bytesModulus, bytesE, bytesD, bytesP, bytesQ, bytesDP, bytesDQ, bytesIQ; + + // --------- Set up stream to decode the asn.1 encoded RSA private key ------ + MemoryStream mem = new MemoryStream(privkey); + BinaryReader binr = new BinaryReader(mem); //wrap Memory Stream with BinaryReader for easy reading + byte bt = 0; + ushort twobytes = 0; + int elems = 0; + try + { + twobytes = binr.ReadUInt16(); + if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81) + { + binr.ReadByte(); //advance 1 byte + } + else if (twobytes == 0x8230) + { + binr.ReadInt16(); //advance 2 bytes + } + else + { + return null; + } + + twobytes = binr.ReadUInt16(); + if (twobytes != 0x0102) //version number + { + return null; + } + bt = binr.ReadByte(); + if (bt != 0x00) + { + return null; + } + + //------ all private key components are Integer sequences ---- + elems = GetIntegerSize(binr); + bytesModulus = binr.ReadBytes(elems); + + elems = GetIntegerSize(binr); + bytesE = binr.ReadBytes(elems); + + elems = GetIntegerSize(binr); + bytesD = binr.ReadBytes(elems); + + elems = GetIntegerSize(binr); + bytesP = binr.ReadBytes(elems); + + elems = GetIntegerSize(binr); + bytesQ = binr.ReadBytes(elems); + + elems = GetIntegerSize(binr); + bytesDP = binr.ReadBytes(elems); + + elems = GetIntegerSize(binr); + bytesDQ = binr.ReadBytes(elems); + + elems = GetIntegerSize(binr); + bytesIQ = binr.ReadBytes(elems); + + // ------- create RSACryptoServiceProvider instance and initialize with public key ----- + RSACryptoServiceProvider RSA = new RSACryptoServiceProvider(); + RSAParameters RSAparams = new RSAParameters(); + RSAparams.Modulus = bytesModulus; + RSAparams.Exponent = bytesE; + RSAparams.D = bytesD; + RSAparams.P = bytesP; + RSAparams.Q = bytesQ; + RSAparams.DP = bytesDP; + RSAparams.DQ = bytesDQ; + RSAparams.InverseQ = bytesIQ; + RSA.ImportParameters(RSAparams); + return RSA; + } + catch (Exception) + { + return null; + } + finally + { + binr.Close(); + } + } + + private int GetIntegerSize(BinaryReader binr) + { + byte bt = 0; + byte lowbyte = 0x00; + byte highbyte = 0x00; + int count = 0; + bt = binr.ReadByte(); + if (bt != 0x02) //expect integer + { + return 0; + } + bt = binr.ReadByte(); + + if (bt == 0x81) + { + count = binr.ReadByte(); // data size in next byte + } + else if (bt == 0x82) + { + highbyte = binr.ReadByte(); // data size in next 2 bytes + lowbyte = binr.ReadByte(); + byte[] modint = { lowbyte, highbyte, 0x00, 0x00 }; + count = BitConverter.ToInt32(modint, 0); + } + else + { + count = bt; // we already have the data size + } + while (binr.ReadByte() == 0x00) + { + //remove high order zeros in data + count -= 1; + } + binr.BaseStream.Seek(-1, SeekOrigin.Current); + //last ReadByte wasn't a removed zero, so back up a byte + return count; + } + + private byte[] GetEncryptedKey(byte[] salt, SecureString secpswd, int count, int miter) + { + IntPtr unmanagedPswd = IntPtr.Zero; + const int HASHLENGTH = 16; //MD5 bytes + byte[] keymaterial = new byte[HASHLENGTH * miter]; //to store concatenated Mi hashed results + + byte[] psbytes = new byte[secpswd.Length]; + unmanagedPswd = Marshal.SecureStringToGlobalAllocAnsi(secpswd); + Marshal.Copy(unmanagedPswd, psbytes, 0, psbytes.Length); + Marshal.ZeroFreeGlobalAllocAnsi(unmanagedPswd); + + // --- concatenate salt and pswd bytes into fixed data array --- + byte[] data00 = new byte[psbytes.Length + salt.Length]; + Array.Copy(psbytes, data00, psbytes.Length); //copy the pswd bytes + Array.Copy(salt, 0, data00, psbytes.Length, salt.Length); //concatenate the salt bytes + + // ---- do multi-hashing and concatenate results D1, D2 ... into keymaterial bytes ---- + MD5 md5 = new MD5CryptoServiceProvider(); + byte[] result = null; + byte[] hashtarget = new byte[HASHLENGTH + data00.Length]; //fixed length initial hashtarget + + for (int j = 0; j < miter; j++) + { + // ---- Now hash consecutively for count times ------ + if (j == 0) + { + result = data00; //initialize + } + else + { + Array.Copy(result, hashtarget, result.Length); + Array.Copy(data00, 0, hashtarget, result.Length, data00.Length); + result = hashtarget; + } + + for (int i = 0; i < count; i++) + { + result = md5.ComputeHash(result); + } + Array.Copy(result, 0, keymaterial, j * HASHLENGTH, result.Length); //concatenate to keymaterial + } + byte[] deskey = new byte[24]; + Array.Copy(keymaterial, deskey, deskey.Length); + + Array.Clear(psbytes, 0, psbytes.Length); + Array.Clear(data00, 0, data00.Length); + Array.Clear(result, 0, result.Length); + Array.Clear(hashtarget, 0, hashtarget.Length); + Array.Clear(keymaterial, 0, keymaterial.Length); + return deskey; + } + + private byte[] DecryptKey(byte[] cipherData, byte[] desKey, byte[] IV) + { + MemoryStream memst = new MemoryStream(); + TripleDES alg = TripleDES.Create(); + alg.Key = desKey; + alg.IV = IV; + try + { + CryptoStream cs = new CryptoStream(memst, alg.CreateDecryptor(), CryptoStreamMode.Write); + cs.Write(cipherData, 0, cipherData.Length); + cs.Close(); + } + catch (Exception) + { + return null; + } + byte[] decryptedData = memst.ToArray(); + return decryptedData; + } + + /// + /// Detect the key type from the pem file. + /// + /// key file path in pem format + /// Private Key Type + private PrivateKeyType GetKeyType(string keyFilePath) + { + string[] key = null; + + if (File.Exists(keyFilePath)) + { + key = File.ReadAllLines(keyFilePath); + } + else + { + // The ApiKeyFilePath is passed as string + key = new string[] { keyFilePath }; + } + + const string ecPrivateKeyHeader = "BEGIN EC PRIVATE KEY"; + const string ecPrivateKeyFooter = "END EC PRIVATE KEY"; + const string rsaPrivateKeyHeader = "BEGIN RSA PRIVATE KEY"; + const string rsaPrivateFooter = "END RSA PRIVATE KEY"; + //var pkcs8Header = "BEGIN PRIVATE KEY"; + //var pkcs8Footer = "END PRIVATE KEY"; + PrivateKeyType keyType; + + if (key[0].Contains(rsaPrivateKeyHeader) && + key[key.Length - 1].ToString().Contains(rsaPrivateFooter)) + { + keyType = PrivateKeyType.RSA; + } + else if (key[0].Contains(ecPrivateKeyHeader) && + key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter)) + { + keyType = PrivateKeyType.ECDSA; + } + else + { + throw new Exception("The key file path does not exist or key is invalid or key is not supported"); + } + return keyType; + } + #endregion + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs new file mode 100644 index 00000000000..2bd76416004 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs @@ -0,0 +1,37 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// Represents configuration aspects required to interact with the API endpoints. + /// + public interface IApiAccessor + { + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + IReadableConfiguration Configuration { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + string GetBasePath(); + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + ExceptionFactory ExceptionFactory { get; set; } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs new file mode 100644 index 00000000000..601e86d561c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs @@ -0,0 +1,100 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Threading.Tasks; + +namespace Org.OpenAPITools.Client +{ + /// + /// Contract for Asynchronous RESTful API interactions. + /// + /// This interface allows consumers to provide a custom API accessor client. + /// + public interface IAsynchronousClient + { + /// + /// Executes a non-blocking call to some using the GET http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> GetAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the POST http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> PostAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the PUT http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> PutAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the DELETE http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> DeleteAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the HEAD http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> HeadAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the OPTIONS http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> OptionsAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the PATCH http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> PatchAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs new file mode 100644 index 00000000000..b99a151e5bb --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs @@ -0,0 +1,134 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Net; +using System.Security.Cryptography.X509Certificates; + +namespace Org.OpenAPITools.Client +{ + /// + /// Represents a readable-only configuration contract. + /// + public interface IReadableConfiguration + { + /// + /// Gets the access token. + /// + /// Access token. + string AccessToken { get; } + + /// + /// Gets the API key. + /// + /// API key. + IDictionary ApiKey { get; } + + /// + /// Gets the API key prefix. + /// + /// API key prefix. + IDictionary ApiKeyPrefix { get; } + + /// + /// Gets the base path. + /// + /// Base path. + string BasePath { get; } + + /// + /// Gets the date time format. + /// + /// Date time format. + string DateTimeFormat { get; } + + /// + /// Gets the default header. + /// + /// Default header. + [Obsolete("Use DefaultHeaders instead.")] + IDictionary DefaultHeader { get; } + + /// + /// Gets the default headers. + /// + /// Default headers. + IDictionary DefaultHeaders { get; } + + /// + /// Gets the temp folder path. + /// + /// Temp folder path. + string TempFolderPath { get; } + + /// + /// Gets the HTTP connection timeout (in milliseconds) + /// + /// HTTP connection timeout. + int Timeout { get; } + + /// + /// Gets the proxy. + /// + /// Proxy. + WebProxy Proxy { get; } + + /// + /// Gets the user agent. + /// + /// User agent. + string UserAgent { get; } + + /// + /// Gets the username. + /// + /// Username. + string Username { get; } + + /// + /// Gets the password. + /// + /// Password. + string Password { get; } + + /// + /// Get the servers associated with the operation. + /// + /// Operation servers. + IReadOnlyDictionary>> OperationServers { get; } + + /// + /// Gets the API key with prefix. + /// + /// API key identifier (authentication scheme). + /// API key with prefix. + string GetApiKeyWithPrefix(string apiKeyIdentifier); + + /// + /// Gets the Operation server url at the provided index. + /// + /// Operation server name. + /// Index of the operation server settings. + /// + string GetOperationServerUrl(string operation, int index); + + /// + /// Gets certificate collection to be sent with requests. + /// + /// X509 Certificate collection. + X509CertificateCollection ClientCertificates { get; } + + /// + /// Gets the HttpSigning configuration + /// + HttpSigningConfiguration HttpSigningConfiguration { get; } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs new file mode 100644 index 00000000000..0e0a7fedacf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs @@ -0,0 +1,93 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.IO; + +namespace Org.OpenAPITools.Client +{ + /// + /// Contract for Synchronous RESTful API interactions. + /// + /// This interface allows consumers to provide a custom API accessor client. + /// + public interface ISynchronousClient + { + /// + /// Executes a blocking call to some using the GET http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Get(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the POST http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Post(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the PUT http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Put(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the DELETE http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Delete(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the HEAD http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Head(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the OPTIONS http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Options(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the PATCH http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Patch(string path, RequestOptions options, IReadableConfiguration configuration = null); + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs new file mode 100644 index 00000000000..738a64c570b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs @@ -0,0 +1,295 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Org.OpenAPITools.Client +{ + /// + /// A dictionary in which one key has many associated values. + /// + /// The type of the key + /// The type of the value associated with the key. + public class Multimap : IDictionary> + { + #region Private Fields + + private readonly Dictionary> _dictionary; + + #endregion Private Fields + + #region Constructors + + /// + /// Empty Constructor. + /// + public Multimap() + { + _dictionary = new Dictionary>(); + } + + /// + /// Constructor with comparer. + /// + /// + public Multimap(IEqualityComparer comparer) + { + _dictionary = new Dictionary>(comparer); + } + + #endregion Constructors + + #region Enumerators + + /// + /// To get the enumerator. + /// + /// Enumerator + public IEnumerator>> GetEnumerator() + { + return _dictionary.GetEnumerator(); + } + + /// + /// To get the enumerator. + /// + /// Enumerator + IEnumerator IEnumerable.GetEnumerator() + { + return _dictionary.GetEnumerator(); + } + + #endregion Enumerators + + #region Public Members + /// + /// Add values to Multimap + /// + /// Key value pair + public void Add(KeyValuePair> item) + { + if (!TryAdd(item.Key, item.Value)) + throw new InvalidOperationException("Could not add values to Multimap."); + } + + /// + /// Add Multimap to Multimap + /// + /// Multimap + public void Add(Multimap multimap) + { + foreach (var item in multimap) + { + if (!TryAdd(item.Key, item.Value)) + throw new InvalidOperationException("Could not add values to Multimap."); + } + } + + /// + /// Clear Multimap + /// + public void Clear() + { + _dictionary.Clear(); + } + + /// + /// Determines whether Multimap contains the specified item. + /// + /// Key value pair + /// Method needs to be implemented + /// true if the Multimap contains the item; otherwise, false. + public bool Contains(KeyValuePair> item) + { + throw new NotImplementedException(); + } + + /// + /// Copy items of the Multimap to an array, + /// starting at a particular array index. + /// + /// The array that is the destination of the items copied + /// from Multimap. The array must have zero-based indexing. + /// The zero-based index in array at which copying begins. + /// Method needs to be implemented + public void CopyTo(KeyValuePair>[] array, int arrayIndex) + { + throw new NotImplementedException(); + } + + /// + /// Removes the specified item from the Multimap. + /// + /// Key value pair + /// true if the item is successfully removed; otherwise, false. + /// Method needs to be implemented + public bool Remove(KeyValuePair> item) + { + throw new NotImplementedException(); + } + + /// + /// Gets the number of items contained in the Multimap. + /// + public int Count => _dictionary.Count; + + /// + /// Gets a value indicating whether the Multimap is read-only. + /// + public bool IsReadOnly => false; + + /// + /// Adds an item with the provided key and value to the Multimap. + /// + /// The object to use as the key of the item to add. + /// The object to use as the value of the item to add. + /// Thrown when couldn't add the value to Multimap. + public void Add(TKey key, IList value) + { + if (value != null && value.Count > 0) + { + if (_dictionary.TryGetValue(key, out var list)) + { + foreach (var k in value) list.Add(k); + } + else + { + list = new List(value); + if (!TryAdd(key, list)) + throw new InvalidOperationException("Could not add values to Multimap."); + } + } + } + + /// + /// Determines whether the Multimap contains an item with the specified key. + /// + /// The key to locate in the Multimap. + /// true if the Multimap contains an item with + /// the key; otherwise, false. + public bool ContainsKey(TKey key) + { + return _dictionary.ContainsKey(key); + } + + /// + /// Removes item with the specified key from the Multimap. + /// + /// The key to locate in the Multimap. + /// true if the item is successfully removed; otherwise, false. + public bool Remove(TKey key) + { + return TryRemove(key, out var _); + } + + /// + /// Gets the value associated with the specified key. + /// + /// The key whose value to get. + /// When this method returns, the value associated with the specified key, if the + /// key is found; otherwise, the default value for the type of the value parameter. + /// This parameter is passed uninitialized. + /// true if the object that implements Multimap contains + /// an item with the specified key; otherwise, false. + public bool TryGetValue(TKey key, out IList value) + { + return _dictionary.TryGetValue(key, out value); + } + + /// + /// Gets or sets the item with the specified key. + /// + /// The key of the item to get or set. + /// The value of the specified key. + public IList this[TKey key] + { + get => _dictionary[key]; + set => _dictionary[key] = value; + } + + /// + /// Gets a System.Collections.Generic.ICollection containing the keys of the Multimap. + /// + public ICollection Keys => _dictionary.Keys; + + /// + /// Gets a System.Collections.Generic.ICollection containing the values of the Multimap. + /// + public ICollection> Values => _dictionary.Values; + + /// + /// Copy the items of the Multimap to an System.Array, + /// starting at a particular System.Array index. + /// + /// The one-dimensional System.Array that is the destination of the items copied + /// from Multimap. The System.Array must have zero-based indexing. + /// The zero-based index in array at which copying begins. + public void CopyTo(Array array, int index) + { + ((ICollection)_dictionary).CopyTo(array, index); + } + + /// + /// Adds an item with the provided key and value to the Multimap. + /// + /// The object to use as the key of the item to add. + /// The object to use as the value of the item to add. + /// Thrown when couldn't add value to Multimap. + public void Add(TKey key, TValue value) + { + if (value != null) + { + if (_dictionary.TryGetValue(key, out var list)) + { + list.Add(value); + } + else + { + list = new List { value }; + if (!TryAdd(key, list)) + throw new InvalidOperationException("Could not add value to Multimap."); + } + } + } + + #endregion Public Members + + #region Private Members + + /** + * Helper method to encapsulate generator differences between dictionary types. + */ + private bool TryRemove(TKey key, out IList value) + { + _dictionary.TryGetValue(key, out value); + return _dictionary.Remove(key); + } + + /** + * Helper method to encapsulate generator differences between dictionary types. + */ + private bool TryAdd(TKey key, IList value) + { + try + { + _dictionary.Add(key, value); + } + catch (ArgumentException) + { + return false; + } + + return true; + } + #endregion Private Members + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs new file mode 100644 index 00000000000..a5253e58201 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs @@ -0,0 +1,29 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using Newtonsoft.Json.Converters; + +namespace Org.OpenAPITools.Client +{ + /// + /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339 + /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types + /// + public class OpenAPIDateConverter : IsoDateTimeConverter + { + /// + /// Initializes a new instance of the class. + /// + public OpenAPIDateConverter() + { + // full-date = date-fullyear "-" date-month "-" date-mday + DateTimeFormat = "yyyy-MM-dd"; + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs new file mode 100644 index 00000000000..1b85b77bf93 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.IO; +using System.Net; + +namespace Org.OpenAPITools.Client +{ + /// + /// A container for generalized request inputs. This type allows consumers to extend the request functionality + /// by abstracting away from the default (built-in) request framework (e.g. RestSharp). + /// + public class RequestOptions + { + /// + /// Parameters to be bound to path parts of the Request's URL + /// + public Dictionary PathParameters { get; set; } + + /// + /// Query parameters to be applied to the request. + /// Keys may have 1 or more values associated. + /// + public Multimap QueryParameters { get; set; } + + /// + /// Header parameters to be applied to to the request. + /// Keys may have 1 or more values associated. + /// + public Multimap HeaderParameters { get; set; } + + /// + /// Form parameters to be sent along with the request. + /// + public Dictionary FormParameters { get; set; } + + /// + /// Cookies to be sent along with the request. + /// + public List Cookies { get; set; } + + /// + /// Any data associated with a request body. + /// + public Object Data { get; set; } + + /// + /// Constructs a new instance of + /// + public RequestOptions() + { + PathParameters = new Dictionary(); + QueryParameters = new Multimap(); + HeaderParameters = new Multimap(); + FormParameters = new Dictionary(); + Cookies = new List(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs new file mode 100644 index 00000000000..326549d06b3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs @@ -0,0 +1,34 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using UnityEngine.Networking; + +namespace Org.OpenAPITools.Client +{ + // Thrown when a backend doesn't return an expected response based on the expected type + // of the response data. + public class UnexpectedResponseException : Exception + { + public int ErrorCode { get; private set; } + + // NOTE: Cannot keep reference to the request since it will be disposed. + public UnexpectedResponseException(UnityWebRequest request, System.Type type, string extra = "") + : base(CreateMessage(request, type, extra)) + { + ErrorCode = (int)request.responseCode; + } + + private static string CreateMessage(UnityWebRequest request, System.Type type, string extra) + { + return $"httpcode={request.responseCode}, expected {type.Name} but got data: {extra}"; + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs new file mode 100644 index 00000000000..e4af746d7d6 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs @@ -0,0 +1,53 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections.Generic; + +namespace Org.OpenAPITools.Client +{ + /// + /// A URI builder + /// + class WebRequestPathBuilder + { + private string _baseUrl; + private string _path; + private string _query = "?"; + public WebRequestPathBuilder(string baseUrl, string path) + { + _baseUrl = baseUrl; + _path = path; + } + + public void AddPathParameters(Dictionary parameters) + { + foreach (var parameter in parameters) + { + _path = _path.Replace("{" + parameter.Key + "}", Uri.EscapeDataString(parameter.Value)); + } + } + + public void AddQueryParameters(Multimap parameters) + { + foreach (var parameter in parameters) + { + foreach (var value in parameter.Value) + { + _query = _query + parameter.Key + "=" + Uri.EscapeDataString(value) + "&"; + } + } + } + + public string GetFullUri() + { + return _baseUrl + _path + _query.Substring(0, _query.Length - 1); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs new file mode 100644 index 00000000000..b3fc4c3c7a3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs @@ -0,0 +1,76 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; + +namespace Org.OpenAPITools.Model +{ + /// + /// Abstract base class for oneOf, anyOf schemas in the OpenAPI specification + /// + public abstract partial class AbstractOpenAPISchema + { + /// + /// Custom JSON serializer + /// + static public readonly JsonSerializerSettings SerializerSettings = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + MissingMemberHandling = MissingMemberHandling.Error, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + /// + /// Custom JSON serializer for objects with additional properties + /// + static public readonly JsonSerializerSettings AdditionalPropertiesSerializerSettings = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + MissingMemberHandling = MissingMemberHandling.Ignore, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + /// + /// Gets or Sets the actual instance + /// + public abstract Object ActualInstance { get; set; } + + /// + /// Gets or Sets IsNullable to indicate whether the instance is nullable + /// + public bool IsNullable { get; protected set; } + + /// + /// Gets or Sets the schema type, which can be either `oneOf` or `anyOf` + /// + public string SchemaType { get; protected set; } + + /// + /// Converts the instance into JSON string. + /// + public abstract string ToJson(); + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs new file mode 100644 index 00000000000..d232b084eca --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs @@ -0,0 +1,119 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// test map of maps + /// + [DataContract(Name = "Activity")] + public partial class Activity : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// activityOutputs. + public Activity(Dictionary> activityOutputs = default(Dictionary>)) + { + this.ActivityOutputs = activityOutputs; + } + + /// + /// Gets or Sets ActivityOutputs + /// + [DataMember(Name = "activity_outputs", EmitDefaultValue = false)] + public Dictionary> ActivityOutputs { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Activity {\n"); + sb.Append(" ActivityOutputs: ").Append(ActivityOutputs).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Activity); + } + + /// + /// Returns true if Activity instances are equal + /// + /// Instance of Activity to be compared + /// Boolean + public bool Equals(Activity input) + { + if (input == null) + { + return false; + } + return + ( + this.ActivityOutputs == input.ActivityOutputs || + this.ActivityOutputs != null && + input.ActivityOutputs != null && + this.ActivityOutputs.SequenceEqual(input.ActivityOutputs) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActivityOutputs != null) + { + hashCode = (hashCode * 59) + this.ActivityOutputs.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs new file mode 100644 index 00000000000..25d907b0530 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -0,0 +1,136 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ActivityOutputElementRepresentation + /// + [DataContract(Name = "ActivityOutputElementRepresentation")] + public partial class ActivityOutputElementRepresentation : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// prop1. + /// prop2. + public ActivityOutputElementRepresentation(string prop1 = default(string), Object prop2 = default(Object)) + { + this.Prop1 = prop1; + this.Prop2 = prop2; + } + + /// + /// Gets or Sets Prop1 + /// + [DataMember(Name = "prop1", EmitDefaultValue = false)] + public string Prop1 { get; set; } + + /// + /// Gets or Sets Prop2 + /// + [DataMember(Name = "prop2", EmitDefaultValue = false)] + public Object Prop2 { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ActivityOutputElementRepresentation {\n"); + sb.Append(" Prop1: ").Append(Prop1).Append("\n"); + sb.Append(" Prop2: ").Append(Prop2).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ActivityOutputElementRepresentation); + } + + /// + /// Returns true if ActivityOutputElementRepresentation instances are equal + /// + /// Instance of ActivityOutputElementRepresentation to be compared + /// Boolean + public bool Equals(ActivityOutputElementRepresentation input) + { + if (input == null) + { + return false; + } + return + ( + this.Prop1 == input.Prop1 || + (this.Prop1 != null && + this.Prop1.Equals(input.Prop1)) + ) && + ( + this.Prop2 == input.Prop2 || + (this.Prop2 != null && + this.Prop2.Equals(input.Prop2)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Prop1 != null) + { + hashCode = (hashCode * 59) + this.Prop1.GetHashCode(); + } + if (this.Prop2 != null) + { + hashCode = (hashCode * 59) + this.Prop2.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs new file mode 100644 index 00000000000..1e8c482df26 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -0,0 +1,249 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// AdditionalPropertiesClass + /// + [DataContract(Name = "AdditionalPropertiesClass")] + public partial class AdditionalPropertiesClass : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// mapProperty. + /// mapOfMapProperty. + /// anytype1. + /// mapWithUndeclaredPropertiesAnytype1. + /// mapWithUndeclaredPropertiesAnytype2. + /// mapWithUndeclaredPropertiesAnytype3. + /// an object with no declared properties and no undeclared properties, hence it's an empty map.. + /// mapWithUndeclaredPropertiesString. + public AdditionalPropertiesClass(Dictionary mapProperty = default(Dictionary), Dictionary> mapOfMapProperty = default(Dictionary>), Object anytype1 = default(Object), Object mapWithUndeclaredPropertiesAnytype1 = default(Object), Object mapWithUndeclaredPropertiesAnytype2 = default(Object), Dictionary mapWithUndeclaredPropertiesAnytype3 = default(Dictionary), Object emptyMap = default(Object), Dictionary mapWithUndeclaredPropertiesString = default(Dictionary)) + { + this.MapProperty = mapProperty; + this.MapOfMapProperty = mapOfMapProperty; + this.Anytype1 = anytype1; + this.MapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1; + this.MapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2; + this.MapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3; + this.EmptyMap = emptyMap; + this.MapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString; + } + + /// + /// Gets or Sets MapProperty + /// + [DataMember(Name = "map_property", EmitDefaultValue = false)] + public Dictionary MapProperty { get; set; } + + /// + /// Gets or Sets MapOfMapProperty + /// + [DataMember(Name = "map_of_map_property", EmitDefaultValue = false)] + public Dictionary> MapOfMapProperty { get; set; } + + /// + /// Gets or Sets Anytype1 + /// + [DataMember(Name = "anytype_1", EmitDefaultValue = true)] + public Object Anytype1 { get; set; } + + /// + /// Gets or Sets MapWithUndeclaredPropertiesAnytype1 + /// + [DataMember(Name = "map_with_undeclared_properties_anytype_1", EmitDefaultValue = false)] + public Object MapWithUndeclaredPropertiesAnytype1 { get; set; } + + /// + /// Gets or Sets MapWithUndeclaredPropertiesAnytype2 + /// + [DataMember(Name = "map_with_undeclared_properties_anytype_2", EmitDefaultValue = false)] + public Object MapWithUndeclaredPropertiesAnytype2 { get; set; } + + /// + /// Gets or Sets MapWithUndeclaredPropertiesAnytype3 + /// + [DataMember(Name = "map_with_undeclared_properties_anytype_3", EmitDefaultValue = false)] + public Dictionary MapWithUndeclaredPropertiesAnytype3 { get; set; } + + /// + /// an object with no declared properties and no undeclared properties, hence it's an empty map. + /// + /// an object with no declared properties and no undeclared properties, hence it's an empty map. + [DataMember(Name = "empty_map", EmitDefaultValue = false)] + public Object EmptyMap { get; set; } + + /// + /// Gets or Sets MapWithUndeclaredPropertiesString + /// + [DataMember(Name = "map_with_undeclared_properties_string", EmitDefaultValue = false)] + public Dictionary MapWithUndeclaredPropertiesString { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AdditionalPropertiesClass {\n"); + sb.Append(" MapProperty: ").Append(MapProperty).Append("\n"); + sb.Append(" MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n"); + sb.Append(" Anytype1: ").Append(Anytype1).Append("\n"); + sb.Append(" MapWithUndeclaredPropertiesAnytype1: ").Append(MapWithUndeclaredPropertiesAnytype1).Append("\n"); + sb.Append(" MapWithUndeclaredPropertiesAnytype2: ").Append(MapWithUndeclaredPropertiesAnytype2).Append("\n"); + sb.Append(" MapWithUndeclaredPropertiesAnytype3: ").Append(MapWithUndeclaredPropertiesAnytype3).Append("\n"); + sb.Append(" EmptyMap: ").Append(EmptyMap).Append("\n"); + sb.Append(" MapWithUndeclaredPropertiesString: ").Append(MapWithUndeclaredPropertiesString).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as AdditionalPropertiesClass); + } + + /// + /// Returns true if AdditionalPropertiesClass instances are equal + /// + /// Instance of AdditionalPropertiesClass to be compared + /// Boolean + public bool Equals(AdditionalPropertiesClass input) + { + if (input == null) + { + return false; + } + return + ( + this.MapProperty == input.MapProperty || + this.MapProperty != null && + input.MapProperty != null && + this.MapProperty.SequenceEqual(input.MapProperty) + ) && + ( + this.MapOfMapProperty == input.MapOfMapProperty || + this.MapOfMapProperty != null && + input.MapOfMapProperty != null && + this.MapOfMapProperty.SequenceEqual(input.MapOfMapProperty) + ) && + ( + this.Anytype1 == input.Anytype1 || + (this.Anytype1 != null && + this.Anytype1.Equals(input.Anytype1)) + ) && + ( + this.MapWithUndeclaredPropertiesAnytype1 == input.MapWithUndeclaredPropertiesAnytype1 || + (this.MapWithUndeclaredPropertiesAnytype1 != null && + this.MapWithUndeclaredPropertiesAnytype1.Equals(input.MapWithUndeclaredPropertiesAnytype1)) + ) && + ( + this.MapWithUndeclaredPropertiesAnytype2 == input.MapWithUndeclaredPropertiesAnytype2 || + (this.MapWithUndeclaredPropertiesAnytype2 != null && + this.MapWithUndeclaredPropertiesAnytype2.Equals(input.MapWithUndeclaredPropertiesAnytype2)) + ) && + ( + this.MapWithUndeclaredPropertiesAnytype3 == input.MapWithUndeclaredPropertiesAnytype3 || + this.MapWithUndeclaredPropertiesAnytype3 != null && + input.MapWithUndeclaredPropertiesAnytype3 != null && + this.MapWithUndeclaredPropertiesAnytype3.SequenceEqual(input.MapWithUndeclaredPropertiesAnytype3) + ) && + ( + this.EmptyMap == input.EmptyMap || + (this.EmptyMap != null && + this.EmptyMap.Equals(input.EmptyMap)) + ) && + ( + this.MapWithUndeclaredPropertiesString == input.MapWithUndeclaredPropertiesString || + this.MapWithUndeclaredPropertiesString != null && + input.MapWithUndeclaredPropertiesString != null && + this.MapWithUndeclaredPropertiesString.SequenceEqual(input.MapWithUndeclaredPropertiesString) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.MapProperty != null) + { + hashCode = (hashCode * 59) + this.MapProperty.GetHashCode(); + } + if (this.MapOfMapProperty != null) + { + hashCode = (hashCode * 59) + this.MapOfMapProperty.GetHashCode(); + } + if (this.Anytype1 != null) + { + hashCode = (hashCode * 59) + this.Anytype1.GetHashCode(); + } + if (this.MapWithUndeclaredPropertiesAnytype1 != null) + { + hashCode = (hashCode * 59) + this.MapWithUndeclaredPropertiesAnytype1.GetHashCode(); + } + if (this.MapWithUndeclaredPropertiesAnytype2 != null) + { + hashCode = (hashCode * 59) + this.MapWithUndeclaredPropertiesAnytype2.GetHashCode(); + } + if (this.MapWithUndeclaredPropertiesAnytype3 != null) + { + hashCode = (hashCode * 59) + this.MapWithUndeclaredPropertiesAnytype3.GetHashCode(); + } + if (this.EmptyMap != null) + { + hashCode = (hashCode * 59) + this.EmptyMap.GetHashCode(); + } + if (this.MapWithUndeclaredPropertiesString != null) + { + hashCode = (hashCode * 59) + this.MapWithUndeclaredPropertiesString.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs new file mode 100644 index 00000000000..543f842e5c4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs @@ -0,0 +1,147 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Animal + /// + [DataContract(Name = "Animal")] + public partial class Animal : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Animal() { } + /// + /// Initializes a new instance of the class. + /// + /// className (required). + /// color (default to "red"). + public Animal(string className = default(string), string color = "red") + { + // to ensure "className" is required (not null) + if (className == null) + { + throw new ArgumentNullException("className is a required property for Animal and cannot be null"); + } + this.ClassName = className; + // use default value if no "color" provided + this.Color = color ?? "red"; + } + + /// + /// Gets or Sets ClassName + /// + [DataMember(Name = "className", IsRequired = true, EmitDefaultValue = true)] + public string ClassName { get; set; } + + /// + /// Gets or Sets Color + /// + [DataMember(Name = "color", EmitDefaultValue = false)] + public string Color { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Animal {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append(" Color: ").Append(Color).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Animal); + } + + /// + /// Returns true if Animal instances are equal + /// + /// Instance of Animal to be compared + /// Boolean + public bool Equals(Animal input) + { + if (input == null) + { + return false; + } + return + ( + this.ClassName == input.ClassName || + (this.ClassName != null && + this.ClassName.Equals(input.ClassName)) + ) && + ( + this.Color == input.Color || + (this.Color != null && + this.Color.Equals(input.Color)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ClassName != null) + { + hashCode = (hashCode * 59) + this.ClassName.GetHashCode(); + } + if (this.Color != null) + { + hashCode = (hashCode * 59) + this.Color.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs new file mode 100644 index 00000000000..4d83d2d347b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -0,0 +1,150 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ApiResponse + /// + [DataContract(Name = "ApiResponse")] + public partial class ApiResponse : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// code. + /// type. + /// message. + public ApiResponse(int code = default(int), string type = default(string), string message = default(string)) + { + this.Code = code; + this.Type = type; + this.Message = message; + } + + /// + /// Gets or Sets Code + /// + [DataMember(Name = "code", EmitDefaultValue = false)] + public int Code { get; set; } + + /// + /// Gets or Sets Type + /// + [DataMember(Name = "type", EmitDefaultValue = false)] + public string Type { get; set; } + + /// + /// Gets or Sets Message + /// + [DataMember(Name = "message", EmitDefaultValue = false)] + public string Message { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ApiResponse {\n"); + sb.Append(" Code: ").Append(Code).Append("\n"); + sb.Append(" Type: ").Append(Type).Append("\n"); + sb.Append(" Message: ").Append(Message).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ApiResponse); + } + + /// + /// Returns true if ApiResponse instances are equal + /// + /// Instance of ApiResponse to be compared + /// Boolean + public bool Equals(ApiResponse input) + { + if (input == null) + { + return false; + } + return + ( + this.Code == input.Code || + this.Code.Equals(input.Code) + ) && + ( + this.Type == input.Type || + (this.Type != null && + this.Type.Equals(input.Type)) + ) && + ( + this.Message == input.Message || + (this.Message != null && + this.Message.Equals(input.Message)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Code.GetHashCode(); + if (this.Type != null) + { + hashCode = (hashCode * 59) + this.Type.GetHashCode(); + } + if (this.Message != null) + { + hashCode = (hashCode * 59) + this.Message.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs new file mode 100644 index 00000000000..2d5c1d394cd --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs @@ -0,0 +1,136 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Apple + /// + [DataContract(Name = "apple")] + public partial class Apple : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// cultivar. + /// origin. + public Apple(string cultivar = default(string), string origin = default(string)) + { + this.Cultivar = cultivar; + this.Origin = origin; + } + + /// + /// Gets or Sets Cultivar + /// + [DataMember(Name = "cultivar", EmitDefaultValue = false)] + public string Cultivar { get; set; } + + /// + /// Gets or Sets Origin + /// + [DataMember(Name = "origin", EmitDefaultValue = false)] + public string Origin { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Apple {\n"); + sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); + sb.Append(" Origin: ").Append(Origin).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Apple); + } + + /// + /// Returns true if Apple instances are equal + /// + /// Instance of Apple to be compared + /// Boolean + public bool Equals(Apple input) + { + if (input == null) + { + return false; + } + return + ( + this.Cultivar == input.Cultivar || + (this.Cultivar != null && + this.Cultivar.Equals(input.Cultivar)) + ) && + ( + this.Origin == input.Origin || + (this.Origin != null && + this.Origin.Equals(input.Origin)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Cultivar != null) + { + hashCode = (hashCode * 59) + this.Cultivar.GetHashCode(); + } + if (this.Origin != null) + { + hashCode = (hashCode * 59) + this.Origin.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs new file mode 100644 index 00000000000..4b7a3084bd0 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs @@ -0,0 +1,142 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// AppleReq + /// + [DataContract(Name = "appleReq")] + public partial class AppleReq : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected AppleReq() { } + /// + /// Initializes a new instance of the class. + /// + /// cultivar (required). + /// mealy. + public AppleReq(string cultivar = default(string), bool mealy = default(bool)) + { + // to ensure "cultivar" is required (not null) + if (cultivar == null) + { + throw new ArgumentNullException("cultivar is a required property for AppleReq and cannot be null"); + } + this.Cultivar = cultivar; + this.Mealy = mealy; + } + + /// + /// Gets or Sets Cultivar + /// + [DataMember(Name = "cultivar", IsRequired = true, EmitDefaultValue = true)] + public string Cultivar { get; set; } + + /// + /// Gets or Sets Mealy + /// + [DataMember(Name = "mealy", EmitDefaultValue = true)] + public bool Mealy { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class AppleReq {\n"); + sb.Append(" Cultivar: ").Append(Cultivar).Append("\n"); + sb.Append(" Mealy: ").Append(Mealy).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as AppleReq); + } + + /// + /// Returns true if AppleReq instances are equal + /// + /// Instance of AppleReq to be compared + /// Boolean + public bool Equals(AppleReq input) + { + if (input == null) + { + return false; + } + return + ( + this.Cultivar == input.Cultivar || + (this.Cultivar != null && + this.Cultivar.Equals(input.Cultivar)) + ) && + ( + this.Mealy == input.Mealy || + this.Mealy.Equals(input.Mealy) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Cultivar != null) + { + hashCode = (hashCode * 59) + this.Cultivar.GetHashCode(); + } + hashCode = (hashCode * 59) + this.Mealy.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs new file mode 100644 index 00000000000..b6f5ac66d2f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -0,0 +1,119 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ArrayOfArrayOfNumberOnly + /// + [DataContract(Name = "ArrayOfArrayOfNumberOnly")] + public partial class ArrayOfArrayOfNumberOnly : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// arrayArrayNumber. + public ArrayOfArrayOfNumberOnly(List> arrayArrayNumber = default(List>)) + { + this.ArrayArrayNumber = arrayArrayNumber; + } + + /// + /// Gets or Sets ArrayArrayNumber + /// + [DataMember(Name = "ArrayArrayNumber", EmitDefaultValue = false)] + public List> ArrayArrayNumber { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ArrayOfArrayOfNumberOnly {\n"); + sb.Append(" ArrayArrayNumber: ").Append(ArrayArrayNumber).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ArrayOfArrayOfNumberOnly); + } + + /// + /// Returns true if ArrayOfArrayOfNumberOnly instances are equal + /// + /// Instance of ArrayOfArrayOfNumberOnly to be compared + /// Boolean + public bool Equals(ArrayOfArrayOfNumberOnly input) + { + if (input == null) + { + return false; + } + return + ( + this.ArrayArrayNumber == input.ArrayArrayNumber || + this.ArrayArrayNumber != null && + input.ArrayArrayNumber != null && + this.ArrayArrayNumber.SequenceEqual(input.ArrayArrayNumber) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ArrayArrayNumber != null) + { + hashCode = (hashCode * 59) + this.ArrayArrayNumber.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs new file mode 100644 index 00000000000..78d77d41a43 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -0,0 +1,119 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ArrayOfNumberOnly + /// + [DataContract(Name = "ArrayOfNumberOnly")] + public partial class ArrayOfNumberOnly : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// arrayNumber. + public ArrayOfNumberOnly(List arrayNumber = default(List)) + { + this.ArrayNumber = arrayNumber; + } + + /// + /// Gets or Sets ArrayNumber + /// + [DataMember(Name = "ArrayNumber", EmitDefaultValue = false)] + public List ArrayNumber { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ArrayOfNumberOnly {\n"); + sb.Append(" ArrayNumber: ").Append(ArrayNumber).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ArrayOfNumberOnly); + } + + /// + /// Returns true if ArrayOfNumberOnly instances are equal + /// + /// Instance of ArrayOfNumberOnly to be compared + /// Boolean + public bool Equals(ArrayOfNumberOnly input) + { + if (input == null) + { + return false; + } + return + ( + this.ArrayNumber == input.ArrayNumber || + this.ArrayNumber != null && + input.ArrayNumber != null && + this.ArrayNumber.SequenceEqual(input.ArrayNumber) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ArrayNumber != null) + { + hashCode = (hashCode * 59) + this.ArrayNumber.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs new file mode 100644 index 00000000000..652ab86bd19 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -0,0 +1,157 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ArrayTest + /// + [DataContract(Name = "ArrayTest")] + public partial class ArrayTest : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// arrayOfString. + /// arrayArrayOfInteger. + /// arrayArrayOfModel. + public ArrayTest(List arrayOfString = default(List), List> arrayArrayOfInteger = default(List>), List> arrayArrayOfModel = default(List>)) + { + this.ArrayOfString = arrayOfString; + this.ArrayArrayOfInteger = arrayArrayOfInteger; + this.ArrayArrayOfModel = arrayArrayOfModel; + } + + /// + /// Gets or Sets ArrayOfString + /// + [DataMember(Name = "array_of_string", EmitDefaultValue = false)] + public List ArrayOfString { get; set; } + + /// + /// Gets or Sets ArrayArrayOfInteger + /// + [DataMember(Name = "array_array_of_integer", EmitDefaultValue = false)] + public List> ArrayArrayOfInteger { get; set; } + + /// + /// Gets or Sets ArrayArrayOfModel + /// + [DataMember(Name = "array_array_of_model", EmitDefaultValue = false)] + public List> ArrayArrayOfModel { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ArrayTest {\n"); + sb.Append(" ArrayOfString: ").Append(ArrayOfString).Append("\n"); + sb.Append(" ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n"); + sb.Append(" ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ArrayTest); + } + + /// + /// Returns true if ArrayTest instances are equal + /// + /// Instance of ArrayTest to be compared + /// Boolean + public bool Equals(ArrayTest input) + { + if (input == null) + { + return false; + } + return + ( + this.ArrayOfString == input.ArrayOfString || + this.ArrayOfString != null && + input.ArrayOfString != null && + this.ArrayOfString.SequenceEqual(input.ArrayOfString) + ) && + ( + this.ArrayArrayOfInteger == input.ArrayArrayOfInteger || + this.ArrayArrayOfInteger != null && + input.ArrayArrayOfInteger != null && + this.ArrayArrayOfInteger.SequenceEqual(input.ArrayArrayOfInteger) + ) && + ( + this.ArrayArrayOfModel == input.ArrayArrayOfModel || + this.ArrayArrayOfModel != null && + input.ArrayArrayOfModel != null && + this.ArrayArrayOfModel.SequenceEqual(input.ArrayArrayOfModel) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ArrayOfString != null) + { + hashCode = (hashCode * 59) + this.ArrayOfString.GetHashCode(); + } + if (this.ArrayArrayOfInteger != null) + { + hashCode = (hashCode * 59) + this.ArrayArrayOfInteger.GetHashCode(); + } + if (this.ArrayArrayOfModel != null) + { + hashCode = (hashCode * 59) + this.ArrayArrayOfModel.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs new file mode 100644 index 00000000000..b31a453f9e8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs @@ -0,0 +1,114 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Banana + /// + [DataContract(Name = "banana")] + public partial class Banana : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// lengthCm. + public Banana(decimal lengthCm = default(decimal)) + { + this.LengthCm = lengthCm; + } + + /// + /// Gets or Sets LengthCm + /// + [DataMember(Name = "lengthCm", EmitDefaultValue = false)] + public decimal LengthCm { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Banana {\n"); + sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Banana); + } + + /// + /// Returns true if Banana instances are equal + /// + /// Instance of Banana to be compared + /// Boolean + public bool Equals(Banana input) + { + if (input == null) + { + return false; + } + return + ( + this.LengthCm == input.LengthCm || + this.LengthCm.Equals(input.LengthCm) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.LengthCm.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs new file mode 100644 index 00000000000..2f73ada806c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs @@ -0,0 +1,133 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// BananaReq + /// + [DataContract(Name = "bananaReq")] + public partial class BananaReq : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected BananaReq() { } + /// + /// Initializes a new instance of the class. + /// + /// lengthCm (required). + /// sweet. + public BananaReq(decimal lengthCm = default(decimal), bool sweet = default(bool)) + { + this.LengthCm = lengthCm; + this.Sweet = sweet; + } + + /// + /// Gets or Sets LengthCm + /// + [DataMember(Name = "lengthCm", IsRequired = true, EmitDefaultValue = true)] + public decimal LengthCm { get; set; } + + /// + /// Gets or Sets Sweet + /// + [DataMember(Name = "sweet", EmitDefaultValue = true)] + public bool Sweet { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class BananaReq {\n"); + sb.Append(" LengthCm: ").Append(LengthCm).Append("\n"); + sb.Append(" Sweet: ").Append(Sweet).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as BananaReq); + } + + /// + /// Returns true if BananaReq instances are equal + /// + /// Instance of BananaReq to be compared + /// Boolean + public bool Equals(BananaReq input) + { + if (input == null) + { + return false; + } + return + ( + this.LengthCm == input.LengthCm || + this.LengthCm.Equals(input.LengthCm) + ) && + ( + this.Sweet == input.Sweet || + this.Sweet.Equals(input.Sweet) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.LengthCm.GetHashCode(); + hashCode = (hashCode * 59) + this.Sweet.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs new file mode 100644 index 00000000000..2a9aa95af51 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs @@ -0,0 +1,128 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// BasquePig + /// + [DataContract(Name = "BasquePig")] + public partial class BasquePig : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected BasquePig() { } + /// + /// Initializes a new instance of the class. + /// + /// className (required). + public BasquePig(string className = default(string)) + { + // to ensure "className" is required (not null) + if (className == null) + { + throw new ArgumentNullException("className is a required property for BasquePig and cannot be null"); + } + this.ClassName = className; + } + + /// + /// Gets or Sets ClassName + /// + [DataMember(Name = "className", IsRequired = true, EmitDefaultValue = true)] + public string ClassName { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class BasquePig {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as BasquePig); + } + + /// + /// Returns true if BasquePig instances are equal + /// + /// Instance of BasquePig to be compared + /// Boolean + public bool Equals(BasquePig input) + { + if (input == null) + { + return false; + } + return + ( + this.ClassName == input.ClassName || + (this.ClassName != null && + this.ClassName.Equals(input.ClassName)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ClassName != null) + { + hashCode = (hashCode * 59) + this.ClassName.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs new file mode 100644 index 00000000000..20dd579a914 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs @@ -0,0 +1,209 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Capitalization + /// + [DataContract(Name = "Capitalization")] + public partial class Capitalization : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// smallCamel. + /// capitalCamel. + /// smallSnake. + /// capitalSnake. + /// sCAETHFlowPoints. + /// Name of the pet . + public Capitalization(string smallCamel = default(string), string capitalCamel = default(string), string smallSnake = default(string), string capitalSnake = default(string), string sCAETHFlowPoints = default(string), string aTTNAME = default(string)) + { + this.SmallCamel = smallCamel; + this.CapitalCamel = capitalCamel; + this.SmallSnake = smallSnake; + this.CapitalSnake = capitalSnake; + this.SCAETHFlowPoints = sCAETHFlowPoints; + this.ATT_NAME = aTTNAME; + } + + /// + /// Gets or Sets SmallCamel + /// + [DataMember(Name = "smallCamel", EmitDefaultValue = false)] + public string SmallCamel { get; set; } + + /// + /// Gets or Sets CapitalCamel + /// + [DataMember(Name = "CapitalCamel", EmitDefaultValue = false)] + public string CapitalCamel { get; set; } + + /// + /// Gets or Sets SmallSnake + /// + [DataMember(Name = "small_Snake", EmitDefaultValue = false)] + public string SmallSnake { get; set; } + + /// + /// Gets or Sets CapitalSnake + /// + [DataMember(Name = "Capital_Snake", EmitDefaultValue = false)] + public string CapitalSnake { get; set; } + + /// + /// Gets or Sets SCAETHFlowPoints + /// + [DataMember(Name = "SCA_ETH_Flow_Points", EmitDefaultValue = false)] + public string SCAETHFlowPoints { get; set; } + + /// + /// Name of the pet + /// + /// Name of the pet + [DataMember(Name = "ATT_NAME", EmitDefaultValue = false)] + public string ATT_NAME { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Capitalization {\n"); + sb.Append(" SmallCamel: ").Append(SmallCamel).Append("\n"); + sb.Append(" CapitalCamel: ").Append(CapitalCamel).Append("\n"); + sb.Append(" SmallSnake: ").Append(SmallSnake).Append("\n"); + sb.Append(" CapitalSnake: ").Append(CapitalSnake).Append("\n"); + sb.Append(" SCAETHFlowPoints: ").Append(SCAETHFlowPoints).Append("\n"); + sb.Append(" ATT_NAME: ").Append(ATT_NAME).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Capitalization); + } + + /// + /// Returns true if Capitalization instances are equal + /// + /// Instance of Capitalization to be compared + /// Boolean + public bool Equals(Capitalization input) + { + if (input == null) + { + return false; + } + return + ( + this.SmallCamel == input.SmallCamel || + (this.SmallCamel != null && + this.SmallCamel.Equals(input.SmallCamel)) + ) && + ( + this.CapitalCamel == input.CapitalCamel || + (this.CapitalCamel != null && + this.CapitalCamel.Equals(input.CapitalCamel)) + ) && + ( + this.SmallSnake == input.SmallSnake || + (this.SmallSnake != null && + this.SmallSnake.Equals(input.SmallSnake)) + ) && + ( + this.CapitalSnake == input.CapitalSnake || + (this.CapitalSnake != null && + this.CapitalSnake.Equals(input.CapitalSnake)) + ) && + ( + this.SCAETHFlowPoints == input.SCAETHFlowPoints || + (this.SCAETHFlowPoints != null && + this.SCAETHFlowPoints.Equals(input.SCAETHFlowPoints)) + ) && + ( + this.ATT_NAME == input.ATT_NAME || + (this.ATT_NAME != null && + this.ATT_NAME.Equals(input.ATT_NAME)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.SmallCamel != null) + { + hashCode = (hashCode * 59) + this.SmallCamel.GetHashCode(); + } + if (this.CapitalCamel != null) + { + hashCode = (hashCode * 59) + this.CapitalCamel.GetHashCode(); + } + if (this.SmallSnake != null) + { + hashCode = (hashCode * 59) + this.SmallSnake.GetHashCode(); + } + if (this.CapitalSnake != null) + { + hashCode = (hashCode * 59) + this.CapitalSnake.GetHashCode(); + } + if (this.SCAETHFlowPoints != null) + { + hashCode = (hashCode * 59) + this.SCAETHFlowPoints.GetHashCode(); + } + if (this.ATT_NAME != null) + { + hashCode = (hashCode * 59) + this.ATT_NAME.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs new file mode 100644 index 00000000000..467db4f788e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs @@ -0,0 +1,122 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Cat + /// + [DataContract(Name = "Cat")] + public partial class Cat : Animal, IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Cat() { } + /// + /// Initializes a new instance of the class. + /// + /// declawed. + /// className (required) (default to "Cat"). + /// color (default to "red"). + public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + { + this.Declawed = declawed; + } + + /// + /// Gets or Sets Declawed + /// + [DataMember(Name = "declawed", EmitDefaultValue = true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Cat {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Cat); + } + + /// + /// Returns true if Cat instances are equal + /// + /// Instance of Cat to be compared + /// Boolean + public bool Equals(Cat input) + { + if (input == null) + { + return false; + } + return base.Equals(input) && + ( + this.Declawed == input.Declawed || + this.Declawed.Equals(input.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + hashCode = (hashCode * 59) + this.Declawed.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs new file mode 100644 index 00000000000..b93f50ff231 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -0,0 +1,114 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// CatAllOf + /// + [DataContract(Name = "Cat_allOf")] + public partial class CatAllOf : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// declawed. + public CatAllOf(bool declawed = default(bool)) + { + this.Declawed = declawed; + } + + /// + /// Gets or Sets Declawed + /// + [DataMember(Name = "declawed", EmitDefaultValue = true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as CatAllOf); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf input) + { + if (input == null) + { + return false; + } + return + ( + this.Declawed == input.Declawed || + this.Declawed.Equals(input.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Declawed.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs new file mode 100644 index 00000000000..2d9702a6d7f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs @@ -0,0 +1,142 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Category + /// + [DataContract(Name = "Category")] + public partial class Category : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Category() { } + /// + /// Initializes a new instance of the class. + /// + /// id. + /// name (required) (default to "default-name"). + public Category(long id = default(long), string name = "default-name") + { + // to ensure "name" is required (not null) + if (name == null) + { + throw new ArgumentNullException("name is a required property for Category and cannot be null"); + } + this.Name = name; + this.Id = id; + } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + public long Id { get; set; } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Category {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Category); + } + + /// + /// Returns true if Category instances are equal + /// + /// Instance of Category to be compared + /// Boolean + public bool Equals(Category input) + { + if (input == null) + { + return false; + } + return + ( + this.Id == input.Id || + this.Id.Equals(input.Id) + ) && + ( + this.Name == input.Name || + (this.Name != null && + this.Name.Equals(input.Name)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Id.GetHashCode(); + if (this.Name != null) + { + hashCode = (hashCode * 59) + this.Name.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs new file mode 100644 index 00000000000..df508441ee6 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs @@ -0,0 +1,147 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ChildCat + /// + [DataContract(Name = "ChildCat")] + public partial class ChildCat : ParentPet, IEquatable + { + /// + /// Defines PetType + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum PetTypeEnum + { + /// + /// Enum ChildCat for value: ChildCat + /// + [EnumMember(Value = "ChildCat")] + ChildCat = 1 + + } + + + /// + /// Gets or Sets PetType + /// + [DataMember(Name = "pet_type", EmitDefaultValue = false)] + public PetTypeEnum? PetType { get; set; } + /// + /// Initializes a new instance of the class. + /// + /// name. + /// petType (default to PetTypeEnum.ChildCat). + public ChildCat(string name = default(string), PetTypeEnum? petType = PetTypeEnum.ChildCat) : base() + { + this.Name = name; + this.PetType = petType; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", EmitDefaultValue = false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ChildCat {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PetType: ").Append(PetType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ChildCat); + } + + /// + /// Returns true if ChildCat instances are equal + /// + /// Instance of ChildCat to be compared + /// Boolean + public bool Equals(ChildCat input) + { + if (input == null) + { + return false; + } + return base.Equals(input) && + ( + this.Name == input.Name || + (this.Name != null && + this.Name.Equals(input.Name)) + ) && base.Equals(input) && + ( + this.PetType == input.PetType || + this.PetType.Equals(input.PetType) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Name != null) + { + hashCode = (hashCode * 59) + this.Name.GetHashCode(); + } + hashCode = (hashCode * 59) + this.PetType.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs new file mode 100644 index 00000000000..0a23f149b03 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -0,0 +1,146 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ChildCatAllOf + /// + [DataContract(Name = "ChildCat_allOf")] + public partial class ChildCatAllOf : IEquatable + { + /// + /// Defines PetType + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum PetTypeEnum + { + /// + /// Enum ChildCat for value: ChildCat + /// + [EnumMember(Value = "ChildCat")] + ChildCat = 1 + + } + + + /// + /// Gets or Sets PetType + /// + [DataMember(Name = "pet_type", EmitDefaultValue = false)] + public PetTypeEnum? PetType { get; set; } + /// + /// Initializes a new instance of the class. + /// + /// name. + /// petType (default to PetTypeEnum.ChildCat). + public ChildCatAllOf(string name = default(string), PetTypeEnum? petType = PetTypeEnum.ChildCat) + { + this.Name = name; + this.PetType = petType; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", EmitDefaultValue = false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ChildCatAllOf {\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PetType: ").Append(PetType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ChildCatAllOf); + } + + /// + /// Returns true if ChildCatAllOf instances are equal + /// + /// Instance of ChildCatAllOf to be compared + /// Boolean + public bool Equals(ChildCatAllOf input) + { + if (input == null) + { + return false; + } + return + ( + this.Name == input.Name || + (this.Name != null && + this.Name.Equals(input.Name)) + ) && + ( + this.PetType == input.PetType || + this.PetType.Equals(input.PetType) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Name != null) + { + hashCode = (hashCode * 59) + this.Name.GetHashCode(); + } + hashCode = (hashCode * 59) + this.PetType.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs new file mode 100644 index 00000000000..2f97843fe7d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Model for testing model with \"_class\" property + /// + [DataContract(Name = "ClassModel")] + public partial class ClassModel : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// _class. + public ClassModel(string _class = default(string)) + { + this.Class = _class; + } + + /// + /// Gets or Sets Class + /// + [DataMember(Name = "_class", EmitDefaultValue = false)] + public string Class { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ClassModel {\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ClassModel); + } + + /// + /// Returns true if ClassModel instances are equal + /// + /// Instance of ClassModel to be compared + /// Boolean + public bool Equals(ClassModel input) + { + if (input == null) + { + return false; + } + return + ( + this.Class == input.Class || + (this.Class != null && + this.Class.Equals(input.Class)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Class != null) + { + hashCode = (hashCode * 59) + this.Class.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs new file mode 100644 index 00000000000..3dad8a4a0ba --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -0,0 +1,151 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ComplexQuadrilateral + /// + [DataContract(Name = "ComplexQuadrilateral")] + public partial class ComplexQuadrilateral : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected ComplexQuadrilateral() { } + /// + /// Initializes a new instance of the class. + /// + /// shapeType (required). + /// quadrilateralType (required). + public ComplexQuadrilateral(string shapeType = default(string), string quadrilateralType = default(string)) + { + // to ensure "shapeType" is required (not null) + if (shapeType == null) + { + throw new ArgumentNullException("shapeType is a required property for ComplexQuadrilateral and cannot be null"); + } + this.ShapeType = shapeType; + // to ensure "quadrilateralType" is required (not null) + if (quadrilateralType == null) + { + throw new ArgumentNullException("quadrilateralType is a required property for ComplexQuadrilateral and cannot be null"); + } + this.QuadrilateralType = quadrilateralType; + } + + /// + /// Gets or Sets ShapeType + /// + [DataMember(Name = "shapeType", IsRequired = true, EmitDefaultValue = true)] + public string ShapeType { get; set; } + + /// + /// Gets or Sets QuadrilateralType + /// + [DataMember(Name = "quadrilateralType", IsRequired = true, EmitDefaultValue = true)] + public string QuadrilateralType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ComplexQuadrilateral {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ComplexQuadrilateral); + } + + /// + /// Returns true if ComplexQuadrilateral instances are equal + /// + /// Instance of ComplexQuadrilateral to be compared + /// Boolean + public bool Equals(ComplexQuadrilateral input) + { + if (input == null) + { + return false; + } + return + ( + this.ShapeType == input.ShapeType || + (this.ShapeType != null && + this.ShapeType.Equals(input.ShapeType)) + ) && + ( + this.QuadrilateralType == input.QuadrilateralType || + (this.QuadrilateralType != null && + this.QuadrilateralType.Equals(input.QuadrilateralType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ShapeType != null) + { + hashCode = (hashCode * 59) + this.ShapeType.GetHashCode(); + } + if (this.QuadrilateralType != null) + { + hashCode = (hashCode * 59) + this.QuadrilateralType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs new file mode 100644 index 00000000000..23e9e1f7ffb --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs @@ -0,0 +1,128 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// DanishPig + /// + [DataContract(Name = "DanishPig")] + public partial class DanishPig : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected DanishPig() { } + /// + /// Initializes a new instance of the class. + /// + /// className (required). + public DanishPig(string className = default(string)) + { + // to ensure "className" is required (not null) + if (className == null) + { + throw new ArgumentNullException("className is a required property for DanishPig and cannot be null"); + } + this.ClassName = className; + } + + /// + /// Gets or Sets ClassName + /// + [DataMember(Name = "className", IsRequired = true, EmitDefaultValue = true)] + public string ClassName { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class DanishPig {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as DanishPig); + } + + /// + /// Returns true if DanishPig instances are equal + /// + /// Instance of DanishPig to be compared + /// Boolean + public bool Equals(DanishPig input) + { + if (input == null) + { + return false; + } + return + ( + this.ClassName == input.ClassName || + (this.ClassName != null && + this.ClassName.Equals(input.ClassName)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ClassName != null) + { + hashCode = (hashCode * 59) + this.ClassName.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs new file mode 100644 index 00000000000..cc90a935d39 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -0,0 +1,119 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// DateOnlyClass + /// + [DataContract(Name = "DateOnlyClass")] + public partial class DateOnlyClass : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// dateOnlyProperty. + public DateOnlyClass(DateTime dateOnlyProperty = default(DateTime)) + { + this.DateOnlyProperty = dateOnlyProperty; + } + + /// + /// Gets or Sets DateOnlyProperty + /// + [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] + [JsonConverter(typeof(OpenAPIDateConverter))] + public DateTime DateOnlyProperty { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class DateOnlyClass {\n"); + sb.Append(" DateOnlyProperty: ").Append(DateOnlyProperty).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as DateOnlyClass); + } + + /// + /// Returns true if DateOnlyClass instances are equal + /// + /// Instance of DateOnlyClass to be compared + /// Boolean + public bool Equals(DateOnlyClass input) + { + if (input == null) + { + return false; + } + return + ( + this.DateOnlyProperty == input.DateOnlyProperty || + (this.DateOnlyProperty != null && + this.DateOnlyProperty.Equals(input.DateOnlyProperty)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.DateOnlyProperty != null) + { + hashCode = (hashCode * 59) + this.DateOnlyProperty.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs new file mode 100644 index 00000000000..3d7c5fdbb49 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// DeprecatedObject + /// + [DataContract(Name = "DeprecatedObject")] + public partial class DeprecatedObject : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// name. + public DeprecatedObject(string name = default(string)) + { + this.Name = name; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", EmitDefaultValue = false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class DeprecatedObject {\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as DeprecatedObject); + } + + /// + /// Returns true if DeprecatedObject instances are equal + /// + /// Instance of DeprecatedObject to be compared + /// Boolean + public bool Equals(DeprecatedObject input) + { + if (input == null) + { + return false; + } + return + ( + this.Name == input.Name || + (this.Name != null && + this.Name.Equals(input.Name)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Name != null) + { + hashCode = (hashCode * 59) + this.Name.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs new file mode 100644 index 00000000000..b027dd79ebf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs @@ -0,0 +1,126 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Dog + /// + [DataContract(Name = "Dog")] + public partial class Dog : Animal, IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Dog() { } + /// + /// Initializes a new instance of the class. + /// + /// breed. + /// className (required) (default to "Dog"). + /// color (default to "red"). + public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + { + this.Breed = breed; + } + + /// + /// Gets or Sets Breed + /// + [DataMember(Name = "breed", EmitDefaultValue = false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Dog {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Dog); + } + + /// + /// Returns true if Dog instances are equal + /// + /// Instance of Dog to be compared + /// Boolean + public bool Equals(Dog input) + { + if (input == null) + { + return false; + } + return base.Equals(input) && + ( + this.Breed == input.Breed || + (this.Breed != null && + this.Breed.Equals(input.Breed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Breed != null) + { + hashCode = (hashCode * 59) + this.Breed.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs new file mode 100644 index 00000000000..16cd6946de9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// DogAllOf + /// + [DataContract(Name = "Dog_allOf")] + public partial class DogAllOf : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// breed. + public DogAllOf(string breed = default(string)) + { + this.Breed = breed; + } + + /// + /// Gets or Sets Breed + /// + [DataMember(Name = "breed", EmitDefaultValue = false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as DogAllOf); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf input) + { + if (input == null) + { + return false; + } + return + ( + this.Breed == input.Breed || + (this.Breed != null && + this.Breed.Equals(input.Breed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Breed != null) + { + hashCode = (hashCode * 59) + this.Breed.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs new file mode 100644 index 00000000000..7ceaa0ce3b1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs @@ -0,0 +1,174 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Drawing + /// + [DataContract(Name = "Drawing")] + public partial class Drawing : Dictionary, IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// mainShape. + /// shapeOrNull. + /// nullableShape. + /// shapes. + public Drawing(Shape mainShape = default(Shape), ShapeOrNull shapeOrNull = default(ShapeOrNull), NullableShape nullableShape = default(NullableShape), List shapes = default(List)) : base() + { + this.MainShape = mainShape; + this.ShapeOrNull = shapeOrNull; + this.NullableShape = nullableShape; + this.Shapes = shapes; + } + + /// + /// Gets or Sets MainShape + /// + [DataMember(Name = "mainShape", EmitDefaultValue = false)] + public Shape MainShape { get; set; } + + /// + /// Gets or Sets ShapeOrNull + /// + [DataMember(Name = "shapeOrNull", EmitDefaultValue = false)] + public ShapeOrNull ShapeOrNull { get; set; } + + /// + /// Gets or Sets NullableShape + /// + [DataMember(Name = "nullableShape", EmitDefaultValue = true)] + public NullableShape NullableShape { get; set; } + + /// + /// Gets or Sets Shapes + /// + [DataMember(Name = "shapes", EmitDefaultValue = false)] + public List Shapes { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Drawing {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" MainShape: ").Append(MainShape).Append("\n"); + sb.Append(" ShapeOrNull: ").Append(ShapeOrNull).Append("\n"); + sb.Append(" NullableShape: ").Append(NullableShape).Append("\n"); + sb.Append(" Shapes: ").Append(Shapes).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Drawing); + } + + /// + /// Returns true if Drawing instances are equal + /// + /// Instance of Drawing to be compared + /// Boolean + public bool Equals(Drawing input) + { + if (input == null) + { + return false; + } + return base.Equals(input) && + ( + this.MainShape == input.MainShape || + (this.MainShape != null && + this.MainShape.Equals(input.MainShape)) + ) && base.Equals(input) && + ( + this.ShapeOrNull == input.ShapeOrNull || + (this.ShapeOrNull != null && + this.ShapeOrNull.Equals(input.ShapeOrNull)) + ) && base.Equals(input) && + ( + this.NullableShape == input.NullableShape || + (this.NullableShape != null && + this.NullableShape.Equals(input.NullableShape)) + ) && base.Equals(input) && + ( + this.Shapes == input.Shapes || + this.Shapes != null && + input.Shapes != null && + this.Shapes.SequenceEqual(input.Shapes) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.MainShape != null) + { + hashCode = (hashCode * 59) + this.MainShape.GetHashCode(); + } + if (this.ShapeOrNull != null) + { + hashCode = (hashCode * 59) + this.ShapeOrNull.GetHashCode(); + } + if (this.NullableShape != null) + { + hashCode = (hashCode * 59) + this.NullableShape.GetHashCode(); + } + if (this.Shapes != null) + { + hashCode = (hashCode * 59) + this.Shapes.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs new file mode 100644 index 00000000000..bbd3ce4e78b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -0,0 +1,173 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// EnumArrays + /// + [DataContract(Name = "EnumArrays")] + public partial class EnumArrays : IEquatable + { + /// + /// Defines JustSymbol + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum JustSymbolEnum + { + /// + /// Enum GreaterThanOrEqualTo for value: >= + /// + [EnumMember(Value = ">=")] + GreaterThanOrEqualTo = 1, + + /// + /// Enum Dollar for value: $ + /// + [EnumMember(Value = "$")] + Dollar = 2 + + } + + + /// + /// Gets or Sets JustSymbol + /// + [DataMember(Name = "just_symbol", EmitDefaultValue = false)] + public JustSymbolEnum? JustSymbol { get; set; } + /// + /// Defines ArrayEnum + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum ArrayEnumEnum + { + /// + /// Enum Fish for value: fish + /// + [EnumMember(Value = "fish")] + Fish = 1, + + /// + /// Enum Crab for value: crab + /// + [EnumMember(Value = "crab")] + Crab = 2 + + } + + /// + /// Initializes a new instance of the class. + /// + /// justSymbol. + /// arrayEnum. + public EnumArrays(JustSymbolEnum? justSymbol = default(JustSymbolEnum?), List arrayEnum = default(List)) + { + this.JustSymbol = justSymbol; + this.ArrayEnum = arrayEnum; + } + + /// + /// Gets or Sets ArrayEnum + /// + [DataMember(Name = "array_enum", EmitDefaultValue = false)] + public List ArrayEnum { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class EnumArrays {\n"); + sb.Append(" JustSymbol: ").Append(JustSymbol).Append("\n"); + sb.Append(" ArrayEnum: ").Append(ArrayEnum).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as EnumArrays); + } + + /// + /// Returns true if EnumArrays instances are equal + /// + /// Instance of EnumArrays to be compared + /// Boolean + public bool Equals(EnumArrays input) + { + if (input == null) + { + return false; + } + return + ( + this.JustSymbol == input.JustSymbol || + this.JustSymbol.Equals(input.JustSymbol) + ) && + ( + this.ArrayEnum == input.ArrayEnum || + this.ArrayEnum != null && + input.ArrayEnum != null && + this.ArrayEnum.SequenceEqual(input.ArrayEnum) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode(); + if (this.ArrayEnum != null) + { + hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs new file mode 100644 index 00000000000..d7ba7e311d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs @@ -0,0 +1,53 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines EnumClass + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum EnumClass + { + /// + /// Enum Abc for value: _abc + /// + [EnumMember(Value = "_abc")] + Abc = 1, + + /// + /// Enum Efg for value: -efg + /// + [EnumMember(Value = "-efg")] + Efg = 2, + + /// + /// Enum Xyz for value: (xyz) + /// + [EnumMember(Value = "(xyz)")] + Xyz = 3 + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs new file mode 100644 index 00000000000..2543fc92056 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs @@ -0,0 +1,337 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// EnumTest + /// + [DataContract(Name = "Enum_Test")] + public partial class EnumTest : IEquatable + { + /// + /// Defines EnumString + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum EnumStringEnum + { + /// + /// Enum UPPER for value: UPPER + /// + [EnumMember(Value = "UPPER")] + UPPER = 1, + + /// + /// Enum Lower for value: lower + /// + [EnumMember(Value = "lower")] + Lower = 2, + + /// + /// Enum Empty for value: + /// + [EnumMember(Value = "")] + Empty = 3 + + } + + + /// + /// Gets or Sets EnumString + /// + [DataMember(Name = "enum_string", EmitDefaultValue = false)] + public EnumStringEnum? EnumString { get; set; } + /// + /// Defines EnumStringRequired + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum EnumStringRequiredEnum + { + /// + /// Enum UPPER for value: UPPER + /// + [EnumMember(Value = "UPPER")] + UPPER = 1, + + /// + /// Enum Lower for value: lower + /// + [EnumMember(Value = "lower")] + Lower = 2, + + /// + /// Enum Empty for value: + /// + [EnumMember(Value = "")] + Empty = 3 + + } + + + /// + /// Gets or Sets EnumStringRequired + /// + [DataMember(Name = "enum_string_required", IsRequired = true, EmitDefaultValue = true)] + public EnumStringRequiredEnum EnumStringRequired { get; set; } + /// + /// Defines EnumInteger + /// + public enum EnumIntegerEnum + { + /// + /// Enum NUMBER_1 for value: 1 + /// + NUMBER_1 = 1, + + /// + /// Enum NUMBER_MINUS_1 for value: -1 + /// + NUMBER_MINUS_1 = -1 + + } + + + /// + /// Gets or Sets EnumInteger + /// + [DataMember(Name = "enum_integer", EmitDefaultValue = false)] + public EnumIntegerEnum? EnumInteger { get; set; } + /// + /// Defines EnumIntegerOnly + /// + public enum EnumIntegerOnlyEnum + { + /// + /// Enum NUMBER_2 for value: 2 + /// + NUMBER_2 = 2, + + /// + /// Enum NUMBER_MINUS_2 for value: -2 + /// + NUMBER_MINUS_2 = -2 + + } + + + /// + /// Gets or Sets EnumIntegerOnly + /// + [DataMember(Name = "enum_integer_only", EmitDefaultValue = false)] + public EnumIntegerOnlyEnum? EnumIntegerOnly { get; set; } + /// + /// Defines EnumNumber + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum EnumNumberEnum + { + /// + /// Enum NUMBER_1_DOT_1 for value: 1.1 + /// + [EnumMember(Value = "1.1")] + NUMBER_1_DOT_1 = 1, + + /// + /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2 + /// + [EnumMember(Value = "-1.2")] + NUMBER_MINUS_1_DOT_2 = 2 + + } + + + /// + /// Gets or Sets EnumNumber + /// + [DataMember(Name = "enum_number", EmitDefaultValue = false)] + public EnumNumberEnum? EnumNumber { get; set; } + + /// + /// Gets or Sets OuterEnum + /// + [DataMember(Name = "outerEnum", EmitDefaultValue = true)] + public OuterEnum? OuterEnum { get; set; } + + /// + /// Gets or Sets OuterEnumInteger + /// + [DataMember(Name = "outerEnumInteger", EmitDefaultValue = false)] + public OuterEnumInteger? OuterEnumInteger { get; set; } + + /// + /// Gets or Sets OuterEnumDefaultValue + /// + [DataMember(Name = "outerEnumDefaultValue", EmitDefaultValue = false)] + public OuterEnumDefaultValue? OuterEnumDefaultValue { get; set; } + + /// + /// Gets or Sets OuterEnumIntegerDefaultValue + /// + [DataMember(Name = "outerEnumIntegerDefaultValue", EmitDefaultValue = false)] + public OuterEnumIntegerDefaultValue? OuterEnumIntegerDefaultValue { get; set; } + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected EnumTest() { } + /// + /// Initializes a new instance of the class. + /// + /// enumString. + /// enumStringRequired (required). + /// enumInteger. + /// enumIntegerOnly. + /// enumNumber. + /// outerEnum. + /// outerEnumInteger. + /// outerEnumDefaultValue. + /// outerEnumIntegerDefaultValue. + public EnumTest(EnumStringEnum? enumString = default(EnumStringEnum?), EnumStringRequiredEnum enumStringRequired = default(EnumStringRequiredEnum), EnumIntegerEnum? enumInteger = default(EnumIntegerEnum?), EnumIntegerOnlyEnum? enumIntegerOnly = default(EnumIntegerOnlyEnum?), EnumNumberEnum? enumNumber = default(EnumNumberEnum?), OuterEnum? outerEnum = default(OuterEnum?), OuterEnumInteger? outerEnumInteger = default(OuterEnumInteger?), OuterEnumDefaultValue? outerEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue = default(OuterEnumIntegerDefaultValue?)) + { + this.EnumStringRequired = enumStringRequired; + this.EnumString = enumString; + this.EnumInteger = enumInteger; + this.EnumIntegerOnly = enumIntegerOnly; + this.EnumNumber = enumNumber; + this.OuterEnum = outerEnum; + this.OuterEnumInteger = outerEnumInteger; + this.OuterEnumDefaultValue = outerEnumDefaultValue; + this.OuterEnumIntegerDefaultValue = outerEnumIntegerDefaultValue; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class EnumTest {\n"); + sb.Append(" EnumString: ").Append(EnumString).Append("\n"); + sb.Append(" EnumStringRequired: ").Append(EnumStringRequired).Append("\n"); + sb.Append(" EnumInteger: ").Append(EnumInteger).Append("\n"); + sb.Append(" EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n"); + sb.Append(" EnumNumber: ").Append(EnumNumber).Append("\n"); + sb.Append(" OuterEnum: ").Append(OuterEnum).Append("\n"); + sb.Append(" OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n"); + sb.Append(" OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n"); + sb.Append(" OuterEnumIntegerDefaultValue: ").Append(OuterEnumIntegerDefaultValue).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as EnumTest); + } + + /// + /// Returns true if EnumTest instances are equal + /// + /// Instance of EnumTest to be compared + /// Boolean + public bool Equals(EnumTest input) + { + if (input == null) + { + return false; + } + return + ( + this.EnumString == input.EnumString || + this.EnumString.Equals(input.EnumString) + ) && + ( + this.EnumStringRequired == input.EnumStringRequired || + this.EnumStringRequired.Equals(input.EnumStringRequired) + ) && + ( + this.EnumInteger == input.EnumInteger || + this.EnumInteger.Equals(input.EnumInteger) + ) && + ( + this.EnumIntegerOnly == input.EnumIntegerOnly || + this.EnumIntegerOnly.Equals(input.EnumIntegerOnly) + ) && + ( + this.EnumNumber == input.EnumNumber || + this.EnumNumber.Equals(input.EnumNumber) + ) && + ( + this.OuterEnum == input.OuterEnum || + this.OuterEnum.Equals(input.OuterEnum) + ) && + ( + this.OuterEnumInteger == input.OuterEnumInteger || + this.OuterEnumInteger.Equals(input.OuterEnumInteger) + ) && + ( + this.OuterEnumDefaultValue == input.OuterEnumDefaultValue || + this.OuterEnumDefaultValue.Equals(input.OuterEnumDefaultValue) + ) && + ( + this.OuterEnumIntegerDefaultValue == input.OuterEnumIntegerDefaultValue || + this.OuterEnumIntegerDefaultValue.Equals(input.OuterEnumIntegerDefaultValue) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.EnumString.GetHashCode(); + hashCode = (hashCode * 59) + this.EnumStringRequired.GetHashCode(); + hashCode = (hashCode * 59) + this.EnumInteger.GetHashCode(); + hashCode = (hashCode * 59) + this.EnumIntegerOnly.GetHashCode(); + hashCode = (hashCode * 59) + this.EnumNumber.GetHashCode(); + hashCode = (hashCode * 59) + this.OuterEnum.GetHashCode(); + hashCode = (hashCode * 59) + this.OuterEnumInteger.GetHashCode(); + hashCode = (hashCode * 59) + this.OuterEnumDefaultValue.GetHashCode(); + hashCode = (hashCode * 59) + this.OuterEnumIntegerDefaultValue.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs new file mode 100644 index 00000000000..cf030583c11 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -0,0 +1,151 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// EquilateralTriangle + /// + [DataContract(Name = "EquilateralTriangle")] + public partial class EquilateralTriangle : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected EquilateralTriangle() { } + /// + /// Initializes a new instance of the class. + /// + /// shapeType (required). + /// triangleType (required). + public EquilateralTriangle(string shapeType = default(string), string triangleType = default(string)) + { + // to ensure "shapeType" is required (not null) + if (shapeType == null) + { + throw new ArgumentNullException("shapeType is a required property for EquilateralTriangle and cannot be null"); + } + this.ShapeType = shapeType; + // to ensure "triangleType" is required (not null) + if (triangleType == null) + { + throw new ArgumentNullException("triangleType is a required property for EquilateralTriangle and cannot be null"); + } + this.TriangleType = triangleType; + } + + /// + /// Gets or Sets ShapeType + /// + [DataMember(Name = "shapeType", IsRequired = true, EmitDefaultValue = true)] + public string ShapeType { get; set; } + + /// + /// Gets or Sets TriangleType + /// + [DataMember(Name = "triangleType", IsRequired = true, EmitDefaultValue = true)] + public string TriangleType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class EquilateralTriangle {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as EquilateralTriangle); + } + + /// + /// Returns true if EquilateralTriangle instances are equal + /// + /// Instance of EquilateralTriangle to be compared + /// Boolean + public bool Equals(EquilateralTriangle input) + { + if (input == null) + { + return false; + } + return + ( + this.ShapeType == input.ShapeType || + (this.ShapeType != null && + this.ShapeType.Equals(input.ShapeType)) + ) && + ( + this.TriangleType == input.TriangleType || + (this.TriangleType != null && + this.TriangleType.Equals(input.TriangleType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ShapeType != null) + { + hashCode = (hashCode * 59) + this.ShapeType.GetHashCode(); + } + if (this.TriangleType != null) + { + hashCode = (hashCode * 59) + this.TriangleType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs new file mode 100644 index 00000000000..0df50ba9b2f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs @@ -0,0 +1,119 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Must be named `File` for test. + /// + [DataContract(Name = "File")] + public partial class File : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// Test capitalization. + public File(string sourceURI = default(string)) + { + this.SourceURI = sourceURI; + } + + /// + /// Test capitalization + /// + /// Test capitalization + [DataMember(Name = "sourceURI", EmitDefaultValue = false)] + public string SourceURI { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class File {\n"); + sb.Append(" SourceURI: ").Append(SourceURI).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as File); + } + + /// + /// Returns true if File instances are equal + /// + /// Instance of File to be compared + /// Boolean + public bool Equals(File input) + { + if (input == null) + { + return false; + } + return + ( + this.SourceURI == input.SourceURI || + (this.SourceURI != null && + this.SourceURI.Equals(input.SourceURI)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.SourceURI != null) + { + hashCode = (hashCode * 59) + this.SourceURI.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs new file mode 100644 index 00000000000..388add47e63 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -0,0 +1,137 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// FileSchemaTestClass + /// + [DataContract(Name = "FileSchemaTestClass")] + public partial class FileSchemaTestClass : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// file. + /// files. + public FileSchemaTestClass(File file = default(File), List files = default(List)) + { + this.File = file; + this.Files = files; + } + + /// + /// Gets or Sets File + /// + [DataMember(Name = "file", EmitDefaultValue = false)] + public File File { get; set; } + + /// + /// Gets or Sets Files + /// + [DataMember(Name = "files", EmitDefaultValue = false)] + public List Files { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class FileSchemaTestClass {\n"); + sb.Append(" File: ").Append(File).Append("\n"); + sb.Append(" Files: ").Append(Files).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as FileSchemaTestClass); + } + + /// + /// Returns true if FileSchemaTestClass instances are equal + /// + /// Instance of FileSchemaTestClass to be compared + /// Boolean + public bool Equals(FileSchemaTestClass input) + { + if (input == null) + { + return false; + } + return + ( + this.File == input.File || + (this.File != null && + this.File.Equals(input.File)) + ) && + ( + this.Files == input.Files || + this.Files != null && + input.Files != null && + this.Files.SequenceEqual(input.Files) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.File != null) + { + hashCode = (hashCode * 59) + this.File.GetHashCode(); + } + if (this.Files != null) + { + hashCode = (hashCode * 59) + this.Files.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs new file mode 100644 index 00000000000..b496a89c893 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs @@ -0,0 +1,119 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Foo + /// + [DataContract(Name = "Foo")] + public partial class Foo : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// bar (default to "bar"). + public Foo(string bar = "bar") + { + // use default value if no "bar" provided + this.Bar = bar ?? "bar"; + } + + /// + /// Gets or Sets Bar + /// + [DataMember(Name = "bar", EmitDefaultValue = false)] + public string Bar { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Foo {\n"); + sb.Append(" Bar: ").Append(Bar).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Foo); + } + + /// + /// Returns true if Foo instances are equal + /// + /// Instance of Foo to be compared + /// Boolean + public bool Equals(Foo input) + { + if (input == null) + { + return false; + } + return + ( + this.Bar == input.Bar || + (this.Bar != null && + this.Bar.Equals(input.Bar)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Bar != null) + { + hashCode = (hashCode * 59) + this.Bar.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs new file mode 100644 index 00000000000..31a7f3e21ff --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// FooGetDefaultResponse + /// + [DataContract(Name = "_foo_get_default_response")] + public partial class FooGetDefaultResponse : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// _string. + public FooGetDefaultResponse(Foo _string = default(Foo)) + { + this.String = _string; + } + + /// + /// Gets or Sets String + /// + [DataMember(Name = "string", EmitDefaultValue = false)] + public Foo String { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class FooGetDefaultResponse {\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as FooGetDefaultResponse); + } + + /// + /// Returns true if FooGetDefaultResponse instances are equal + /// + /// Instance of FooGetDefaultResponse to be compared + /// Boolean + public bool Equals(FooGetDefaultResponse input) + { + if (input == null) + { + return false; + } + return + ( + this.String == input.String || + (this.String != null && + this.String.Equals(input.String)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.String != null) + { + hashCode = (hashCode * 59) + this.String.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs new file mode 100644 index 00000000000..4abe50c8af3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs @@ -0,0 +1,378 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// FormatTest + /// + [DataContract(Name = "format_test")] + public partial class FormatTest : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected FormatTest() { } + /// + /// Initializes a new instance of the class. + /// + /// integer. + /// int32. + /// int64. + /// number (required). + /// _float. + /// _double. + /// _decimal. + /// _string. + /// _byte (required). + /// binary. + /// date (required). + /// dateTime. + /// uuid. + /// password (required). + /// A string that is a 10 digit number. Can have leading zeros.. + /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. + public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + { + this.Number = number; + // to ensure "_byte" is required (not null) + if (_byte == null) + { + throw new ArgumentNullException("_byte is a required property for FormatTest and cannot be null"); + } + this.Byte = _byte; + this.Date = date; + // to ensure "password" is required (not null) + if (password == null) + { + throw new ArgumentNullException("password is a required property for FormatTest and cannot be null"); + } + this.Password = password; + this.Integer = integer; + this.Int32 = int32; + this.Int64 = int64; + this.Float = _float; + this.Double = _double; + this.Decimal = _decimal; + this.String = _string; + this.Binary = binary; + this.DateTime = dateTime; + this.Uuid = uuid; + this.PatternWithDigits = patternWithDigits; + this.PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; + } + + /// + /// Gets or Sets Integer + /// + [DataMember(Name = "integer", EmitDefaultValue = false)] + public int Integer { get; set; } + + /// + /// Gets or Sets Int32 + /// + [DataMember(Name = "int32", EmitDefaultValue = false)] + public int Int32 { get; set; } + + /// + /// Gets or Sets Int64 + /// + [DataMember(Name = "int64", EmitDefaultValue = false)] + public long Int64 { get; set; } + + /// + /// Gets or Sets Number + /// + [DataMember(Name = "number", IsRequired = true, EmitDefaultValue = true)] + public decimal Number { get; set; } + + /// + /// Gets or Sets Float + /// + [DataMember(Name = "float", EmitDefaultValue = false)] + public float Float { get; set; } + + /// + /// Gets or Sets Double + /// + [DataMember(Name = "double", EmitDefaultValue = false)] + public double Double { get; set; } + + /// + /// Gets or Sets Decimal + /// + [DataMember(Name = "decimal", EmitDefaultValue = false)] + public decimal Decimal { get; set; } + + /// + /// Gets or Sets String + /// + [DataMember(Name = "string", EmitDefaultValue = false)] + public string String { get; set; } + + /// + /// Gets or Sets Byte + /// + [DataMember(Name = "byte", IsRequired = true, EmitDefaultValue = true)] + public byte[] Byte { get; set; } + + /// + /// Gets or Sets Binary + /// + [DataMember(Name = "binary", EmitDefaultValue = false)] + public System.IO.Stream Binary { get; set; } + + /// + /// Gets or Sets Date + /// + [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] + [JsonConverter(typeof(OpenAPIDateConverter))] + public DateTime Date { get; set; } + + /// + /// Gets or Sets DateTime + /// + [DataMember(Name = "dateTime", EmitDefaultValue = false)] + public DateTime DateTime { get; set; } + + /// + /// Gets or Sets Uuid + /// + [DataMember(Name = "uuid", EmitDefaultValue = false)] + public Guid Uuid { get; set; } + + /// + /// Gets or Sets Password + /// + [DataMember(Name = "password", IsRequired = true, EmitDefaultValue = true)] + public string Password { get; set; } + + /// + /// A string that is a 10 digit number. Can have leading zeros. + /// + /// A string that is a 10 digit number. Can have leading zeros. + [DataMember(Name = "pattern_with_digits", EmitDefaultValue = false)] + public string PatternWithDigits { get; set; } + + /// + /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. + /// + /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. + [DataMember(Name = "pattern_with_digits_and_delimiter", EmitDefaultValue = false)] + public string PatternWithDigitsAndDelimiter { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class FormatTest {\n"); + sb.Append(" Integer: ").Append(Integer).Append("\n"); + sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" Number: ").Append(Number).Append("\n"); + sb.Append(" Float: ").Append(Float).Append("\n"); + sb.Append(" Double: ").Append(Double).Append("\n"); + sb.Append(" Decimal: ").Append(Decimal).Append("\n"); + sb.Append(" String: ").Append(String).Append("\n"); + sb.Append(" Byte: ").Append(Byte).Append("\n"); + sb.Append(" Binary: ").Append(Binary).Append("\n"); + sb.Append(" Date: ").Append(Date).Append("\n"); + sb.Append(" DateTime: ").Append(DateTime).Append("\n"); + sb.Append(" Uuid: ").Append(Uuid).Append("\n"); + sb.Append(" Password: ").Append(Password).Append("\n"); + sb.Append(" PatternWithDigits: ").Append(PatternWithDigits).Append("\n"); + sb.Append(" PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as FormatTest); + } + + /// + /// Returns true if FormatTest instances are equal + /// + /// Instance of FormatTest to be compared + /// Boolean + public bool Equals(FormatTest input) + { + if (input == null) + { + return false; + } + return + ( + this.Integer == input.Integer || + this.Integer.Equals(input.Integer) + ) && + ( + this.Int32 == input.Int32 || + this.Int32.Equals(input.Int32) + ) && + ( + this.Int64 == input.Int64 || + this.Int64.Equals(input.Int64) + ) && + ( + this.Number == input.Number || + this.Number.Equals(input.Number) + ) && + ( + this.Float == input.Float || + this.Float.Equals(input.Float) + ) && + ( + this.Double == input.Double || + this.Double.Equals(input.Double) + ) && + ( + this.Decimal == input.Decimal || + this.Decimal.Equals(input.Decimal) + ) && + ( + this.String == input.String || + (this.String != null && + this.String.Equals(input.String)) + ) && + ( + this.Byte == input.Byte || + (this.Byte != null && + this.Byte.Equals(input.Byte)) + ) && + ( + this.Binary == input.Binary || + (this.Binary != null && + this.Binary.Equals(input.Binary)) + ) && + ( + this.Date == input.Date || + (this.Date != null && + this.Date.Equals(input.Date)) + ) && + ( + this.DateTime == input.DateTime || + (this.DateTime != null && + this.DateTime.Equals(input.DateTime)) + ) && + ( + this.Uuid == input.Uuid || + (this.Uuid != null && + this.Uuid.Equals(input.Uuid)) + ) && + ( + this.Password == input.Password || + (this.Password != null && + this.Password.Equals(input.Password)) + ) && + ( + this.PatternWithDigits == input.PatternWithDigits || + (this.PatternWithDigits != null && + this.PatternWithDigits.Equals(input.PatternWithDigits)) + ) && + ( + this.PatternWithDigitsAndDelimiter == input.PatternWithDigitsAndDelimiter || + (this.PatternWithDigitsAndDelimiter != null && + this.PatternWithDigitsAndDelimiter.Equals(input.PatternWithDigitsAndDelimiter)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Integer.GetHashCode(); + hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.Number.GetHashCode(); + hashCode = (hashCode * 59) + this.Float.GetHashCode(); + hashCode = (hashCode * 59) + this.Double.GetHashCode(); + hashCode = (hashCode * 59) + this.Decimal.GetHashCode(); + if (this.String != null) + { + hashCode = (hashCode * 59) + this.String.GetHashCode(); + } + if (this.Byte != null) + { + hashCode = (hashCode * 59) + this.Byte.GetHashCode(); + } + if (this.Binary != null) + { + hashCode = (hashCode * 59) + this.Binary.GetHashCode(); + } + if (this.Date != null) + { + hashCode = (hashCode * 59) + this.Date.GetHashCode(); + } + if (this.DateTime != null) + { + hashCode = (hashCode * 59) + this.DateTime.GetHashCode(); + } + if (this.Uuid != null) + { + hashCode = (hashCode * 59) + this.Uuid.GetHashCode(); + } + if (this.Password != null) + { + hashCode = (hashCode * 59) + this.Password.GetHashCode(); + } + if (this.PatternWithDigits != null) + { + hashCode = (hashCode * 59) + this.PatternWithDigits.GetHashCode(); + } + if (this.PatternWithDigitsAndDelimiter != null) + { + hashCode = (hashCode * 59) + this.PatternWithDigitsAndDelimiter.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs new file mode 100644 index 00000000000..f117d123d06 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs @@ -0,0 +1,283 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// Fruit + /// + [JsonConverter(typeof(FruitJsonConverter))] + [DataContract(Name = "fruit")] + public partial class Fruit : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Apple. + public Fruit(Apple actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Banana. + public Fruit(Banana actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(Apple)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(Banana)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: Apple, Banana"); + } + } + } + + /// + /// Get the actual instance of `Apple`. If the actual instance is not `Apple`, + /// the InvalidClassException will be thrown + /// + /// An instance of Apple + public Apple GetApple() + { + return (Apple)this.ActualInstance; + } + + /// + /// Get the actual instance of `Banana`. If the actual instance is not `Banana`, + /// the InvalidClassException will be thrown + /// + /// An instance of Banana + public Banana GetBanana() + { + return (Banana)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Fruit {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, Fruit.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of Fruit + /// + /// JSON string + /// An instance of Fruit + public static Fruit FromJson(string jsonString) + { + Fruit newFruit = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newFruit; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Apple).GetProperty("AdditionalProperties") == null) + { + newFruit = new Fruit(JsonConvert.DeserializeObject(jsonString, Fruit.SerializerSettings)); + } + else + { + newFruit = new Fruit(JsonConvert.DeserializeObject(jsonString, Fruit.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Apple"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Apple: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Banana).GetProperty("AdditionalProperties") == null) + { + newFruit = new Fruit(JsonConvert.DeserializeObject(jsonString, Fruit.SerializerSettings)); + } + else + { + newFruit = new Fruit(JsonConvert.DeserializeObject(jsonString, Fruit.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Banana"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Banana: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newFruit; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Fruit); + } + + /// + /// Returns true if Fruit instances are equal + /// + /// Instance of Fruit to be compared + /// Boolean + public bool Equals(Fruit input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for Fruit + /// + public class FruitJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(Fruit).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return Fruit.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs new file mode 100644 index 00000000000..3fdaa210c2e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs @@ -0,0 +1,292 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// FruitReq + /// + [JsonConverter(typeof(FruitReqJsonConverter))] + [DataContract(Name = "fruitReq")] + public partial class FruitReq : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class. + /// + public FruitReq() + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of AppleReq. + public FruitReq(AppleReq actualInstance) + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance; + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of BananaReq. + public FruitReq(BananaReq actualInstance) + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance; + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(AppleReq)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(BananaReq)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: AppleReq, BananaReq"); + } + } + } + + /// + /// Get the actual instance of `AppleReq`. If the actual instance is not `AppleReq`, + /// the InvalidClassException will be thrown + /// + /// An instance of AppleReq + public AppleReq GetAppleReq() + { + return (AppleReq)this.ActualInstance; + } + + /// + /// Get the actual instance of `BananaReq`. If the actual instance is not `BananaReq`, + /// the InvalidClassException will be thrown + /// + /// An instance of BananaReq + public BananaReq GetBananaReq() + { + return (BananaReq)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class FruitReq {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, FruitReq.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of FruitReq + /// + /// JSON string + /// An instance of FruitReq + public static FruitReq FromJson(string jsonString) + { + FruitReq newFruitReq = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newFruitReq; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(AppleReq).GetProperty("AdditionalProperties") == null) + { + newFruitReq = new FruitReq(JsonConvert.DeserializeObject(jsonString, FruitReq.SerializerSettings)); + } + else + { + newFruitReq = new FruitReq(JsonConvert.DeserializeObject(jsonString, FruitReq.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("AppleReq"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into AppleReq: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(BananaReq).GetProperty("AdditionalProperties") == null) + { + newFruitReq = new FruitReq(JsonConvert.DeserializeObject(jsonString, FruitReq.SerializerSettings)); + } + else + { + newFruitReq = new FruitReq(JsonConvert.DeserializeObject(jsonString, FruitReq.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("BananaReq"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into BananaReq: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newFruitReq; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as FruitReq); + } + + /// + /// Returns true if FruitReq instances are equal + /// + /// Instance of FruitReq to be compared + /// Boolean + public bool Equals(FruitReq input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for FruitReq + /// + public class FruitReqJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(FruitReq).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return FruitReq.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs new file mode 100644 index 00000000000..1f9ed867e0a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs @@ -0,0 +1,256 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// GmFruit + /// + [JsonConverter(typeof(GmFruitJsonConverter))] + [DataContract(Name = "gmFruit")] + public partial class GmFruit : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Apple. + public GmFruit(Apple actualInstance) + { + this.IsNullable = false; + this.SchemaType= "anyOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Banana. + public GmFruit(Banana actualInstance) + { + this.IsNullable = false; + this.SchemaType= "anyOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(Apple)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(Banana)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: Apple, Banana"); + } + } + } + + /// + /// Get the actual instance of `Apple`. If the actual instance is not `Apple`, + /// the InvalidClassException will be thrown + /// + /// An instance of Apple + public Apple GetApple() + { + return (Apple)this.ActualInstance; + } + + /// + /// Get the actual instance of `Banana`. If the actual instance is not `Banana`, + /// the InvalidClassException will be thrown + /// + /// An instance of Banana + public Banana GetBanana() + { + return (Banana)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class GmFruit {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, GmFruit.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of GmFruit + /// + /// JSON string + /// An instance of GmFruit + public static GmFruit FromJson(string jsonString) + { + GmFruit newGmFruit = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newGmFruit; + } + + try + { + newGmFruit = new GmFruit(JsonConvert.DeserializeObject(jsonString, GmFruit.SerializerSettings)); + // deserialization is considered successful at this point if no exception has been thrown. + return newGmFruit; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Apple: {1}", jsonString, exception.ToString())); + } + + try + { + newGmFruit = new GmFruit(JsonConvert.DeserializeObject(jsonString, GmFruit.SerializerSettings)); + // deserialization is considered successful at this point if no exception has been thrown. + return newGmFruit; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Banana: {1}", jsonString, exception.ToString())); + } + + // no match found, throw an exception + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as GmFruit); + } + + /// + /// Returns true if GmFruit instances are equal + /// + /// Instance of GmFruit to be compared + /// Boolean + public bool Equals(GmFruit input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for GmFruit + /// + public class GmFruitJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(GmFruit).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return GmFruit.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs new file mode 100644 index 00000000000..0d7469e833e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -0,0 +1,128 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// GrandparentAnimal + /// + [DataContract(Name = "GrandparentAnimal")] + public partial class GrandparentAnimal : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected GrandparentAnimal() { } + /// + /// Initializes a new instance of the class. + /// + /// petType (required). + public GrandparentAnimal(string petType = default(string)) + { + // to ensure "petType" is required (not null) + if (petType == null) + { + throw new ArgumentNullException("petType is a required property for GrandparentAnimal and cannot be null"); + } + this.PetType = petType; + } + + /// + /// Gets or Sets PetType + /// + [DataMember(Name = "pet_type", IsRequired = true, EmitDefaultValue = true)] + public string PetType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class GrandparentAnimal {\n"); + sb.Append(" PetType: ").Append(PetType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as GrandparentAnimal); + } + + /// + /// Returns true if GrandparentAnimal instances are equal + /// + /// Instance of GrandparentAnimal to be compared + /// Boolean + public bool Equals(GrandparentAnimal input) + { + if (input == null) + { + return false; + } + return + ( + this.PetType == input.PetType || + (this.PetType != null && + this.PetType.Equals(input.PetType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.PetType != null) + { + hashCode = (hashCode * 59) + this.PetType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs new file mode 100644 index 00000000000..a154d4ab7b5 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -0,0 +1,149 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// HasOnlyReadOnly + /// + [DataContract(Name = "hasOnlyReadOnly")] + public partial class HasOnlyReadOnly : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + public HasOnlyReadOnly() + { + } + + /// + /// Gets or Sets Bar + /// + [DataMember(Name = "bar", EmitDefaultValue = false)] + public string Bar { get; private set; } + + /// + /// Returns false as Bar should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeBar() + { + return false; + } + /// + /// Gets or Sets Foo + /// + [DataMember(Name = "foo", EmitDefaultValue = false)] + public string Foo { get; private set; } + + /// + /// Returns false as Foo should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeFoo() + { + return false; + } + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class HasOnlyReadOnly {\n"); + sb.Append(" Bar: ").Append(Bar).Append("\n"); + sb.Append(" Foo: ").Append(Foo).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as HasOnlyReadOnly); + } + + /// + /// Returns true if HasOnlyReadOnly instances are equal + /// + /// Instance of HasOnlyReadOnly to be compared + /// Boolean + public bool Equals(HasOnlyReadOnly input) + { + if (input == null) + { + return false; + } + return + ( + this.Bar == input.Bar || + (this.Bar != null && + this.Bar.Equals(input.Bar)) + ) && + ( + this.Foo == input.Foo || + (this.Foo != null && + this.Foo.Equals(input.Foo)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Bar != null) + { + hashCode = (hashCode * 59) + this.Bar.GetHashCode(); + } + if (this.Foo != null) + { + hashCode = (hashCode * 59) + this.Foo.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs new file mode 100644 index 00000000000..ddd6e7c6d5c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. + /// + [DataContract(Name = "HealthCheckResult")] + public partial class HealthCheckResult : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// nullableMessage. + public HealthCheckResult(string nullableMessage = default(string)) + { + this.NullableMessage = nullableMessage; + } + + /// + /// Gets or Sets NullableMessage + /// + [DataMember(Name = "NullableMessage", EmitDefaultValue = true)] + public string NullableMessage { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class HealthCheckResult {\n"); + sb.Append(" NullableMessage: ").Append(NullableMessage).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as HealthCheckResult); + } + + /// + /// Returns true if HealthCheckResult instances are equal + /// + /// Instance of HealthCheckResult to be compared + /// Boolean + public bool Equals(HealthCheckResult input) + { + if (input == null) + { + return false; + } + return + ( + this.NullableMessage == input.NullableMessage || + (this.NullableMessage != null && + this.NullableMessage.Equals(input.NullableMessage)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.NullableMessage != null) + { + hashCode = (hashCode * 59) + this.NullableMessage.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs new file mode 100644 index 00000000000..0fa5290263f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -0,0 +1,151 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// IsoscelesTriangle + /// + [DataContract(Name = "IsoscelesTriangle")] + public partial class IsoscelesTriangle : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected IsoscelesTriangle() { } + /// + /// Initializes a new instance of the class. + /// + /// shapeType (required). + /// triangleType (required). + public IsoscelesTriangle(string shapeType = default(string), string triangleType = default(string)) + { + // to ensure "shapeType" is required (not null) + if (shapeType == null) + { + throw new ArgumentNullException("shapeType is a required property for IsoscelesTriangle and cannot be null"); + } + this.ShapeType = shapeType; + // to ensure "triangleType" is required (not null) + if (triangleType == null) + { + throw new ArgumentNullException("triangleType is a required property for IsoscelesTriangle and cannot be null"); + } + this.TriangleType = triangleType; + } + + /// + /// Gets or Sets ShapeType + /// + [DataMember(Name = "shapeType", IsRequired = true, EmitDefaultValue = true)] + public string ShapeType { get; set; } + + /// + /// Gets or Sets TriangleType + /// + [DataMember(Name = "triangleType", IsRequired = true, EmitDefaultValue = true)] + public string TriangleType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class IsoscelesTriangle {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as IsoscelesTriangle); + } + + /// + /// Returns true if IsoscelesTriangle instances are equal + /// + /// Instance of IsoscelesTriangle to be compared + /// Boolean + public bool Equals(IsoscelesTriangle input) + { + if (input == null) + { + return false; + } + return + ( + this.ShapeType == input.ShapeType || + (this.ShapeType != null && + this.ShapeType.Equals(input.ShapeType)) + ) && + ( + this.TriangleType == input.TriangleType || + (this.TriangleType != null && + this.TriangleType.Equals(input.TriangleType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ShapeType != null) + { + hashCode = (hashCode * 59) + this.ShapeType.GetHashCode(); + } + if (this.TriangleType != null) + { + hashCode = (hashCode * 59) + this.TriangleType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs new file mode 100644 index 00000000000..f658a74fe2a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// List + /// + [DataContract(Name = "List")] + public partial class List : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// _123list. + public List(string _123list = default(string)) + { + this._123List = _123list; + } + + /// + /// Gets or Sets _123List + /// + [DataMember(Name = "123-list", EmitDefaultValue = false)] + public string _123List { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class List {\n"); + sb.Append(" _123List: ").Append(_123List).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as List); + } + + /// + /// Returns true if List instances are equal + /// + /// Instance of List to be compared + /// Boolean + public bool Equals(List input) + { + if (input == null) + { + return false; + } + return + ( + this._123List == input._123List || + (this._123List != null && + this._123List.Equals(input._123List)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this._123List != null) + { + hashCode = (hashCode * 59) + this._123List.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs new file mode 100644 index 00000000000..07489337fb2 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs @@ -0,0 +1,329 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// Mammal + /// + [JsonConverter(typeof(MammalJsonConverter))] + [DataContract(Name = "mammal")] + public partial class Mammal : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Whale. + public Mammal(Whale actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Zebra. + public Mammal(Zebra actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Pig. + public Mammal(Pig actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(Pig)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(Whale)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(Zebra)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: Pig, Whale, Zebra"); + } + } + } + + /// + /// Get the actual instance of `Whale`. If the actual instance is not `Whale`, + /// the InvalidClassException will be thrown + /// + /// An instance of Whale + public Whale GetWhale() + { + return (Whale)this.ActualInstance; + } + + /// + /// Get the actual instance of `Zebra`. If the actual instance is not `Zebra`, + /// the InvalidClassException will be thrown + /// + /// An instance of Zebra + public Zebra GetZebra() + { + return (Zebra)this.ActualInstance; + } + + /// + /// Get the actual instance of `Pig`. If the actual instance is not `Pig`, + /// the InvalidClassException will be thrown + /// + /// An instance of Pig + public Pig GetPig() + { + return (Pig)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Mammal {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, Mammal.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of Mammal + /// + /// JSON string + /// An instance of Mammal + public static Mammal FromJson(string jsonString) + { + Mammal newMammal = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newMammal; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Pig).GetProperty("AdditionalProperties") == null) + { + newMammal = new Mammal(JsonConvert.DeserializeObject(jsonString, Mammal.SerializerSettings)); + } + else + { + newMammal = new Mammal(JsonConvert.DeserializeObject(jsonString, Mammal.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Pig"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Pig: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Whale).GetProperty("AdditionalProperties") == null) + { + newMammal = new Mammal(JsonConvert.DeserializeObject(jsonString, Mammal.SerializerSettings)); + } + else + { + newMammal = new Mammal(JsonConvert.DeserializeObject(jsonString, Mammal.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Whale"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Whale: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Zebra).GetProperty("AdditionalProperties") == null) + { + newMammal = new Mammal(JsonConvert.DeserializeObject(jsonString, Mammal.SerializerSettings)); + } + else + { + newMammal = new Mammal(JsonConvert.DeserializeObject(jsonString, Mammal.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Zebra"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Zebra: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newMammal; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Mammal); + } + + /// + /// Returns true if Mammal instances are equal + /// + /// Instance of Mammal to be compared + /// Boolean + public bool Equals(Mammal input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for Mammal + /// + public class MammalJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(Mammal).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return Mammal.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs new file mode 100644 index 00000000000..4154423f34d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs @@ -0,0 +1,196 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// MapTest + /// + [DataContract(Name = "MapTest")] + public partial class MapTest : IEquatable + { + /// + /// Defines Inner + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum InnerEnum + { + /// + /// Enum UPPER for value: UPPER + /// + [EnumMember(Value = "UPPER")] + UPPER = 1, + + /// + /// Enum Lower for value: lower + /// + [EnumMember(Value = "lower")] + Lower = 2 + + } + + /// + /// Initializes a new instance of the class. + /// + /// mapMapOfString. + /// mapOfEnumString. + /// directMap. + /// indirectMap. + public MapTest(Dictionary> mapMapOfString = default(Dictionary>), Dictionary mapOfEnumString = default(Dictionary), Dictionary directMap = default(Dictionary), Dictionary indirectMap = default(Dictionary)) + { + this.MapMapOfString = mapMapOfString; + this.MapOfEnumString = mapOfEnumString; + this.DirectMap = directMap; + this.IndirectMap = indirectMap; + } + + /// + /// Gets or Sets MapMapOfString + /// + [DataMember(Name = "map_map_of_string", EmitDefaultValue = false)] + public Dictionary> MapMapOfString { get; set; } + + /// + /// Gets or Sets MapOfEnumString + /// + [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)] + public Dictionary MapOfEnumString { get; set; } + + /// + /// Gets or Sets DirectMap + /// + [DataMember(Name = "direct_map", EmitDefaultValue = false)] + public Dictionary DirectMap { get; set; } + + /// + /// Gets or Sets IndirectMap + /// + [DataMember(Name = "indirect_map", EmitDefaultValue = false)] + public Dictionary IndirectMap { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class MapTest {\n"); + sb.Append(" MapMapOfString: ").Append(MapMapOfString).Append("\n"); + sb.Append(" MapOfEnumString: ").Append(MapOfEnumString).Append("\n"); + sb.Append(" DirectMap: ").Append(DirectMap).Append("\n"); + sb.Append(" IndirectMap: ").Append(IndirectMap).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as MapTest); + } + + /// + /// Returns true if MapTest instances are equal + /// + /// Instance of MapTest to be compared + /// Boolean + public bool Equals(MapTest input) + { + if (input == null) + { + return false; + } + return + ( + this.MapMapOfString == input.MapMapOfString || + this.MapMapOfString != null && + input.MapMapOfString != null && + this.MapMapOfString.SequenceEqual(input.MapMapOfString) + ) && + ( + this.MapOfEnumString == input.MapOfEnumString || + this.MapOfEnumString != null && + input.MapOfEnumString != null && + this.MapOfEnumString.SequenceEqual(input.MapOfEnumString) + ) && + ( + this.DirectMap == input.DirectMap || + this.DirectMap != null && + input.DirectMap != null && + this.DirectMap.SequenceEqual(input.DirectMap) + ) && + ( + this.IndirectMap == input.IndirectMap || + this.IndirectMap != null && + input.IndirectMap != null && + this.IndirectMap.SequenceEqual(input.IndirectMap) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.MapMapOfString != null) + { + hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode(); + } + if (this.MapOfEnumString != null) + { + hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode(); + } + if (this.DirectMap != null) + { + hashCode = (hashCode * 59) + this.DirectMap.GetHashCode(); + } + if (this.IndirectMap != null) + { + hashCode = (hashCode * 59) + this.IndirectMap.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs new file mode 100644 index 00000000000..521d350a9ce --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -0,0 +1,173 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// MixedPropertiesAndAdditionalPropertiesClass + /// + [DataContract(Name = "MixedPropertiesAndAdditionalPropertiesClass")] + public partial class MixedPropertiesAndAdditionalPropertiesClass : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// uuidWithPattern. + /// uuid. + /// dateTime. + /// map. + public MixedPropertiesAndAdditionalPropertiesClass(Guid uuidWithPattern = default(Guid), Guid uuid = default(Guid), DateTime dateTime = default(DateTime), Dictionary map = default(Dictionary)) + { + this.UuidWithPattern = uuidWithPattern; + this.Uuid = uuid; + this.DateTime = dateTime; + this.Map = map; + } + + /// + /// Gets or Sets UuidWithPattern + /// + [DataMember(Name = "uuid_with_pattern", EmitDefaultValue = false)] + public Guid UuidWithPattern { get; set; } + + /// + /// Gets or Sets Uuid + /// + [DataMember(Name = "uuid", EmitDefaultValue = false)] + public Guid Uuid { get; set; } + + /// + /// Gets or Sets DateTime + /// + [DataMember(Name = "dateTime", EmitDefaultValue = false)] + public DateTime DateTime { get; set; } + + /// + /// Gets or Sets Map + /// + [DataMember(Name = "map", EmitDefaultValue = false)] + public Dictionary Map { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); + sb.Append(" UuidWithPattern: ").Append(UuidWithPattern).Append("\n"); + sb.Append(" Uuid: ").Append(Uuid).Append("\n"); + sb.Append(" DateTime: ").Append(DateTime).Append("\n"); + sb.Append(" Map: ").Append(Map).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as MixedPropertiesAndAdditionalPropertiesClass); + } + + /// + /// Returns true if MixedPropertiesAndAdditionalPropertiesClass instances are equal + /// + /// Instance of MixedPropertiesAndAdditionalPropertiesClass to be compared + /// Boolean + public bool Equals(MixedPropertiesAndAdditionalPropertiesClass input) + { + if (input == null) + { + return false; + } + return + ( + this.UuidWithPattern == input.UuidWithPattern || + (this.UuidWithPattern != null && + this.UuidWithPattern.Equals(input.UuidWithPattern)) + ) && + ( + this.Uuid == input.Uuid || + (this.Uuid != null && + this.Uuid.Equals(input.Uuid)) + ) && + ( + this.DateTime == input.DateTime || + (this.DateTime != null && + this.DateTime.Equals(input.DateTime)) + ) && + ( + this.Map == input.Map || + this.Map != null && + input.Map != null && + this.Map.SequenceEqual(input.Map) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.UuidWithPattern != null) + { + hashCode = (hashCode * 59) + this.UuidWithPattern.GetHashCode(); + } + if (this.Uuid != null) + { + hashCode = (hashCode * 59) + this.Uuid.GetHashCode(); + } + if (this.DateTime != null) + { + hashCode = (hashCode * 59) + this.DateTime.GetHashCode(); + } + if (this.Map != null) + { + hashCode = (hashCode * 59) + this.Map.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs new file mode 100644 index 00000000000..004448f603b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Model for testing model name starting with number + /// + [DataContract(Name = "200_response")] + public partial class Model200Response : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// name. + /// _class. + public Model200Response(int name = default(int), string _class = default(string)) + { + this.Name = name; + this.Class = _class; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", EmitDefaultValue = false)] + public int Name { get; set; } + + /// + /// Gets or Sets Class + /// + [DataMember(Name = "class", EmitDefaultValue = false)] + public string Class { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Model200Response {\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" Class: ").Append(Class).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Model200Response); + } + + /// + /// Returns true if Model200Response instances are equal + /// + /// Instance of Model200Response to be compared + /// Boolean + public bool Equals(Model200Response input) + { + if (input == null) + { + return false; + } + return + ( + this.Name == input.Name || + this.Name.Equals(input.Name) + ) && + ( + this.Class == input.Class || + (this.Class != null && + this.Class.Equals(input.Class)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Name.GetHashCode(); + if (this.Class != null) + { + hashCode = (hashCode * 59) + this.Class.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs new file mode 100644 index 00000000000..440c0f8b21f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ModelClient + /// + [DataContract(Name = "_Client")] + public partial class ModelClient : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// _client. + public ModelClient(string _client = default(string)) + { + this._Client = _client; + } + + /// + /// Gets or Sets _Client + /// + [DataMember(Name = "client", EmitDefaultValue = false)] + public string _Client { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ModelClient {\n"); + sb.Append(" _Client: ").Append(_Client).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ModelClient); + } + + /// + /// Returns true if ModelClient instances are equal + /// + /// Instance of ModelClient to be compared + /// Boolean + public bool Equals(ModelClient input) + { + if (input == null) + { + return false; + } + return + ( + this._Client == input._Client || + (this._Client != null && + this._Client.Equals(input._Client)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this._Client != null) + { + hashCode = (hashCode * 59) + this._Client.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs new file mode 100644 index 00000000000..a271f1d233d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs @@ -0,0 +1,177 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Model for testing model name same as property name + /// + [DataContract(Name = "Name")] + public partial class Name : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Name() { } + /// + /// Initializes a new instance of the class. + /// + /// name (required). + /// property. + public Name(int name = default(int), string property = default(string)) + { + this._Name = name; + this.Property = property; + } + + /// + /// Gets or Sets _Name + /// + [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] + public int _Name { get; set; } + + /// + /// Gets or Sets SnakeCase + /// + [DataMember(Name = "snake_case", EmitDefaultValue = false)] + public int SnakeCase { get; private set; } + + /// + /// Returns false as SnakeCase should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeSnakeCase() + { + return false; + } + /// + /// Gets or Sets Property + /// + [DataMember(Name = "property", EmitDefaultValue = false)] + public string Property { get; set; } + + /// + /// Gets or Sets _123Number + /// + [DataMember(Name = "123Number", EmitDefaultValue = false)] + public int _123Number { get; private set; } + + /// + /// Returns false as _123Number should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerialize_123Number() + { + return false; + } + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Name {\n"); + sb.Append(" _Name: ").Append(_Name).Append("\n"); + sb.Append(" SnakeCase: ").Append(SnakeCase).Append("\n"); + sb.Append(" Property: ").Append(Property).Append("\n"); + sb.Append(" _123Number: ").Append(_123Number).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Name); + } + + /// + /// Returns true if Name instances are equal + /// + /// Instance of Name to be compared + /// Boolean + public bool Equals(Name input) + { + if (input == null) + { + return false; + } + return + ( + this._Name == input._Name || + this._Name.Equals(input._Name) + ) && + ( + this.SnakeCase == input.SnakeCase || + this.SnakeCase.Equals(input.SnakeCase) + ) && + ( + this.Property == input.Property || + (this.Property != null && + this.Property.Equals(input.Property)) + ) && + ( + this._123Number == input._123Number || + this._123Number.Equals(input._123Number) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this._Name.GetHashCode(); + hashCode = (hashCode * 59) + this.SnakeCase.GetHashCode(); + if (this.Property != null) + { + hashCode = (hashCode * 59) + this.Property.GetHashCode(); + } + hashCode = (hashCode * 59) + this._123Number.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs new file mode 100644 index 00000000000..a6c79e5460a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs @@ -0,0 +1,324 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// NullableClass + /// + [DataContract(Name = "NullableClass")] + public partial class NullableClass : Dictionary, IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// integerProp. + /// numberProp. + /// booleanProp. + /// stringProp. + /// dateProp. + /// datetimeProp. + /// arrayNullableProp. + /// arrayAndItemsNullableProp. + /// arrayItemsNullable. + /// objectNullableProp. + /// objectAndItemsNullableProp. + /// objectItemsNullable. + public NullableClass(int? integerProp = default(int?), decimal? numberProp = default(decimal?), bool? booleanProp = default(bool?), string stringProp = default(string), DateTime? dateProp = default(DateTime?), DateTime? datetimeProp = default(DateTime?), List arrayNullableProp = default(List), List arrayAndItemsNullableProp = default(List), List arrayItemsNullable = default(List), Dictionary objectNullableProp = default(Dictionary), Dictionary objectAndItemsNullableProp = default(Dictionary), Dictionary objectItemsNullable = default(Dictionary)) : base() + { + this.IntegerProp = integerProp; + this.NumberProp = numberProp; + this.BooleanProp = booleanProp; + this.StringProp = stringProp; + this.DateProp = dateProp; + this.DatetimeProp = datetimeProp; + this.ArrayNullableProp = arrayNullableProp; + this.ArrayAndItemsNullableProp = arrayAndItemsNullableProp; + this.ArrayItemsNullable = arrayItemsNullable; + this.ObjectNullableProp = objectNullableProp; + this.ObjectAndItemsNullableProp = objectAndItemsNullableProp; + this.ObjectItemsNullable = objectItemsNullable; + } + + /// + /// Gets or Sets IntegerProp + /// + [DataMember(Name = "integer_prop", EmitDefaultValue = true)] + public int? IntegerProp { get; set; } + + /// + /// Gets or Sets NumberProp + /// + [DataMember(Name = "number_prop", EmitDefaultValue = true)] + public decimal? NumberProp { get; set; } + + /// + /// Gets or Sets BooleanProp + /// + [DataMember(Name = "boolean_prop", EmitDefaultValue = true)] + public bool? BooleanProp { get; set; } + + /// + /// Gets or Sets StringProp + /// + [DataMember(Name = "string_prop", EmitDefaultValue = true)] + public string StringProp { get; set; } + + /// + /// Gets or Sets DateProp + /// + [DataMember(Name = "date_prop", EmitDefaultValue = true)] + [JsonConverter(typeof(OpenAPIDateConverter))] + public DateTime? DateProp { get; set; } + + /// + /// Gets or Sets DatetimeProp + /// + [DataMember(Name = "datetime_prop", EmitDefaultValue = true)] + public DateTime? DatetimeProp { get; set; } + + /// + /// Gets or Sets ArrayNullableProp + /// + [DataMember(Name = "array_nullable_prop", EmitDefaultValue = true)] + public List ArrayNullableProp { get; set; } + + /// + /// Gets or Sets ArrayAndItemsNullableProp + /// + [DataMember(Name = "array_and_items_nullable_prop", EmitDefaultValue = true)] + public List ArrayAndItemsNullableProp { get; set; } + + /// + /// Gets or Sets ArrayItemsNullable + /// + [DataMember(Name = "array_items_nullable", EmitDefaultValue = false)] + public List ArrayItemsNullable { get; set; } + + /// + /// Gets or Sets ObjectNullableProp + /// + [DataMember(Name = "object_nullable_prop", EmitDefaultValue = true)] + public Dictionary ObjectNullableProp { get; set; } + + /// + /// Gets or Sets ObjectAndItemsNullableProp + /// + [DataMember(Name = "object_and_items_nullable_prop", EmitDefaultValue = true)] + public Dictionary ObjectAndItemsNullableProp { get; set; } + + /// + /// Gets or Sets ObjectItemsNullable + /// + [DataMember(Name = "object_items_nullable", EmitDefaultValue = false)] + public Dictionary ObjectItemsNullable { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class NullableClass {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" IntegerProp: ").Append(IntegerProp).Append("\n"); + sb.Append(" NumberProp: ").Append(NumberProp).Append("\n"); + sb.Append(" BooleanProp: ").Append(BooleanProp).Append("\n"); + sb.Append(" StringProp: ").Append(StringProp).Append("\n"); + sb.Append(" DateProp: ").Append(DateProp).Append("\n"); + sb.Append(" DatetimeProp: ").Append(DatetimeProp).Append("\n"); + sb.Append(" ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n"); + sb.Append(" ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n"); + sb.Append(" ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n"); + sb.Append(" ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n"); + sb.Append(" ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n"); + sb.Append(" ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as NullableClass); + } + + /// + /// Returns true if NullableClass instances are equal + /// + /// Instance of NullableClass to be compared + /// Boolean + public bool Equals(NullableClass input) + { + if (input == null) + { + return false; + } + return base.Equals(input) && + ( + this.IntegerProp == input.IntegerProp || + (this.IntegerProp != null && + this.IntegerProp.Equals(input.IntegerProp)) + ) && base.Equals(input) && + ( + this.NumberProp == input.NumberProp || + (this.NumberProp != null && + this.NumberProp.Equals(input.NumberProp)) + ) && base.Equals(input) && + ( + this.BooleanProp == input.BooleanProp || + (this.BooleanProp != null && + this.BooleanProp.Equals(input.BooleanProp)) + ) && base.Equals(input) && + ( + this.StringProp == input.StringProp || + (this.StringProp != null && + this.StringProp.Equals(input.StringProp)) + ) && base.Equals(input) && + ( + this.DateProp == input.DateProp || + (this.DateProp != null && + this.DateProp.Equals(input.DateProp)) + ) && base.Equals(input) && + ( + this.DatetimeProp == input.DatetimeProp || + (this.DatetimeProp != null && + this.DatetimeProp.Equals(input.DatetimeProp)) + ) && base.Equals(input) && + ( + this.ArrayNullableProp == input.ArrayNullableProp || + this.ArrayNullableProp != null && + input.ArrayNullableProp != null && + this.ArrayNullableProp.SequenceEqual(input.ArrayNullableProp) + ) && base.Equals(input) && + ( + this.ArrayAndItemsNullableProp == input.ArrayAndItemsNullableProp || + this.ArrayAndItemsNullableProp != null && + input.ArrayAndItemsNullableProp != null && + this.ArrayAndItemsNullableProp.SequenceEqual(input.ArrayAndItemsNullableProp) + ) && base.Equals(input) && + ( + this.ArrayItemsNullable == input.ArrayItemsNullable || + this.ArrayItemsNullable != null && + input.ArrayItemsNullable != null && + this.ArrayItemsNullable.SequenceEqual(input.ArrayItemsNullable) + ) && base.Equals(input) && + ( + this.ObjectNullableProp == input.ObjectNullableProp || + this.ObjectNullableProp != null && + input.ObjectNullableProp != null && + this.ObjectNullableProp.SequenceEqual(input.ObjectNullableProp) + ) && base.Equals(input) && + ( + this.ObjectAndItemsNullableProp == input.ObjectAndItemsNullableProp || + this.ObjectAndItemsNullableProp != null && + input.ObjectAndItemsNullableProp != null && + this.ObjectAndItemsNullableProp.SequenceEqual(input.ObjectAndItemsNullableProp) + ) && base.Equals(input) && + ( + this.ObjectItemsNullable == input.ObjectItemsNullable || + this.ObjectItemsNullable != null && + input.ObjectItemsNullable != null && + this.ObjectItemsNullable.SequenceEqual(input.ObjectItemsNullable) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.IntegerProp != null) + { + hashCode = (hashCode * 59) + this.IntegerProp.GetHashCode(); + } + if (this.NumberProp != null) + { + hashCode = (hashCode * 59) + this.NumberProp.GetHashCode(); + } + if (this.BooleanProp != null) + { + hashCode = (hashCode * 59) + this.BooleanProp.GetHashCode(); + } + if (this.StringProp != null) + { + hashCode = (hashCode * 59) + this.StringProp.GetHashCode(); + } + if (this.DateProp != null) + { + hashCode = (hashCode * 59) + this.DateProp.GetHashCode(); + } + if (this.DatetimeProp != null) + { + hashCode = (hashCode * 59) + this.DatetimeProp.GetHashCode(); + } + if (this.ArrayNullableProp != null) + { + hashCode = (hashCode * 59) + this.ArrayNullableProp.GetHashCode(); + } + if (this.ArrayAndItemsNullableProp != null) + { + hashCode = (hashCode * 59) + this.ArrayAndItemsNullableProp.GetHashCode(); + } + if (this.ArrayItemsNullable != null) + { + hashCode = (hashCode * 59) + this.ArrayItemsNullable.GetHashCode(); + } + if (this.ObjectNullableProp != null) + { + hashCode = (hashCode * 59) + this.ObjectNullableProp.GetHashCode(); + } + if (this.ObjectAndItemsNullableProp != null) + { + hashCode = (hashCode * 59) + this.ObjectAndItemsNullableProp.GetHashCode(); + } + if (this.ObjectItemsNullable != null) + { + hashCode = (hashCode * 59) + this.ObjectItemsNullable.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs new file mode 100644 index 00000000000..d1296b9d5ee --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// NullableGuidClass + /// + [DataContract(Name = "NullableGuidClass")] + public partial class NullableGuidClass : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// uuid. + public NullableGuidClass(Guid? uuid = default(Guid?)) + { + this.Uuid = uuid; + } + + /// + /// Gets or Sets Uuid + /// + [DataMember(Name = "uuid", EmitDefaultValue = true)] + public Guid? Uuid { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class NullableGuidClass {\n"); + sb.Append(" Uuid: ").Append(Uuid).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as NullableGuidClass); + } + + /// + /// Returns true if NullableGuidClass instances are equal + /// + /// Instance of NullableGuidClass to be compared + /// Boolean + public bool Equals(NullableGuidClass input) + { + if (input == null) + { + return false; + } + return + ( + this.Uuid == input.Uuid || + (this.Uuid != null && + this.Uuid.Equals(input.Uuid)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Uuid != null) + { + hashCode = (hashCode * 59) + this.Uuid.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs new file mode 100644 index 00000000000..5a83dcdc26d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs @@ -0,0 +1,292 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1. + /// + [JsonConverter(typeof(NullableShapeJsonConverter))] + [DataContract(Name = "NullableShape")] + public partial class NullableShape : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class. + /// + public NullableShape() + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Triangle. + public NullableShape(Triangle actualInstance) + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance; + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Quadrilateral. + public NullableShape(Quadrilateral actualInstance) + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance; + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(Quadrilateral)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(Triangle)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: Quadrilateral, Triangle"); + } + } + } + + /// + /// Get the actual instance of `Triangle`. If the actual instance is not `Triangle`, + /// the InvalidClassException will be thrown + /// + /// An instance of Triangle + public Triangle GetTriangle() + { + return (Triangle)this.ActualInstance; + } + + /// + /// Get the actual instance of `Quadrilateral`. If the actual instance is not `Quadrilateral`, + /// the InvalidClassException will be thrown + /// + /// An instance of Quadrilateral + public Quadrilateral GetQuadrilateral() + { + return (Quadrilateral)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class NullableShape {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, NullableShape.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of NullableShape + /// + /// JSON string + /// An instance of NullableShape + public static NullableShape FromJson(string jsonString) + { + NullableShape newNullableShape = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newNullableShape; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null) + { + newNullableShape = new NullableShape(JsonConvert.DeserializeObject(jsonString, NullableShape.SerializerSettings)); + } + else + { + newNullableShape = new NullableShape(JsonConvert.DeserializeObject(jsonString, NullableShape.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Quadrilateral"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Quadrilateral: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Triangle).GetProperty("AdditionalProperties") == null) + { + newNullableShape = new NullableShape(JsonConvert.DeserializeObject(jsonString, NullableShape.SerializerSettings)); + } + else + { + newNullableShape = new NullableShape(JsonConvert.DeserializeObject(jsonString, NullableShape.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Triangle"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Triangle: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newNullableShape; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as NullableShape); + } + + /// + /// Returns true if NullableShape instances are equal + /// + /// Instance of NullableShape to be compared + /// Boolean + public bool Equals(NullableShape input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for NullableShape + /// + public class NullableShapeJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(NullableShape).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return NullableShape.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs new file mode 100644 index 00000000000..3230dcc9193 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -0,0 +1,117 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.InteropServices; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// NumberOnly + /// + [CLSCompliant(true)] + [ComVisible(true)] + [DataContract(Name = "NumberOnly")] + public partial class NumberOnly : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// justNumber. + public NumberOnly(decimal justNumber = default(decimal)) + { + this.JustNumber = justNumber; + } + + /// + /// Gets or Sets JustNumber + /// + [DataMember(Name = "JustNumber", EmitDefaultValue = false)] + public decimal JustNumber { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class NumberOnly {\n"); + sb.Append(" JustNumber: ").Append(JustNumber).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as NumberOnly); + } + + /// + /// Returns true if NumberOnly instances are equal + /// + /// Instance of NumberOnly to be compared + /// Boolean + public bool Equals(NumberOnly input) + { + if (input == null) + { + return false; + } + return + ( + this.JustNumber == input.JustNumber || + this.JustNumber.Equals(input.JustNumber) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.JustNumber.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs new file mode 100644 index 00000000000..05bb2ca8de6 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -0,0 +1,172 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ObjectWithDeprecatedFields + /// + [DataContract(Name = "ObjectWithDeprecatedFields")] + public partial class ObjectWithDeprecatedFields : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// uuid. + /// id. + /// deprecatedRef. + /// bars. + public ObjectWithDeprecatedFields(string uuid = default(string), decimal id = default(decimal), DeprecatedObject deprecatedRef = default(DeprecatedObject), List bars = default(List)) + { + this.Uuid = uuid; + this.Id = id; + this.DeprecatedRef = deprecatedRef; + this.Bars = bars; + } + + /// + /// Gets or Sets Uuid + /// + [DataMember(Name = "uuid", EmitDefaultValue = false)] + public string Uuid { get; set; } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + [Obsolete] + public decimal Id { get; set; } + + /// + /// Gets or Sets DeprecatedRef + /// + [DataMember(Name = "deprecatedRef", EmitDefaultValue = false)] + [Obsolete] + public DeprecatedObject DeprecatedRef { get; set; } + + /// + /// Gets or Sets Bars + /// + [DataMember(Name = "bars", EmitDefaultValue = false)] + [Obsolete] + public List Bars { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ObjectWithDeprecatedFields {\n"); + sb.Append(" Uuid: ").Append(Uuid).Append("\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" DeprecatedRef: ").Append(DeprecatedRef).Append("\n"); + sb.Append(" Bars: ").Append(Bars).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ObjectWithDeprecatedFields); + } + + /// + /// Returns true if ObjectWithDeprecatedFields instances are equal + /// + /// Instance of ObjectWithDeprecatedFields to be compared + /// Boolean + public bool Equals(ObjectWithDeprecatedFields input) + { + if (input == null) + { + return false; + } + return + ( + this.Uuid == input.Uuid || + (this.Uuid != null && + this.Uuid.Equals(input.Uuid)) + ) && + ( + this.Id == input.Id || + this.Id.Equals(input.Id) + ) && + ( + this.DeprecatedRef == input.DeprecatedRef || + (this.DeprecatedRef != null && + this.DeprecatedRef.Equals(input.DeprecatedRef)) + ) && + ( + this.Bars == input.Bars || + this.Bars != null && + input.Bars != null && + this.Bars.SequenceEqual(input.Bars) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Uuid != null) + { + hashCode = (hashCode * 59) + this.Uuid.GetHashCode(); + } + hashCode = (hashCode * 59) + this.Id.GetHashCode(); + if (this.DeprecatedRef != null) + { + hashCode = (hashCode * 59) + this.DeprecatedRef.GetHashCode(); + } + if (this.Bars != null) + { + hashCode = (hashCode * 59) + this.Bars.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs new file mode 100644 index 00000000000..2dd1f1dd706 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs @@ -0,0 +1,216 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Order + /// + [DataContract(Name = "Order")] + public partial class Order : IEquatable + { + /// + /// Order Status + /// + /// Order Status + [JsonConverter(typeof(StringEnumConverter))] + public enum StatusEnum + { + /// + /// Enum Placed for value: placed + /// + [EnumMember(Value = "placed")] + Placed = 1, + + /// + /// Enum Approved for value: approved + /// + [EnumMember(Value = "approved")] + Approved = 2, + + /// + /// Enum Delivered for value: delivered + /// + [EnumMember(Value = "delivered")] + Delivered = 3 + + } + + + /// + /// Order Status + /// + /// Order Status + [DataMember(Name = "status", EmitDefaultValue = false)] + public StatusEnum? Status { get; set; } + /// + /// Initializes a new instance of the class. + /// + /// id. + /// petId. + /// quantity. + /// shipDate. + /// Order Status. + /// complete (default to false). + public Order(long id = default(long), long petId = default(long), int quantity = default(int), DateTime shipDate = default(DateTime), StatusEnum? status = default(StatusEnum?), bool complete = false) + { + this.Id = id; + this.PetId = petId; + this.Quantity = quantity; + this.ShipDate = shipDate; + this.Status = status; + this.Complete = complete; + } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + public long Id { get; set; } + + /// + /// Gets or Sets PetId + /// + [DataMember(Name = "petId", EmitDefaultValue = false)] + public long PetId { get; set; } + + /// + /// Gets or Sets Quantity + /// + [DataMember(Name = "quantity", EmitDefaultValue = false)] + public int Quantity { get; set; } + + /// + /// Gets or Sets ShipDate + /// + [DataMember(Name = "shipDate", EmitDefaultValue = false)] + public DateTime ShipDate { get; set; } + + /// + /// Gets or Sets Complete + /// + [DataMember(Name = "complete", EmitDefaultValue = true)] + public bool Complete { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Order {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" PetId: ").Append(PetId).Append("\n"); + sb.Append(" Quantity: ").Append(Quantity).Append("\n"); + sb.Append(" ShipDate: ").Append(ShipDate).Append("\n"); + sb.Append(" Status: ").Append(Status).Append("\n"); + sb.Append(" Complete: ").Append(Complete).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Order); + } + + /// + /// Returns true if Order instances are equal + /// + /// Instance of Order to be compared + /// Boolean + public bool Equals(Order input) + { + if (input == null) + { + return false; + } + return + ( + this.Id == input.Id || + this.Id.Equals(input.Id) + ) && + ( + this.PetId == input.PetId || + this.PetId.Equals(input.PetId) + ) && + ( + this.Quantity == input.Quantity || + this.Quantity.Equals(input.Quantity) + ) && + ( + this.ShipDate == input.ShipDate || + (this.ShipDate != null && + this.ShipDate.Equals(input.ShipDate)) + ) && + ( + this.Status == input.Status || + this.Status.Equals(input.Status) + ) && + ( + this.Complete == input.Complete || + this.Complete.Equals(input.Complete) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Id.GetHashCode(); + hashCode = (hashCode * 59) + this.PetId.GetHashCode(); + hashCode = (hashCode * 59) + this.Quantity.GetHashCode(); + if (this.ShipDate != null) + { + hashCode = (hashCode * 59) + this.ShipDate.GetHashCode(); + } + hashCode = (hashCode * 59) + this.Status.GetHashCode(); + hashCode = (hashCode * 59) + this.Complete.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs new file mode 100644 index 00000000000..56abf796947 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -0,0 +1,146 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// OuterComposite + /// + [DataContract(Name = "OuterComposite")] + public partial class OuterComposite : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// myNumber. + /// myString. + /// myBoolean. + public OuterComposite(decimal myNumber = default(decimal), string myString = default(string), bool myBoolean = default(bool)) + { + this.MyNumber = myNumber; + this.MyString = myString; + this.MyBoolean = myBoolean; + } + + /// + /// Gets or Sets MyNumber + /// + [DataMember(Name = "my_number", EmitDefaultValue = false)] + public decimal MyNumber { get; set; } + + /// + /// Gets or Sets MyString + /// + [DataMember(Name = "my_string", EmitDefaultValue = false)] + public string MyString { get; set; } + + /// + /// Gets or Sets MyBoolean + /// + [DataMember(Name = "my_boolean", EmitDefaultValue = true)] + public bool MyBoolean { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class OuterComposite {\n"); + sb.Append(" MyNumber: ").Append(MyNumber).Append("\n"); + sb.Append(" MyString: ").Append(MyString).Append("\n"); + sb.Append(" MyBoolean: ").Append(MyBoolean).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as OuterComposite); + } + + /// + /// Returns true if OuterComposite instances are equal + /// + /// Instance of OuterComposite to be compared + /// Boolean + public bool Equals(OuterComposite input) + { + if (input == null) + { + return false; + } + return + ( + this.MyNumber == input.MyNumber || + this.MyNumber.Equals(input.MyNumber) + ) && + ( + this.MyString == input.MyString || + (this.MyString != null && + this.MyString.Equals(input.MyString)) + ) && + ( + this.MyBoolean == input.MyBoolean || + this.MyBoolean.Equals(input.MyBoolean) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.MyNumber.GetHashCode(); + if (this.MyString != null) + { + hashCode = (hashCode * 59) + this.MyString.GetHashCode(); + } + hashCode = (hashCode * 59) + this.MyBoolean.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs new file mode 100644 index 00000000000..d7a78655975 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -0,0 +1,53 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines OuterEnum + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum OuterEnum + { + /// + /// Enum Placed for value: placed + /// + [EnumMember(Value = "placed")] + Placed = 1, + + /// + /// Enum Approved for value: approved + /// + [EnumMember(Value = "approved")] + Approved = 2, + + /// + /// Enum Delivered for value: delivered + /// + [EnumMember(Value = "delivered")] + Delivered = 3 + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs new file mode 100644 index 00000000000..85ed3c06c28 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -0,0 +1,53 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines OuterEnumDefaultValue + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum OuterEnumDefaultValue + { + /// + /// Enum Placed for value: placed + /// + [EnumMember(Value = "placed")] + Placed = 1, + + /// + /// Enum Approved for value: approved + /// + [EnumMember(Value = "approved")] + Approved = 2, + + /// + /// Enum Delivered for value: delivered + /// + [EnumMember(Value = "delivered")] + Delivered = 3 + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs new file mode 100644 index 00000000000..992a3ee78ec --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -0,0 +1,49 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines OuterEnumInteger + /// + public enum OuterEnumInteger + { + /// + /// Enum NUMBER_0 for value: 0 + /// + NUMBER_0 = 0, + + /// + /// Enum NUMBER_1 for value: 1 + /// + NUMBER_1 = 1, + + /// + /// Enum NUMBER_2 for value: 2 + /// + NUMBER_2 = 2 + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs new file mode 100644 index 00000000000..9d2e0c2c255 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -0,0 +1,49 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Defines OuterEnumIntegerDefaultValue + /// + public enum OuterEnumIntegerDefaultValue + { + /// + /// Enum NUMBER_0 for value: 0 + /// + NUMBER_0 = 0, + + /// + /// Enum NUMBER_1 for value: 1 + /// + NUMBER_1 = 1, + + /// + /// Enum NUMBER_2 for value: 2 + /// + NUMBER_2 = 2 + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs new file mode 100644 index 00000000000..63f93900d87 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs @@ -0,0 +1,107 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ParentPet + /// + [DataContract(Name = "ParentPet")] + public partial class ParentPet : GrandparentAnimal, IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected ParentPet() { } + /// + /// Initializes a new instance of the class. + /// + /// petType (required) (default to "ParentPet"). + public ParentPet(string petType = "ParentPet") : base(petType) + { + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ParentPet {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ParentPet); + } + + /// + /// Returns true if ParentPet instances are equal + /// + /// Instance of ParentPet to be compared + /// Boolean + public bool Equals(ParentPet input) + { + if (input == null) + { + return false; + } + return base.Equals(input); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs new file mode 100644 index 00000000000..ea9ccc856c7 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs @@ -0,0 +1,245 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Pet + /// + [DataContract(Name = "Pet")] + public partial class Pet : IEquatable + { + /// + /// pet status in the store + /// + /// pet status in the store + [JsonConverter(typeof(StringEnumConverter))] + public enum StatusEnum + { + /// + /// Enum Available for value: available + /// + [EnumMember(Value = "available")] + Available = 1, + + /// + /// Enum Pending for value: pending + /// + [EnumMember(Value = "pending")] + Pending = 2, + + /// + /// Enum Sold for value: sold + /// + [EnumMember(Value = "sold")] + Sold = 3 + + } + + + /// + /// pet status in the store + /// + /// pet status in the store + [DataMember(Name = "status", EmitDefaultValue = false)] + public StatusEnum? Status { get; set; } + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Pet() { } + /// + /// Initializes a new instance of the class. + /// + /// id. + /// category. + /// name (required). + /// photoUrls (required). + /// tags. + /// pet status in the store. + public Pet(long id = default(long), Category category = default(Category), string name = default(string), List photoUrls = default(List), List tags = default(List), StatusEnum? status = default(StatusEnum?)) + { + // to ensure "name" is required (not null) + if (name == null) + { + throw new ArgumentNullException("name is a required property for Pet and cannot be null"); + } + this.Name = name; + // to ensure "photoUrls" is required (not null) + if (photoUrls == null) + { + throw new ArgumentNullException("photoUrls is a required property for Pet and cannot be null"); + } + this.PhotoUrls = photoUrls; + this.Id = id; + this.Category = category; + this.Tags = tags; + this.Status = status; + } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + public long Id { get; set; } + + /// + /// Gets or Sets Category + /// + [DataMember(Name = "category", EmitDefaultValue = false)] + public Category Category { get; set; } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] + public string Name { get; set; } + + /// + /// Gets or Sets PhotoUrls + /// + [DataMember(Name = "photoUrls", IsRequired = true, EmitDefaultValue = true)] + public List PhotoUrls { get; set; } + + /// + /// Gets or Sets Tags + /// + [DataMember(Name = "tags", EmitDefaultValue = false)] + public List Tags { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Pet {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Category: ").Append(Category).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PhotoUrls: ").Append(PhotoUrls).Append("\n"); + sb.Append(" Tags: ").Append(Tags).Append("\n"); + sb.Append(" Status: ").Append(Status).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Pet); + } + + /// + /// Returns true if Pet instances are equal + /// + /// Instance of Pet to be compared + /// Boolean + public bool Equals(Pet input) + { + if (input == null) + { + return false; + } + return + ( + this.Id == input.Id || + this.Id.Equals(input.Id) + ) && + ( + this.Category == input.Category || + (this.Category != null && + this.Category.Equals(input.Category)) + ) && + ( + this.Name == input.Name || + (this.Name != null && + this.Name.Equals(input.Name)) + ) && + ( + this.PhotoUrls == input.PhotoUrls || + this.PhotoUrls != null && + input.PhotoUrls != null && + this.PhotoUrls.SequenceEqual(input.PhotoUrls) + ) && + ( + this.Tags == input.Tags || + this.Tags != null && + input.Tags != null && + this.Tags.SequenceEqual(input.Tags) + ) && + ( + this.Status == input.Status || + this.Status.Equals(input.Status) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Id.GetHashCode(); + if (this.Category != null) + { + hashCode = (hashCode * 59) + this.Category.GetHashCode(); + } + if (this.Name != null) + { + hashCode = (hashCode * 59) + this.Name.GetHashCode(); + } + if (this.PhotoUrls != null) + { + hashCode = (hashCode * 59) + this.PhotoUrls.GetHashCode(); + } + if (this.Tags != null) + { + hashCode = (hashCode * 59) + this.Tags.GetHashCode(); + } + hashCode = (hashCode * 59) + this.Status.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs new file mode 100644 index 00000000000..8cbe04cce1c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs @@ -0,0 +1,283 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// Pig + /// + [JsonConverter(typeof(PigJsonConverter))] + [DataContract(Name = "Pig")] + public partial class Pig : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of BasquePig. + public Pig(BasquePig actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of DanishPig. + public Pig(DanishPig actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(BasquePig)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(DanishPig)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: BasquePig, DanishPig"); + } + } + } + + /// + /// Get the actual instance of `BasquePig`. If the actual instance is not `BasquePig`, + /// the InvalidClassException will be thrown + /// + /// An instance of BasquePig + public BasquePig GetBasquePig() + { + return (BasquePig)this.ActualInstance; + } + + /// + /// Get the actual instance of `DanishPig`. If the actual instance is not `DanishPig`, + /// the InvalidClassException will be thrown + /// + /// An instance of DanishPig + public DanishPig GetDanishPig() + { + return (DanishPig)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Pig {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, Pig.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of Pig + /// + /// JSON string + /// An instance of Pig + public static Pig FromJson(string jsonString) + { + Pig newPig = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newPig; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(BasquePig).GetProperty("AdditionalProperties") == null) + { + newPig = new Pig(JsonConvert.DeserializeObject(jsonString, Pig.SerializerSettings)); + } + else + { + newPig = new Pig(JsonConvert.DeserializeObject(jsonString, Pig.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("BasquePig"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into BasquePig: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(DanishPig).GetProperty("AdditionalProperties") == null) + { + newPig = new Pig(JsonConvert.DeserializeObject(jsonString, Pig.SerializerSettings)); + } + else + { + newPig = new Pig(JsonConvert.DeserializeObject(jsonString, Pig.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("DanishPig"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into DanishPig: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newPig; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Pig); + } + + /// + /// Returns true if Pig instances are equal + /// + /// Instance of Pig to be compared + /// Boolean + public bool Equals(Pig input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for Pig + /// + public class PigJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(Pig).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return Pig.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs new file mode 100644 index 00000000000..4797a5bec81 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -0,0 +1,375 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// PolymorphicProperty + /// + [JsonConverter(typeof(PolymorphicPropertyJsonConverter))] + [DataContract(Name = "PolymorphicProperty")] + public partial class PolymorphicProperty : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of bool. + public PolymorphicProperty(bool actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance; + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of string. + public PolymorphicProperty(string actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Object. + public PolymorphicProperty(Object actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of List<string>. + public PolymorphicProperty(List actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(List)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(Object)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(bool)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(string)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: List, Object, bool, string"); + } + } + } + + /// + /// Get the actual instance of `bool`. If the actual instance is not `bool`, + /// the InvalidClassException will be thrown + /// + /// An instance of bool + public bool GetBool() + { + return (bool)this.ActualInstance; + } + + /// + /// Get the actual instance of `string`. If the actual instance is not `string`, + /// the InvalidClassException will be thrown + /// + /// An instance of string + public string GetString() + { + return (string)this.ActualInstance; + } + + /// + /// Get the actual instance of `Object`. If the actual instance is not `Object`, + /// the InvalidClassException will be thrown + /// + /// An instance of Object + public Object GetObject() + { + return (Object)this.ActualInstance; + } + + /// + /// Get the actual instance of `List<string>`. If the actual instance is not `List<string>`, + /// the InvalidClassException will be thrown + /// + /// An instance of List<string> + public List GetListString() + { + return (List)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class PolymorphicProperty {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, PolymorphicProperty.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of PolymorphicProperty + /// + /// JSON string + /// An instance of PolymorphicProperty + public static PolymorphicProperty FromJson(string jsonString) + { + PolymorphicProperty newPolymorphicProperty = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newPolymorphicProperty; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(List).GetProperty("AdditionalProperties") == null) + { + newPolymorphicProperty = new PolymorphicProperty(JsonConvert.DeserializeObject>(jsonString, PolymorphicProperty.SerializerSettings)); + } + else + { + newPolymorphicProperty = new PolymorphicProperty(JsonConvert.DeserializeObject>(jsonString, PolymorphicProperty.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("List"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into List: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Object).GetProperty("AdditionalProperties") == null) + { + newPolymorphicProperty = new PolymorphicProperty(JsonConvert.DeserializeObject(jsonString, PolymorphicProperty.SerializerSettings)); + } + else + { + newPolymorphicProperty = new PolymorphicProperty(JsonConvert.DeserializeObject(jsonString, PolymorphicProperty.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Object"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Object: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(bool).GetProperty("AdditionalProperties") == null) + { + newPolymorphicProperty = new PolymorphicProperty(JsonConvert.DeserializeObject(jsonString, PolymorphicProperty.SerializerSettings)); + } + else + { + newPolymorphicProperty = new PolymorphicProperty(JsonConvert.DeserializeObject(jsonString, PolymorphicProperty.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("bool"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into bool: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(string).GetProperty("AdditionalProperties") == null) + { + newPolymorphicProperty = new PolymorphicProperty(JsonConvert.DeserializeObject(jsonString, PolymorphicProperty.SerializerSettings)); + } + else + { + newPolymorphicProperty = new PolymorphicProperty(JsonConvert.DeserializeObject(jsonString, PolymorphicProperty.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("string"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into string: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newPolymorphicProperty; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as PolymorphicProperty); + } + + /// + /// Returns true if PolymorphicProperty instances are equal + /// + /// Instance of PolymorphicProperty to be compared + /// Boolean + public bool Equals(PolymorphicProperty input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for PolymorphicProperty + /// + public class PolymorphicPropertyJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(PolymorphicProperty).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return PolymorphicProperty.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs new file mode 100644 index 00000000000..d4739223613 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -0,0 +1,283 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// Quadrilateral + /// + [JsonConverter(typeof(QuadrilateralJsonConverter))] + [DataContract(Name = "Quadrilateral")] + public partial class Quadrilateral : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of SimpleQuadrilateral. + public Quadrilateral(SimpleQuadrilateral actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of ComplexQuadrilateral. + public Quadrilateral(ComplexQuadrilateral actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(ComplexQuadrilateral)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(SimpleQuadrilateral)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: ComplexQuadrilateral, SimpleQuadrilateral"); + } + } + } + + /// + /// Get the actual instance of `SimpleQuadrilateral`. If the actual instance is not `SimpleQuadrilateral`, + /// the InvalidClassException will be thrown + /// + /// An instance of SimpleQuadrilateral + public SimpleQuadrilateral GetSimpleQuadrilateral() + { + return (SimpleQuadrilateral)this.ActualInstance; + } + + /// + /// Get the actual instance of `ComplexQuadrilateral`. If the actual instance is not `ComplexQuadrilateral`, + /// the InvalidClassException will be thrown + /// + /// An instance of ComplexQuadrilateral + public ComplexQuadrilateral GetComplexQuadrilateral() + { + return (ComplexQuadrilateral)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Quadrilateral {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, Quadrilateral.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of Quadrilateral + /// + /// JSON string + /// An instance of Quadrilateral + public static Quadrilateral FromJson(string jsonString) + { + Quadrilateral newQuadrilateral = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newQuadrilateral; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(ComplexQuadrilateral).GetProperty("AdditionalProperties") == null) + { + newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject(jsonString, Quadrilateral.SerializerSettings)); + } + else + { + newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("ComplexQuadrilateral"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into ComplexQuadrilateral: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(SimpleQuadrilateral).GetProperty("AdditionalProperties") == null) + { + newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject(jsonString, Quadrilateral.SerializerSettings)); + } + else + { + newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("SimpleQuadrilateral"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into SimpleQuadrilateral: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newQuadrilateral; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Quadrilateral); + } + + /// + /// Returns true if Quadrilateral instances are equal + /// + /// Instance of Quadrilateral to be compared + /// Boolean + public bool Equals(Quadrilateral input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for Quadrilateral + /// + public class QuadrilateralJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(Quadrilateral).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return Quadrilateral.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs new file mode 100644 index 00000000000..d8019ea97f4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -0,0 +1,128 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// QuadrilateralInterface + /// + [DataContract(Name = "QuadrilateralInterface")] + public partial class QuadrilateralInterface : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected QuadrilateralInterface() { } + /// + /// Initializes a new instance of the class. + /// + /// quadrilateralType (required). + public QuadrilateralInterface(string quadrilateralType = default(string)) + { + // to ensure "quadrilateralType" is required (not null) + if (quadrilateralType == null) + { + throw new ArgumentNullException("quadrilateralType is a required property for QuadrilateralInterface and cannot be null"); + } + this.QuadrilateralType = quadrilateralType; + } + + /// + /// Gets or Sets QuadrilateralType + /// + [DataMember(Name = "quadrilateralType", IsRequired = true, EmitDefaultValue = true)] + public string QuadrilateralType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class QuadrilateralInterface {\n"); + sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as QuadrilateralInterface); + } + + /// + /// Returns true if QuadrilateralInterface instances are equal + /// + /// Instance of QuadrilateralInterface to be compared + /// Boolean + public bool Equals(QuadrilateralInterface input) + { + if (input == null) + { + return false; + } + return + ( + this.QuadrilateralType == input.QuadrilateralType || + (this.QuadrilateralType != null && + this.QuadrilateralType.Equals(input.QuadrilateralType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.QuadrilateralType != null) + { + hashCode = (hashCode * 59) + this.QuadrilateralType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs new file mode 100644 index 00000000000..b32dad8c6d0 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -0,0 +1,142 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ReadOnlyFirst + /// + [DataContract(Name = "ReadOnlyFirst")] + public partial class ReadOnlyFirst : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// baz. + public ReadOnlyFirst(string baz = default(string)) + { + this.Baz = baz; + } + + /// + /// Gets or Sets Bar + /// + [DataMember(Name = "bar", EmitDefaultValue = false)] + public string Bar { get; private set; } + + /// + /// Returns false as Bar should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeBar() + { + return false; + } + /// + /// Gets or Sets Baz + /// + [DataMember(Name = "baz", EmitDefaultValue = false)] + public string Baz { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ReadOnlyFirst {\n"); + sb.Append(" Bar: ").Append(Bar).Append("\n"); + sb.Append(" Baz: ").Append(Baz).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ReadOnlyFirst); + } + + /// + /// Returns true if ReadOnlyFirst instances are equal + /// + /// Instance of ReadOnlyFirst to be compared + /// Boolean + public bool Equals(ReadOnlyFirst input) + { + if (input == null) + { + return false; + } + return + ( + this.Bar == input.Bar || + (this.Bar != null && + this.Bar.Equals(input.Bar)) + ) && + ( + this.Baz == input.Baz || + (this.Baz != null && + this.Baz.Equals(input.Baz)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Bar != null) + { + hashCode = (hashCode * 59) + this.Bar.GetHashCode(); + } + if (this.Baz != null) + { + hashCode = (hashCode * 59) + this.Baz.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs new file mode 100644 index 00000000000..bf5eff2c4eb --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs @@ -0,0 +1,114 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Model for testing reserved words + /// + [DataContract(Name = "Return")] + public partial class Return : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// _return. + public Return(int _return = default(int)) + { + this._Return = _return; + } + + /// + /// Gets or Sets _Return + /// + [DataMember(Name = "return", EmitDefaultValue = false)] + public int _Return { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Return {\n"); + sb.Append(" _Return: ").Append(_Return).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Return); + } + + /// + /// Returns true if Return instances are equal + /// + /// Instance of Return to be compared + /// Boolean + public bool Equals(Return input) + { + if (input == null) + { + return false; + } + return + ( + this._Return == input._Return || + this._Return.Equals(input._Return) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this._Return.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs new file mode 100644 index 00000000000..2af6ed02f49 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -0,0 +1,151 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ScaleneTriangle + /// + [DataContract(Name = "ScaleneTriangle")] + public partial class ScaleneTriangle : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected ScaleneTriangle() { } + /// + /// Initializes a new instance of the class. + /// + /// shapeType (required). + /// triangleType (required). + public ScaleneTriangle(string shapeType = default(string), string triangleType = default(string)) + { + // to ensure "shapeType" is required (not null) + if (shapeType == null) + { + throw new ArgumentNullException("shapeType is a required property for ScaleneTriangle and cannot be null"); + } + this.ShapeType = shapeType; + // to ensure "triangleType" is required (not null) + if (triangleType == null) + { + throw new ArgumentNullException("triangleType is a required property for ScaleneTriangle and cannot be null"); + } + this.TriangleType = triangleType; + } + + /// + /// Gets or Sets ShapeType + /// + [DataMember(Name = "shapeType", IsRequired = true, EmitDefaultValue = true)] + public string ShapeType { get; set; } + + /// + /// Gets or Sets TriangleType + /// + [DataMember(Name = "triangleType", IsRequired = true, EmitDefaultValue = true)] + public string TriangleType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ScaleneTriangle {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ScaleneTriangle); + } + + /// + /// Returns true if ScaleneTriangle instances are equal + /// + /// Instance of ScaleneTriangle to be compared + /// Boolean + public bool Equals(ScaleneTriangle input) + { + if (input == null) + { + return false; + } + return + ( + this.ShapeType == input.ShapeType || + (this.ShapeType != null && + this.ShapeType.Equals(input.ShapeType)) + ) && + ( + this.TriangleType == input.TriangleType || + (this.TriangleType != null && + this.TriangleType.Equals(input.TriangleType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ShapeType != null) + { + hashCode = (hashCode * 59) + this.ShapeType.GetHashCode(); + } + if (this.TriangleType != null) + { + hashCode = (hashCode * 59) + this.TriangleType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs new file mode 100644 index 00000000000..41ddeffca3a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs @@ -0,0 +1,283 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// Shape + /// + [JsonConverter(typeof(ShapeJsonConverter))] + [DataContract(Name = "Shape")] + public partial class Shape : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Triangle. + public Shape(Triangle actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Quadrilateral. + public Shape(Quadrilateral actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(Quadrilateral)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(Triangle)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: Quadrilateral, Triangle"); + } + } + } + + /// + /// Get the actual instance of `Triangle`. If the actual instance is not `Triangle`, + /// the InvalidClassException will be thrown + /// + /// An instance of Triangle + public Triangle GetTriangle() + { + return (Triangle)this.ActualInstance; + } + + /// + /// Get the actual instance of `Quadrilateral`. If the actual instance is not `Quadrilateral`, + /// the InvalidClassException will be thrown + /// + /// An instance of Quadrilateral + public Quadrilateral GetQuadrilateral() + { + return (Quadrilateral)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Shape {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, Shape.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of Shape + /// + /// JSON string + /// An instance of Shape + public static Shape FromJson(string jsonString) + { + Shape newShape = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newShape; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null) + { + newShape = new Shape(JsonConvert.DeserializeObject(jsonString, Shape.SerializerSettings)); + } + else + { + newShape = new Shape(JsonConvert.DeserializeObject(jsonString, Shape.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Quadrilateral"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Quadrilateral: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Triangle).GetProperty("AdditionalProperties") == null) + { + newShape = new Shape(JsonConvert.DeserializeObject(jsonString, Shape.SerializerSettings)); + } + else + { + newShape = new Shape(JsonConvert.DeserializeObject(jsonString, Shape.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Triangle"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Triangle: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newShape; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Shape); + } + + /// + /// Returns true if Shape instances are equal + /// + /// Instance of Shape to be compared + /// Boolean + public bool Equals(Shape input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for Shape + /// + public class ShapeJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(Shape).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return Shape.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs new file mode 100644 index 00000000000..059b987eb0d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -0,0 +1,128 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// ShapeInterface + /// + [DataContract(Name = "ShapeInterface")] + public partial class ShapeInterface : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected ShapeInterface() { } + /// + /// Initializes a new instance of the class. + /// + /// shapeType (required). + public ShapeInterface(string shapeType = default(string)) + { + // to ensure "shapeType" is required (not null) + if (shapeType == null) + { + throw new ArgumentNullException("shapeType is a required property for ShapeInterface and cannot be null"); + } + this.ShapeType = shapeType; + } + + /// + /// Gets or Sets ShapeType + /// + [DataMember(Name = "shapeType", IsRequired = true, EmitDefaultValue = true)] + public string ShapeType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class ShapeInterface {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ShapeInterface); + } + + /// + /// Returns true if ShapeInterface instances are equal + /// + /// Instance of ShapeInterface to be compared + /// Boolean + public bool Equals(ShapeInterface input) + { + if (input == null) + { + return false; + } + return + ( + this.ShapeType == input.ShapeType || + (this.ShapeType != null && + this.ShapeType.Equals(input.ShapeType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ShapeType != null) + { + hashCode = (hashCode * 59) + this.ShapeType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs new file mode 100644 index 00000000000..2f906a61f94 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -0,0 +1,292 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1. + /// + [JsonConverter(typeof(ShapeOrNullJsonConverter))] + [DataContract(Name = "ShapeOrNull")] + public partial class ShapeOrNull : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class. + /// + public ShapeOrNull() + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Triangle. + public ShapeOrNull(Triangle actualInstance) + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance; + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of Quadrilateral. + public ShapeOrNull(Quadrilateral actualInstance) + { + this.IsNullable = true; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance; + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(Quadrilateral)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(Triangle)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: Quadrilateral, Triangle"); + } + } + } + + /// + /// Get the actual instance of `Triangle`. If the actual instance is not `Triangle`, + /// the InvalidClassException will be thrown + /// + /// An instance of Triangle + public Triangle GetTriangle() + { + return (Triangle)this.ActualInstance; + } + + /// + /// Get the actual instance of `Quadrilateral`. If the actual instance is not `Quadrilateral`, + /// the InvalidClassException will be thrown + /// + /// An instance of Quadrilateral + public Quadrilateral GetQuadrilateral() + { + return (Quadrilateral)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class ShapeOrNull {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, ShapeOrNull.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of ShapeOrNull + /// + /// JSON string + /// An instance of ShapeOrNull + public static ShapeOrNull FromJson(string jsonString) + { + ShapeOrNull newShapeOrNull = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newShapeOrNull; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null) + { + newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject(jsonString, ShapeOrNull.SerializerSettings)); + } + else + { + newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Quadrilateral"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Quadrilateral: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(Triangle).GetProperty("AdditionalProperties") == null) + { + newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject(jsonString, ShapeOrNull.SerializerSettings)); + } + else + { + newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("Triangle"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into Triangle: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newShapeOrNull; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as ShapeOrNull); + } + + /// + /// Returns true if ShapeOrNull instances are equal + /// + /// Instance of ShapeOrNull to be compared + /// Boolean + public bool Equals(ShapeOrNull input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for ShapeOrNull + /// + public class ShapeOrNullJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(ShapeOrNull).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return ShapeOrNull.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs new file mode 100644 index 00000000000..c502ce260dc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -0,0 +1,151 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// SimpleQuadrilateral + /// + [DataContract(Name = "SimpleQuadrilateral")] + public partial class SimpleQuadrilateral : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected SimpleQuadrilateral() { } + /// + /// Initializes a new instance of the class. + /// + /// shapeType (required). + /// quadrilateralType (required). + public SimpleQuadrilateral(string shapeType = default(string), string quadrilateralType = default(string)) + { + // to ensure "shapeType" is required (not null) + if (shapeType == null) + { + throw new ArgumentNullException("shapeType is a required property for SimpleQuadrilateral and cannot be null"); + } + this.ShapeType = shapeType; + // to ensure "quadrilateralType" is required (not null) + if (quadrilateralType == null) + { + throw new ArgumentNullException("quadrilateralType is a required property for SimpleQuadrilateral and cannot be null"); + } + this.QuadrilateralType = quadrilateralType; + } + + /// + /// Gets or Sets ShapeType + /// + [DataMember(Name = "shapeType", IsRequired = true, EmitDefaultValue = true)] + public string ShapeType { get; set; } + + /// + /// Gets or Sets QuadrilateralType + /// + [DataMember(Name = "quadrilateralType", IsRequired = true, EmitDefaultValue = true)] + public string QuadrilateralType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class SimpleQuadrilateral {\n"); + sb.Append(" ShapeType: ").Append(ShapeType).Append("\n"); + sb.Append(" QuadrilateralType: ").Append(QuadrilateralType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as SimpleQuadrilateral); + } + + /// + /// Returns true if SimpleQuadrilateral instances are equal + /// + /// Instance of SimpleQuadrilateral to be compared + /// Boolean + public bool Equals(SimpleQuadrilateral input) + { + if (input == null) + { + return false; + } + return + ( + this.ShapeType == input.ShapeType || + (this.ShapeType != null && + this.ShapeType.Equals(input.ShapeType)) + ) && + ( + this.QuadrilateralType == input.QuadrilateralType || + (this.QuadrilateralType != null && + this.QuadrilateralType.Equals(input.QuadrilateralType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ShapeType != null) + { + hashCode = (hashCode * 59) + this.ShapeType.GetHashCode(); + } + if (this.QuadrilateralType != null) + { + hashCode = (hashCode * 59) + this.QuadrilateralType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs new file mode 100644 index 00000000000..9f12aefffd2 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// SpecialModelName + /// + [DataContract(Name = "_special_model.name_")] + public partial class SpecialModelName : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// specialPropertyName. + /// specialModelName. + public SpecialModelName(long specialPropertyName = default(long), string specialModelName = default(string)) + { + this.SpecialPropertyName = specialPropertyName; + this._SpecialModelName = specialModelName; + } + + /// + /// Gets or Sets SpecialPropertyName + /// + [DataMember(Name = "$special[property.name]", EmitDefaultValue = false)] + public long SpecialPropertyName { get; set; } + + /// + /// Gets or Sets _SpecialModelName + /// + [DataMember(Name = "_special_model.name_", EmitDefaultValue = false)] + public string _SpecialModelName { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class SpecialModelName {\n"); + sb.Append(" SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n"); + sb.Append(" _SpecialModelName: ").Append(_SpecialModelName).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as SpecialModelName); + } + + /// + /// Returns true if SpecialModelName instances are equal + /// + /// Instance of SpecialModelName to be compared + /// Boolean + public bool Equals(SpecialModelName input) + { + if (input == null) + { + return false; + } + return + ( + this.SpecialPropertyName == input.SpecialPropertyName || + this.SpecialPropertyName.Equals(input.SpecialPropertyName) + ) && + ( + this._SpecialModelName == input._SpecialModelName || + (this._SpecialModelName != null && + this._SpecialModelName.Equals(input._SpecialModelName)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.SpecialPropertyName.GetHashCode(); + if (this._SpecialModelName != null) + { + hashCode = (hashCode * 59) + this._SpecialModelName.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs new file mode 100644 index 00000000000..5699133e667 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Tag + /// + [DataContract(Name = "Tag")] + public partial class Tag : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// id. + /// name. + public Tag(long id = default(long), string name = default(string)) + { + this.Id = id; + this.Name = name; + } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + public long Id { get; set; } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", EmitDefaultValue = false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Tag {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Tag); + } + + /// + /// Returns true if Tag instances are equal + /// + /// Instance of Tag to be compared + /// Boolean + public bool Equals(Tag input) + { + if (input == null) + { + return false; + } + return + ( + this.Id == input.Id || + this.Id.Equals(input.Id) + ) && + ( + this.Name == input.Name || + (this.Name != null && + this.Name.Equals(input.Name)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Id.GetHashCode(); + if (this.Name != null) + { + hashCode = (hashCode * 59) + this.Name.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs new file mode 100644 index 00000000000..b0c5afe68a0 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs @@ -0,0 +1,329 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using System.Reflection; + +namespace Org.OpenAPITools.Model +{ + /// + /// Triangle + /// + [JsonConverter(typeof(TriangleJsonConverter))] + [DataContract(Name = "Triangle")] + public partial class Triangle : AbstractOpenAPISchema, IEquatable + { + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of EquilateralTriangle. + public Triangle(EquilateralTriangle actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of IsoscelesTriangle. + public Triangle(IsoscelesTriangle actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + /// + /// Initializes a new instance of the class + /// with the class + /// + /// An instance of ScaleneTriangle. + public Triangle(ScaleneTriangle actualInstance) + { + this.IsNullable = false; + this.SchemaType= "oneOf"; + this.ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null."); + } + + + private Object _actualInstance; + + /// + /// Gets or Sets ActualInstance + /// + public override Object ActualInstance + { + get + { + return _actualInstance; + } + set + { + if (value.GetType() == typeof(EquilateralTriangle)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(IsoscelesTriangle)) + { + this._actualInstance = value; + } + else if (value.GetType() == typeof(ScaleneTriangle)) + { + this._actualInstance = value; + } + else + { + throw new ArgumentException("Invalid instance found. Must be the following types: EquilateralTriangle, IsoscelesTriangle, ScaleneTriangle"); + } + } + } + + /// + /// Get the actual instance of `EquilateralTriangle`. If the actual instance is not `EquilateralTriangle`, + /// the InvalidClassException will be thrown + /// + /// An instance of EquilateralTriangle + public EquilateralTriangle GetEquilateralTriangle() + { + return (EquilateralTriangle)this.ActualInstance; + } + + /// + /// Get the actual instance of `IsoscelesTriangle`. If the actual instance is not `IsoscelesTriangle`, + /// the InvalidClassException will be thrown + /// + /// An instance of IsoscelesTriangle + public IsoscelesTriangle GetIsoscelesTriangle() + { + return (IsoscelesTriangle)this.ActualInstance; + } + + /// + /// Get the actual instance of `ScaleneTriangle`. If the actual instance is not `ScaleneTriangle`, + /// the InvalidClassException will be thrown + /// + /// An instance of ScaleneTriangle + public ScaleneTriangle GetScaleneTriangle() + { + return (ScaleneTriangle)this.ActualInstance; + } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Triangle {\n"); + sb.Append(" ActualInstance: ").Append(this.ActualInstance).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public override string ToJson() + { + return JsonConvert.SerializeObject(this.ActualInstance, Triangle.SerializerSettings); + } + + /// + /// Converts the JSON string into an instance of Triangle + /// + /// JSON string + /// An instance of Triangle + public static Triangle FromJson(string jsonString) + { + Triangle newTriangle = null; + + if (string.IsNullOrEmpty(jsonString)) + { + return newTriangle; + } + int match = 0; + List matchedTypes = new List(); + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(EquilateralTriangle).GetProperty("AdditionalProperties") == null) + { + newTriangle = new Triangle(JsonConvert.DeserializeObject(jsonString, Triangle.SerializerSettings)); + } + else + { + newTriangle = new Triangle(JsonConvert.DeserializeObject(jsonString, Triangle.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("EquilateralTriangle"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into EquilateralTriangle: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(IsoscelesTriangle).GetProperty("AdditionalProperties") == null) + { + newTriangle = new Triangle(JsonConvert.DeserializeObject(jsonString, Triangle.SerializerSettings)); + } + else + { + newTriangle = new Triangle(JsonConvert.DeserializeObject(jsonString, Triangle.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("IsoscelesTriangle"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into IsoscelesTriangle: {1}", jsonString, exception.ToString())); + } + + try + { + // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize + if (typeof(ScaleneTriangle).GetProperty("AdditionalProperties") == null) + { + newTriangle = new Triangle(JsonConvert.DeserializeObject(jsonString, Triangle.SerializerSettings)); + } + else + { + newTriangle = new Triangle(JsonConvert.DeserializeObject(jsonString, Triangle.AdditionalPropertiesSerializerSettings)); + } + matchedTypes.Add("ScaleneTriangle"); + match++; + } + catch (Exception exception) + { + // deserialization failed, try the next one + System.Diagnostics.Debug.WriteLine(string.Format("Failed to deserialize `{0}` into ScaleneTriangle: {1}", jsonString, exception.ToString())); + } + + if (match == 0) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined."); + } + else if (match > 1) + { + throw new InvalidDataException("The JSON string `" + jsonString + "` incorrectly matches more than one schema (should be exactly one match): " + matchedTypes); + } + + // deserialization is considered successful at this point if no exception has been thrown. + return newTriangle; + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Triangle); + } + + /// + /// Returns true if Triangle instances are equal + /// + /// Instance of Triangle to be compared + /// Boolean + public bool Equals(Triangle input) + { + if (input == null) + return false; + + return this.ActualInstance.Equals(input.ActualInstance); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.ActualInstance != null) + hashCode = hashCode * 59 + this.ActualInstance.GetHashCode(); + return hashCode; + } + } + + } + + /// + /// Custom JSON converter for Triangle + /// + public class TriangleJsonConverter : JsonConverter + { + /// + /// To write the JSON string + /// + /// JSON writer + /// Object to be converted into a JSON string + /// JSON Serializer + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + writer.WriteRawValue((string)(typeof(Triangle).GetMethod("ToJson").Invoke(value, null))); + } + + /// + /// To convert a JSON string into an object + /// + /// JSON reader + /// Object type + /// Existing value + /// JSON Serializer + /// The object converted from the JSON string + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if(reader.TokenType != JsonToken.Null) + { + return Triangle.FromJson(JObject.Load(reader).ToString(Formatting.None)); + } + return null; + } + + /// + /// Check if the object can be converted + /// + /// Object type + /// True if the object can be converted + public override bool CanConvert(Type objectType) + { + return false; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs new file mode 100644 index 00000000000..01e75d07962 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -0,0 +1,128 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// TriangleInterface + /// + [DataContract(Name = "TriangleInterface")] + public partial class TriangleInterface : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected TriangleInterface() { } + /// + /// Initializes a new instance of the class. + /// + /// triangleType (required). + public TriangleInterface(string triangleType = default(string)) + { + // to ensure "triangleType" is required (not null) + if (triangleType == null) + { + throw new ArgumentNullException("triangleType is a required property for TriangleInterface and cannot be null"); + } + this.TriangleType = triangleType; + } + + /// + /// Gets or Sets TriangleType + /// + [DataMember(Name = "triangleType", IsRequired = true, EmitDefaultValue = true)] + public string TriangleType { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TriangleInterface {\n"); + sb.Append(" TriangleType: ").Append(TriangleType).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as TriangleInterface); + } + + /// + /// Returns true if TriangleInterface instances are equal + /// + /// Instance of TriangleInterface to be compared + /// Boolean + public bool Equals(TriangleInterface input) + { + if (input == null) + { + return false; + } + return + ( + this.TriangleType == input.TriangleType || + (this.TriangleType != null && + this.TriangleType.Equals(input.TriangleType)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TriangleType != null) + { + hashCode = (hashCode * 59) + this.TriangleType.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs new file mode 100644 index 00000000000..03599102829 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs @@ -0,0 +1,313 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// User + /// + [DataContract(Name = "User")] + public partial class User : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// id. + /// username. + /// firstName. + /// lastName. + /// email. + /// password. + /// phone. + /// User Status. + /// test code generation for objects Value must be a map of strings to values. It cannot be the 'null' value.. + /// test code generation for nullable objects. Value must be a map of strings to values or the 'null' value.. + /// test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389. + /// test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The 'nullable' attribute does not change the allowed values.. + public User(long id = default(long), string username = default(string), string firstName = default(string), string lastName = default(string), string email = default(string), string password = default(string), string phone = default(string), int userStatus = default(int), Object objectWithNoDeclaredProps = default(Object), Object objectWithNoDeclaredPropsNullable = default(Object), Object anyTypeProp = default(Object), Object anyTypePropNullable = default(Object)) + { + this.Id = id; + this.Username = username; + this.FirstName = firstName; + this.LastName = lastName; + this.Email = email; + this.Password = password; + this.Phone = phone; + this.UserStatus = userStatus; + this.ObjectWithNoDeclaredProps = objectWithNoDeclaredProps; + this.ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable; + this.AnyTypeProp = anyTypeProp; + this.AnyTypePropNullable = anyTypePropNullable; + } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + public long Id { get; set; } + + /// + /// Gets or Sets Username + /// + [DataMember(Name = "username", EmitDefaultValue = false)] + public string Username { get; set; } + + /// + /// Gets or Sets FirstName + /// + [DataMember(Name = "firstName", EmitDefaultValue = false)] + public string FirstName { get; set; } + + /// + /// Gets or Sets LastName + /// + [DataMember(Name = "lastName", EmitDefaultValue = false)] + public string LastName { get; set; } + + /// + /// Gets or Sets Email + /// + [DataMember(Name = "email", EmitDefaultValue = false)] + public string Email { get; set; } + + /// + /// Gets or Sets Password + /// + [DataMember(Name = "password", EmitDefaultValue = false)] + public string Password { get; set; } + + /// + /// Gets or Sets Phone + /// + [DataMember(Name = "phone", EmitDefaultValue = false)] + public string Phone { get; set; } + + /// + /// User Status + /// + /// User Status + [DataMember(Name = "userStatus", EmitDefaultValue = false)] + public int UserStatus { get; set; } + + /// + /// test code generation for objects Value must be a map of strings to values. It cannot be the 'null' value. + /// + /// test code generation for objects Value must be a map of strings to values. It cannot be the 'null' value. + [DataMember(Name = "objectWithNoDeclaredProps", EmitDefaultValue = false)] + public Object ObjectWithNoDeclaredProps { get; set; } + + /// + /// test code generation for nullable objects. Value must be a map of strings to values or the 'null' value. + /// + /// test code generation for nullable objects. Value must be a map of strings to values or the 'null' value. + [DataMember(Name = "objectWithNoDeclaredPropsNullable", EmitDefaultValue = true)] + public Object ObjectWithNoDeclaredPropsNullable { get; set; } + + /// + /// test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 + /// + /// test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 + [DataMember(Name = "anyTypeProp", EmitDefaultValue = true)] + public Object AnyTypeProp { get; set; } + + /// + /// test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The 'nullable' attribute does not change the allowed values. + /// + /// test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The 'nullable' attribute does not change the allowed values. + [DataMember(Name = "anyTypePropNullable", EmitDefaultValue = true)] + public Object AnyTypePropNullable { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class User {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Username: ").Append(Username).Append("\n"); + sb.Append(" FirstName: ").Append(FirstName).Append("\n"); + sb.Append(" LastName: ").Append(LastName).Append("\n"); + sb.Append(" Email: ").Append(Email).Append("\n"); + sb.Append(" Password: ").Append(Password).Append("\n"); + sb.Append(" Phone: ").Append(Phone).Append("\n"); + sb.Append(" UserStatus: ").Append(UserStatus).Append("\n"); + sb.Append(" ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n"); + sb.Append(" ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n"); + sb.Append(" AnyTypeProp: ").Append(AnyTypeProp).Append("\n"); + sb.Append(" AnyTypePropNullable: ").Append(AnyTypePropNullable).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as User); + } + + /// + /// Returns true if User instances are equal + /// + /// Instance of User to be compared + /// Boolean + public bool Equals(User input) + { + if (input == null) + { + return false; + } + return + ( + this.Id == input.Id || + this.Id.Equals(input.Id) + ) && + ( + this.Username == input.Username || + (this.Username != null && + this.Username.Equals(input.Username)) + ) && + ( + this.FirstName == input.FirstName || + (this.FirstName != null && + this.FirstName.Equals(input.FirstName)) + ) && + ( + this.LastName == input.LastName || + (this.LastName != null && + this.LastName.Equals(input.LastName)) + ) && + ( + this.Email == input.Email || + (this.Email != null && + this.Email.Equals(input.Email)) + ) && + ( + this.Password == input.Password || + (this.Password != null && + this.Password.Equals(input.Password)) + ) && + ( + this.Phone == input.Phone || + (this.Phone != null && + this.Phone.Equals(input.Phone)) + ) && + ( + this.UserStatus == input.UserStatus || + this.UserStatus.Equals(input.UserStatus) + ) && + ( + this.ObjectWithNoDeclaredProps == input.ObjectWithNoDeclaredProps || + (this.ObjectWithNoDeclaredProps != null && + this.ObjectWithNoDeclaredProps.Equals(input.ObjectWithNoDeclaredProps)) + ) && + ( + this.ObjectWithNoDeclaredPropsNullable == input.ObjectWithNoDeclaredPropsNullable || + (this.ObjectWithNoDeclaredPropsNullable != null && + this.ObjectWithNoDeclaredPropsNullable.Equals(input.ObjectWithNoDeclaredPropsNullable)) + ) && + ( + this.AnyTypeProp == input.AnyTypeProp || + (this.AnyTypeProp != null && + this.AnyTypeProp.Equals(input.AnyTypeProp)) + ) && + ( + this.AnyTypePropNullable == input.AnyTypePropNullable || + (this.AnyTypePropNullable != null && + this.AnyTypePropNullable.Equals(input.AnyTypePropNullable)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.Id.GetHashCode(); + if (this.Username != null) + { + hashCode = (hashCode * 59) + this.Username.GetHashCode(); + } + if (this.FirstName != null) + { + hashCode = (hashCode * 59) + this.FirstName.GetHashCode(); + } + if (this.LastName != null) + { + hashCode = (hashCode * 59) + this.LastName.GetHashCode(); + } + if (this.Email != null) + { + hashCode = (hashCode * 59) + this.Email.GetHashCode(); + } + if (this.Password != null) + { + hashCode = (hashCode * 59) + this.Password.GetHashCode(); + } + if (this.Phone != null) + { + hashCode = (hashCode * 59) + this.Phone.GetHashCode(); + } + hashCode = (hashCode * 59) + this.UserStatus.GetHashCode(); + if (this.ObjectWithNoDeclaredProps != null) + { + hashCode = (hashCode * 59) + this.ObjectWithNoDeclaredProps.GetHashCode(); + } + if (this.ObjectWithNoDeclaredPropsNullable != null) + { + hashCode = (hashCode * 59) + this.ObjectWithNoDeclaredPropsNullable.GetHashCode(); + } + if (this.AnyTypeProp != null) + { + hashCode = (hashCode * 59) + this.AnyTypeProp.GetHashCode(); + } + if (this.AnyTypePropNullable != null) + { + hashCode = (hashCode * 59) + this.AnyTypePropNullable.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs new file mode 100644 index 00000000000..19775ac703b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs @@ -0,0 +1,156 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Whale + /// + [DataContract(Name = "whale")] + public partial class Whale : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Whale() { } + /// + /// Initializes a new instance of the class. + /// + /// hasBaleen. + /// hasTeeth. + /// className (required). + public Whale(bool hasBaleen = default(bool), bool hasTeeth = default(bool), string className = default(string)) + { + // to ensure "className" is required (not null) + if (className == null) + { + throw new ArgumentNullException("className is a required property for Whale and cannot be null"); + } + this.ClassName = className; + this.HasBaleen = hasBaleen; + this.HasTeeth = hasTeeth; + } + + /// + /// Gets or Sets HasBaleen + /// + [DataMember(Name = "hasBaleen", EmitDefaultValue = true)] + public bool HasBaleen { get; set; } + + /// + /// Gets or Sets HasTeeth + /// + [DataMember(Name = "hasTeeth", EmitDefaultValue = true)] + public bool HasTeeth { get; set; } + + /// + /// Gets or Sets ClassName + /// + [DataMember(Name = "className", IsRequired = true, EmitDefaultValue = true)] + public string ClassName { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Whale {\n"); + sb.Append(" HasBaleen: ").Append(HasBaleen).Append("\n"); + sb.Append(" HasTeeth: ").Append(HasTeeth).Append("\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Whale); + } + + /// + /// Returns true if Whale instances are equal + /// + /// Instance of Whale to be compared + /// Boolean + public bool Equals(Whale input) + { + if (input == null) + { + return false; + } + return + ( + this.HasBaleen == input.HasBaleen || + this.HasBaleen.Equals(input.HasBaleen) + ) && + ( + this.HasTeeth == input.HasTeeth || + this.HasTeeth.Equals(input.HasTeeth) + ) && + ( + this.ClassName == input.ClassName || + (this.ClassName != null && + this.ClassName.Equals(input.ClassName)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = (hashCode * 59) + this.HasBaleen.GetHashCode(); + hashCode = (hashCode * 59) + this.HasTeeth.GetHashCode(); + if (this.ClassName != null) + { + hashCode = (hashCode * 59) + this.ClassName.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs new file mode 100644 index 00000000000..8dc3dacc572 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs @@ -0,0 +1,185 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// Zebra + /// + [DataContract(Name = "zebra")] + public partial class Zebra : Dictionary, IEquatable + { + /// + /// Defines Type + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum TypeEnum + { + /// + /// Enum Plains for value: plains + /// + [EnumMember(Value = "plains")] + Plains = 1, + + /// + /// Enum Mountain for value: mountain + /// + [EnumMember(Value = "mountain")] + Mountain = 2, + + /// + /// Enum Grevys for value: grevys + /// + [EnumMember(Value = "grevys")] + Grevys = 3 + + } + + + /// + /// Gets or Sets Type + /// + [DataMember(Name = "type", EmitDefaultValue = false)] + public TypeEnum? Type { get; set; } + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Zebra() + { + this.AdditionalProperties = new Dictionary(); + } + /// + /// Initializes a new instance of the class. + /// + /// type. + /// className (required). + public Zebra(TypeEnum? type = default(TypeEnum?), string className = default(string)) : base() + { + // to ensure "className" is required (not null) + if (className == null) + { + throw new ArgumentNullException("className is a required property for Zebra and cannot be null"); + } + this.ClassName = className; + this.Type = type; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets ClassName + /// + [DataMember(Name = "className", IsRequired = true, EmitDefaultValue = true)] + public string ClassName { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Zebra {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Type: ").Append(Type).Append("\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as Zebra); + } + + /// + /// Returns true if Zebra instances are equal + /// + /// Instance of Zebra to be compared + /// Boolean + public bool Equals(Zebra input) + { + if (input == null) + { + return false; + } + return base.Equals(input) && + ( + this.Type == input.Type || + this.Type.Equals(input.Type) + ) && base.Equals(input) && + ( + this.ClassName == input.ClassName || + (this.ClassName != null && + this.ClassName.Equals(input.ClassName)) + ) + && (this.AdditionalProperties.Count == input.AdditionalProperties.Count && !this.AdditionalProperties.Except(input.AdditionalProperties).Any()); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + hashCode = (hashCode * 59) + this.Type.GetHashCode(); + if (this.ClassName != null) + { + hashCode = (hashCode * 59) + this.ClassName.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef new file mode 100644 index 00000000000..030e83ecf59 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef @@ -0,0 +1,7 @@ +{ + "name": "Org.OpenAPITools", + "overrideReferences": true, + "precompiledReferences": [ + "Newtonsoft.Json.dll" + ] +} From cda42b9e7b41c18141ec950da77624431a6951f8 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 10 Mar 2023 14:29:23 +0800 Subject: [PATCH 014/131] update doc --- docs/generators/csharp-netcore.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md index 8f929b158ea..803611ed316 100644 --- a/docs/generators/csharp-netcore.md +++ b/docs/generators/csharp-netcore.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| |interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I| -|library|HTTP library template (sub-template) to use|
**generichost**
HttpClient with Generic Host dependency injection (https://docs.microsoft.com/en-us/dotnet/core/extensions/generic-host) (Experimental. Subject to breaking changes without notice.)
**httpclient**
HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) (Experimental. Subject to breaking changes without notice.)
**restsharp**
RestSharp (https://github.com/restsharp/RestSharp)
|restsharp| +|library|HTTP library template (sub-template) to use|
**generichost**
HttpClient with Generic Host dependency injection (https://docs.microsoft.com/en-us/dotnet/core/extensions/generic-host) (Experimental. Subject to breaking changes without notice.)
**httpclient**
HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) (Experimental. Subject to breaking changes without notice.)
**unityWebRequest**
UnityWebRequest (...) (Experimental. Subject to breaking changes without notice.)
**restsharp**
RestSharp (https://github.com/restsharp/RestSharp)
|restsharp| |licenseId|The identifier of the license| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase| |netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false| From c4b404dc2ecbca5a3225b638f5427480aaf3bd9c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 10 Mar 2023 14:30:32 +0800 Subject: [PATCH 015/131] Decommission csharp-dotnet2 client generator (#14911) * decommission csharp-dotnet2 client generator * update doc --- .../csharp-dotnet2-OpenAPIClient.yaml | 6 - docs/generators.md | 1 - docs/generators/csharp-dotnet2.md | 293 ---------- .../languages/CSharpDotNet2ClientCodegen.java | 160 ------ .../org.openapitools.codegen.CodegenConfig | 3 +- .../Lib/OpenAPIClient/.gitignore | 362 ------------ .../OpenAPIClient/.openapi-generator-ignore | 23 - .../OpenAPIClient/.openapi-generator/FILES | 25 - .../OpenAPIClient/.openapi-generator/VERSION | 1 - .../Lib/OpenAPIClient/README.md | 132 ----- .../Lib/OpenAPIClient/compile-mono.sh | 12 - .../Lib/OpenAPIClient/docs/ApiResponse.md | 11 - .../Lib/OpenAPIClient/docs/Category.md | 10 - .../Lib/OpenAPIClient/docs/Inline_object.md | 10 - .../Lib/OpenAPIClient/docs/Inline_object_1.md | 10 - .../Lib/OpenAPIClient/docs/Order.md | 14 - .../Lib/OpenAPIClient/docs/Pet.md | 14 - .../Lib/OpenAPIClient/docs/PetApi.md | 526 ----------------- .../Lib/OpenAPIClient/docs/StoreApi.md | 254 --------- .../Lib/OpenAPIClient/docs/Tag.md | 10 - .../Lib/OpenAPIClient/docs/User.md | 16 - .../Lib/OpenAPIClient/docs/UserApi.md | 488 ---------------- .../Lib/OpenAPIClient/nuget.exe | Bin 5336752 -> 0 bytes .../Org/OpenAPITools/Api/PetApi.cs | 431 -------------- .../Org/OpenAPITools/Api/StoreApi.cs | 236 -------- .../Org/OpenAPITools/Api/UserApi.cs | 420 -------------- .../Org/OpenAPITools/Client/ApiClient.cs | 297 ---------- .../Org/OpenAPITools/Client/ApiException.cs | 47 -- .../Org/OpenAPITools/Client/Configuration.cs | 138 ----- .../Org/OpenAPITools/Model/ApiResponse.cs | 60 -- .../Org/OpenAPITools/Model/Category.cs | 52 -- .../Org/OpenAPITools/Model/InlineObject.cs | 54 -- .../Org/OpenAPITools/Model/InlineObject1.cs | 54 -- .../Org/OpenAPITools/Model/Order.cs | 85 --- .../Org/OpenAPITools/Model/Pet.cs | 85 --- .../Org/OpenAPITools/Model/Tag.cs | 52 -- .../Org/OpenAPITools/Model/User.cs | 101 ---- .../Lib/OpenAPIClient/vendor/packages.config | 5 - .../SwaggerClient/.openapi-generator-ignore | 23 - .../SwaggerClient/.openapi-generator/VERSION | 1 - .../Lib/SwaggerClient/README.md | 131 ----- .../Lib/SwaggerClient/compile-mono.sh | 12 - .../Lib/SwaggerClient/docs/ApiResponse.md | 11 - .../Lib/SwaggerClient/docs/Category.md | 10 - .../Lib/SwaggerClient/docs/Order.md | 14 - .../Lib/SwaggerClient/docs/Pet.md | 14 - .../Lib/SwaggerClient/docs/PetApi.md | 534 ------------------ .../Lib/SwaggerClient/docs/StoreApi.md | 258 --------- .../Lib/SwaggerClient/docs/Tag.md | 10 - .../Lib/SwaggerClient/docs/User.md | 16 - .../Lib/SwaggerClient/docs/UserApi.md | 496 ---------------- .../Org/OpenAPITools/Api/PetApi.cs | 429 -------------- .../Org/OpenAPITools/Api/StoreApi.cs | 236 -------- .../Org/OpenAPITools/Api/UserApi.cs | 420 -------------- .../Org/OpenAPITools/Client/ApiClient.cs | 297 ---------- .../Org/OpenAPITools/Client/ApiException.cs | 47 -- .../Org/OpenAPITools/Client/Configuration.cs | 132 ----- .../Org/OpenAPITools/Model/ApiResponse.cs | 60 -- .../Org/OpenAPITools/Model/Category.cs | 52 -- .../Org/OpenAPITools/Model/Order.cs | 85 --- .../Org/OpenAPITools/Model/Pet.cs | 85 --- .../Org/OpenAPITools/Model/Tag.cs | 52 -- .../Org/OpenAPITools/Model/User.cs | 101 ---- .../Lib/SwaggerClient/vendor/packages.config | 5 - 64 files changed, 1 insertion(+), 8028 deletions(-) delete mode 100644 bin/configs/unmaintained/csharp-dotnet2-OpenAPIClient.yaml delete mode 100644 docs/generators/csharp-dotnet2.md delete mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.gitignore delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator-ignore delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator/FILES delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator/VERSION delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/README.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/compile-mono.sh delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/ApiResponse.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Category.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Inline_object.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Inline_object_1.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Order.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Pet.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/PetApi.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/StoreApi.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Tag.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/User.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/UserApi.md delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/nuget.exe delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/InlineObject.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/InlineObject1.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/vendor/packages.config delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.openapi-generator-ignore delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.openapi-generator/VERSION delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/ApiResponse.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Category.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Order.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Pet.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Tag.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/User.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs delete mode 100644 samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config diff --git a/bin/configs/unmaintained/csharp-dotnet2-OpenAPIClient.yaml b/bin/configs/unmaintained/csharp-dotnet2-OpenAPIClient.yaml deleted file mode 100644 index 76c07c772d6..00000000000 --- a/bin/configs/unmaintained/csharp-dotnet2-OpenAPIClient.yaml +++ /dev/null @@ -1,6 +0,0 @@ -generatorName: csharp-dotnet2 -outputDir: samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-dotnet2 -additionalProperties: - hideGenerationTimestamp: "true" diff --git a/docs/generators.md b/docs/generators.md index a21693e18e0..2596227ea37 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -19,7 +19,6 @@ The following generators are available: * [cpp-ue4 (beta)](generators/cpp-ue4.md) * [crystal (beta)](generators/crystal.md) * [csharp](generators/csharp.md) -* [csharp-dotnet2 (deprecated)](generators/csharp-dotnet2.md) * [csharp-netcore](generators/csharp-netcore.md) * [dart](generators/dart.md) * [dart-dio](generators/dart-dio.md) diff --git a/docs/generators/csharp-dotnet2.md b/docs/generators/csharp-dotnet2.md deleted file mode 100644 index 5e4c904382c..00000000000 --- a/docs/generators/csharp-dotnet2.md +++ /dev/null @@ -1,293 +0,0 @@ ---- -title: Documentation for the csharp-dotnet2 Generator ---- - -## METADATA - -| Property | Value | Notes | -| -------- | ----- | ----- | -| generator name | csharp-dotnet2 | pass this to the generate command after -g | -| generator stability | DEPRECATED | | -| generator type | CLIENT | | -| generator language | C# | | -| generator default templating engine | mustache | | -| helpTxt | Generates a C# .Net 2.0 client library (beta). | | - -## CONFIG OPTIONS -These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details. - -| Option | Description | Values | Default | -| ------ | ----------- | ------ | ------- | -|clientPackage|C# client package name (convention: Camel.Case).| |Org.OpenAPITools.Client| -|packageName|C# package name (convention: Camel.Case).| |Org.OpenAPITools| -|packageVersion|C# package version.| |1.0.0| - -## IMPORT MAPPING - -| Type/Alias | Imports | -| ---------- | ------- | - - -## INSTANTIATION TYPES - -| Type/Alias | Instantiated By | -| ---------- | --------------- | -|array|List| -|list|List| -|map|Dictionary| - - -## LANGUAGE PRIMITIVES - -
    -
  • Boolean
  • -
  • Collection
  • -
  • DateTime
  • -
  • DateTime?
  • -
  • DateTimeOffset
  • -
  • DateTimeOffset?
  • -
  • Decimal
  • -
  • Dictionary
  • -
  • Double
  • -
  • Float
  • -
  • Guid
  • -
  • Guid?
  • -
  • ICollection
  • -
  • Int32
  • -
  • Int64
  • -
  • List
  • -
  • Object
  • -
  • String
  • -
  • System.IO.Stream
  • -
  • bool
  • -
  • bool?
  • -
  • byte[]
  • -
  • decimal
  • -
  • decimal?
  • -
  • double
  • -
  • double?
  • -
  • float
  • -
  • float?
  • -
  • int
  • -
  • int?
  • -
  • long
  • -
  • long?
  • -
  • string
  • -
- -## RESERVED WORDS - -
    -
  • Client
  • -
  • Configuration
  • -
  • Version
  • -
  • abstract
  • -
  • as
  • -
  • base
  • -
  • bool
  • -
  • break
  • -
  • byte
  • -
  • case
  • -
  • catch
  • -
  • char
  • -
  • checked
  • -
  • class
  • -
  • client
  • -
  • const
  • -
  • continue
  • -
  • decimal
  • -
  • default
  • -
  • delegate
  • -
  • do
  • -
  • double
  • -
  • else
  • -
  • enum
  • -
  • event
  • -
  • explicit
  • -
  • extern
  • -
  • false
  • -
  • finally
  • -
  • fixed
  • -
  • float
  • -
  • for
  • -
  • foreach
  • -
  • goto
  • -
  • if
  • -
  • implicit
  • -
  • in
  • -
  • int
  • -
  • interface
  • -
  • internal
  • -
  • is
  • -
  • localVarFileParams
  • -
  • localVarFormParams
  • -
  • localVarHeaderParams
  • -
  • localVarHttpContentType
  • -
  • localVarHttpContentTypes
  • -
  • localVarHttpHeaderAccept
  • -
  • localVarHttpHeaderAccepts
  • -
  • localVarPath
  • -
  • localVarPathParams
  • -
  • localVarPostBody
  • -
  • localVarQueryParams
  • -
  • localVarResponse
  • -
  • localVarStatusCode
  • -
  • lock
  • -
  • long
  • -
  • namespace
  • -
  • new
  • -
  • null
  • -
  • object
  • -
  • operator
  • -
  • out
  • -
  • override
  • -
  • parameter
  • -
  • params
  • -
  • private
  • -
  • protected
  • -
  • public
  • -
  • readonly
  • -
  • ref
  • -
  • return
  • -
  • sbyte
  • -
  • sealed
  • -
  • short
  • -
  • sizeof
  • -
  • stackalloc
  • -
  • static
  • -
  • string
  • -
  • struct
  • -
  • switch
  • -
  • this
  • -
  • throw
  • -
  • true
  • -
  • try
  • -
  • typeof
  • -
  • uint
  • -
  • ulong
  • -
  • unchecked
  • -
  • unsafe
  • -
  • ushort
  • -
  • using
  • -
  • virtual
  • -
  • void
  • -
  • volatile
  • -
  • while
  • -
- -## FEATURE SET - - -### Client Modification Feature -| Name | Supported | Defined By | -| ---- | --------- | ---------- | -|BasePath|✗|ToolingExtension -|Authorizations|✗|ToolingExtension -|UserAgent|✗|ToolingExtension -|MockServer|✗|ToolingExtension - -### Data Type Feature -| Name | Supported | Defined By | -| ---- | --------- | ---------- | -|Custom|✗|OAS2,OAS3 -|Int32|✓|OAS2,OAS3 -|Int64|✓|OAS2,OAS3 -|Float|✓|OAS2,OAS3 -|Double|✓|OAS2,OAS3 -|Decimal|✓|ToolingExtension -|String|✓|OAS2,OAS3 -|Byte|✓|OAS2,OAS3 -|Binary|✓|OAS2,OAS3 -|Boolean|✓|OAS2,OAS3 -|Date|✓|OAS2,OAS3 -|DateTime|✓|OAS2,OAS3 -|Password|✓|OAS2,OAS3 -|File|✓|OAS2 -|Uuid|✗| -|Array|✓|OAS2,OAS3 -|Null|✗|OAS3 -|AnyType|✗|OAS2,OAS3 -|Object|✓|OAS2,OAS3 -|Maps|✓|ToolingExtension -|CollectionFormat|✓|OAS2 -|CollectionFormatMulti|✓|OAS2 -|Enum|✓|OAS2,OAS3 -|ArrayOfEnum|✓|ToolingExtension -|ArrayOfModel|✓|ToolingExtension -|ArrayOfCollectionOfPrimitives|✓|ToolingExtension -|ArrayOfCollectionOfModel|✓|ToolingExtension -|ArrayOfCollectionOfEnum|✓|ToolingExtension -|MapOfEnum|✓|ToolingExtension -|MapOfModel|✓|ToolingExtension -|MapOfCollectionOfPrimitives|✓|ToolingExtension -|MapOfCollectionOfModel|✓|ToolingExtension -|MapOfCollectionOfEnum|✓|ToolingExtension - -### Documentation Feature -| Name | Supported | Defined By | -| ---- | --------- | ---------- | -|Readme|✓|ToolingExtension -|Model|✓|ToolingExtension -|Api|✓|ToolingExtension - -### Global Feature -| Name | Supported | Defined By | -| ---- | --------- | ---------- | -|Host|✓|OAS2,OAS3 -|BasePath|✓|OAS2,OAS3 -|Info|✓|OAS2,OAS3 -|Schemes|✗|OAS2,OAS3 -|PartialSchemes|✓|OAS2,OAS3 -|Consumes|✓|OAS2 -|Produces|✓|OAS2 -|ExternalDocumentation|✓|OAS2,OAS3 -|Examples|✓|OAS2,OAS3 -|XMLStructureDefinitions|✗|OAS2,OAS3 -|MultiServer|✗|OAS3 -|ParameterizedServer|✗|OAS3 -|ParameterStyling|✗|OAS3 -|Callbacks|✓|OAS3 -|LinkObjects|✗|OAS3 - -### Parameter Feature -| Name | Supported | Defined By | -| ---- | --------- | ---------- | -|Path|✓|OAS2,OAS3 -|Query|✓|OAS2,OAS3 -|Header|✓|OAS2,OAS3 -|Body|✓|OAS2 -|FormUnencoded|✓|OAS2 -|FormMultipart|✓|OAS2 -|Cookie|✓|OAS3 - -### Schema Support Feature -| Name | Supported | Defined By | -| ---- | --------- | ---------- | -|Simple|✓|OAS2,OAS3 -|Composite|✓|OAS2,OAS3 -|Polymorphism|✓|OAS2,OAS3 -|Union|✗|OAS3 -|allOf|✗|OAS2,OAS3 -|anyOf|✗|OAS3 -|oneOf|✗|OAS3 -|not|✗|OAS3 - -### Security Feature -| Name | Supported | Defined By | -| ---- | --------- | ---------- | -|BasicAuth|✓|OAS2,OAS3 -|ApiKey|✓|OAS2,OAS3 -|OpenIDConnect|✗|OAS3 -|BearerToken|✓|OAS3 -|OAuth2_Implicit|✓|OAS2,OAS3 -|OAuth2_Password|✓|OAS2,OAS3 -|OAuth2_ClientCredentials|✓|OAS2,OAS3 -|OAuth2_AuthorizationCode|✓|OAS2,OAS3 - -### Wire Format Feature -| Name | Supported | Defined By | -| ---- | --------- | ---------- | -|JSON|✓|OAS2,OAS3 -|XML|✓|OAS2,OAS3 -|PROTOBUF|✗|ToolingExtension -|Custom|✗|OAS2,OAS3 diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java deleted file mode 100644 index d9b2f5d5c22..00000000000 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) - * Copyright 2018 SmartBear Software - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openapitools.codegen.languages; - -import org.openapitools.codegen.CliOption; -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenType; -import org.openapitools.codegen.SupportingFile; - -import org.openapitools.codegen.meta.GeneratorMetadata; -import org.openapitools.codegen.meta.Stability; -import org.openapitools.codegen.meta.features.DocumentationFeature; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; - -public class CSharpDotNet2ClientCodegen extends AbstractCSharpCodegen { - private final Logger LOGGER = LoggerFactory.getLogger(CSharpDotNet2ClientCodegen.class); - - public static final String CLIENT_PACKAGE = "clientPackage"; - protected String clientPackage = "Org.OpenAPITools.Client"; - protected String apiDocPath = "docs/"; - protected String modelDocPath = "docs/"; - - public CSharpDotNet2ClientCodegen() { - super(); - - modifyFeatureSet(features -> features.includeDocumentationFeatures(DocumentationFeature.Readme)); - - generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata) - .stability(Stability.DEPRECATED) - .build(); - - // clear import mapping (from default generator) as C# (2.0) does not use it - // at the moment - importMapping.clear(); - - modelTemplateFiles.put("model.mustache", ".cs"); - apiTemplateFiles.put("api.mustache", ".cs"); - - setApiPackage(packageName + ".Api"); - setModelPackage(packageName + ".Model"); - setClientPackage(packageName + ".Client"); - setSourceFolder("src" + File.separator + "main" + File.separator + "CsharpDotNet2"); - - modelDocTemplateFiles.put("model_doc.mustache", ".md"); - apiDocTemplateFiles.put("api_doc.mustache", ".md"); - - cliOptions.clear(); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, - "C# package name (convention: Camel.Case).") - .defaultValue(packageName)); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, - "C# package version.") - .defaultValue(packageVersion)); - cliOptions.add(new CliOption(CLIENT_PACKAGE, - "C# client package name (convention: Camel.Case).") - .defaultValue(clientPackage)); - } - - @Override - public void processOpts() { - LOGGER.warn("Per Microsoft Product Lifecycle (https://support.microsoft.com/en-us/lifecycle/search?sort=PN&alpha=.NET%20Framework&Filter=FilterNO), support for .NET Framework 2.0 ended in 2011 so there may be security issues using the auto-generated C# 2.0 source code."); - - super.processOpts(); - - if (additionalProperties.containsKey(CLIENT_PACKAGE)) { - setClientPackage((String) additionalProperties.get(CLIENT_PACKAGE)); - } else { - additionalProperties.put(CLIENT_PACKAGE, getClientPackage()); - } - - final String clientPackage = getClientPackage(); - final String clientPackagePath = clientPackage.replace(".", java.io.File.separator); - - additionalProperties.put("apiDocPath", apiDocPath); - additionalProperties.put("modelDocPath", modelDocPath); - - supportingFiles.add(new SupportingFile("Configuration.mustache", - sourceFolder + File.separator + clientPackagePath, "Configuration.cs")); - supportingFiles.add(new SupportingFile("ApiClient.mustache", - sourceFolder + File.separator + clientPackagePath, "ApiClient.cs")); - supportingFiles.add(new SupportingFile("ApiException.mustache", - sourceFolder + File.separator + clientPackagePath, "ApiException.cs")); - supportingFiles.add(new SupportingFile("packages.config.mustache", "vendor", "packages.config")); - supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "compile-mono.sh")); - supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore")); - } - - @Override - public String apiPackage() { - return packageName + ".Api"; - } - - @Override - public String modelPackage() { - return packageName + ".Model"; - } - - public String getClientPackage() { - return clientPackage; - } - - public void setClientPackage(String clientPackage) { - this.clientPackage = clientPackage; - } - - @Override - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - @Override - public String getName() { - return "csharp-dotnet2"; - } - - @Override - public String getHelp() { - return "Generates a C# .Net 2.0 client library (beta)."; - } - - @Override - public String apiFileFolder() { - return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar); - } - - @Override - public String modelFileFolder() { - return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar); - } - - @Override - public String apiDocFileFolder() { - return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar); - } - - @Override - public String modelDocFileFolder() { - return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar); - } - -} diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig index bac277ba6d2..633534b8f5f 100644 --- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig +++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig @@ -22,7 +22,6 @@ org.openapitools.codegen.languages.CppTizenClientCodegen org.openapitools.codegen.languages.CppUE4ClientCodegen org.openapitools.codegen.languages.CSharpClientCodegen org.openapitools.codegen.languages.CSharpNetCoreClientCodegen -org.openapitools.codegen.languages.CSharpDotNet2ClientCodegen org.openapitools.codegen.languages.CsharpNetcoreFunctionsServerCodegen org.openapitools.codegen.languages.DartClientCodegen org.openapitools.codegen.languages.DartDioClientCodegen @@ -140,4 +139,4 @@ org.openapitools.codegen.languages.TypeScriptNestjsClientCodegen org.openapitools.codegen.languages.TypeScriptNodeClientCodegen org.openapitools.codegen.languages.TypeScriptReduxQueryClientCodegen org.openapitools.codegen.languages.TypeScriptRxjsClientCodegen -org.openapitools.codegen.languages.WsdlSchemaCodegen \ No newline at end of file +org.openapitools.codegen.languages.WsdlSchemaCodegen diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.gitignore b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.gitignore deleted file mode 100644 index 1ee53850b84..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.gitignore +++ /dev/null @@ -1,362 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator-ignore b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator-ignore deleted file mode 100644 index 7484ee590a3..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator/FILES deleted file mode 100644 index bf325d51202..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator/FILES +++ /dev/null @@ -1,25 +0,0 @@ -.gitignore -README.md -compile-mono.sh -docs/ApiResponse.md -docs/Category.md -docs/Order.md -docs/Pet.md -docs/PetApi.md -docs/StoreApi.md -docs/Tag.md -docs/User.md -docs/UserApi.md -src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs -src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs -vendor/packages.config diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator/VERSION deleted file mode 100644 index d99e7162d01..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -5.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/README.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/README.md deleted file mode 100644 index 5296503208a..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/README.md +++ /dev/null @@ -1,132 +0,0 @@ -# Org.OpenAPITools - the C# library for the OpenAPI Petstore - -This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - -This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - -- API version: 1.0.0 -- SDK version: 1.0.0 -- Build package: org.openapitools.codegen.languages.CSharpDotNet2ClientCodegen - - -## Frameworks supported -- .NET 2.0 - - -## Dependencies -- Mono compiler -- Newtonsoft.Json.7.0.1 -- RestSharp.Net2.1.1.11 - -Note: NuGet is downloaded by the mono compilation script and packages are installed with it. No dependency DLLs are bundled with this generator - - -## Installation -Run the following command to generate the DLL -- [Mac/Linux] `/bin/sh compile-mono.sh` -- [Windows] TODO - -Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces: -```csharp -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; -``` - -## Getting Started - -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class Example - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var body = new Pet(); // Pet | Pet object that needs to be added to the store - - try - { - // Add a new pet to the store - apiInstance.AddPet(body); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.AddPet: " + e.Message ); - } - } - } -} -``` - - -## Documentation for API Endpoints - -All URIs are relative to *http://petstore.swagger.io/v2* - -Class | Method | HTTP request | Description ------------- | ------------- | ------------- | ------------- -*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store -*PetApi* | [**DeletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet -*PetApi* | [**FindPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status -*PetApi* | [**FindPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags -*PetApi* | [**GetPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID -*PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet -*PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data -*PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image -*StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID -*StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status -*StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID -*StoreApi* | [**PlaceOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet -*UserApi* | [**CreateUser**](docs/UserApi.md#createuser) | **POST** /user | Create user -*UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array -*UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array -*UserApi* | [**DeleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user -*UserApi* | [**GetUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name -*UserApi* | [**LoginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system -*UserApi* | [**LogoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session -*UserApi* | [**UpdateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user - - - -## Documentation for Models - - - [Org.OpenAPITools.Model.ApiResponse](docs/ApiResponse.md) - - [Org.OpenAPITools.Model.Category](docs/Category.md) - - [Org.OpenAPITools.Model.Order](docs/Order.md) - - [Org.OpenAPITools.Model.Pet](docs/Pet.md) - - [Org.OpenAPITools.Model.Tag](docs/Tag.md) - - [Org.OpenAPITools.Model.User](docs/User.md) - - - -## Documentation for Authorization - -Authentication schemes defined for the API: - -### api_key - -- **Type**: API key -- **API key parameter name**: api_key -- **Location**: HTTP header - - -### petstore_auth - -- **Type**: OAuth -- **Flow**: implicit -- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog -- **Scopes**: - - write:pets: modify pets in your account - - read:pets: read your pets - diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/compile-mono.sh b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/compile-mono.sh deleted file mode 100644 index 8e6e23eba08..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/compile-mono.sh +++ /dev/null @@ -1,12 +0,0 @@ -wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe; -mozroots --import --sync -mono nuget.exe install vendor/packages.config -o vendor; -mkdir -p bin; -mcs -sdk:2 -r:vendor/Newtonsoft.Json.7.0.1/lib/net20/Newtonsoft.Json.dll,\ -vendor/RestSharp.Net2.1.1.11/lib/net20/RestSharp.Net2.dll,\ -System.Runtime.Serialization.dll \ --target:library \ --out:bin/Org.OpenAPITools.dll \ --recurse:'src/*.cs' \ --doc:bin/Org.OpenAPITools.xml \ --platform:anycpu diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/ApiResponse.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/ApiResponse.md deleted file mode 100644 index 01b35815bd4..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/ApiResponse.md +++ /dev/null @@ -1,11 +0,0 @@ -# Org.OpenAPITools.Model.ApiResponse -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Code** | **int?** | | [optional] -**Type** | **string** | | [optional] -**Message** | **string** | | [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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Category.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Category.md deleted file mode 100644 index 860a468e35c..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Category.md +++ /dev/null @@ -1,10 +0,0 @@ -# Org.OpenAPITools.Model.Category -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**Name** | **string** | | [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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Inline_object.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Inline_object.md deleted file mode 100644 index 40e16da1bb7..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Inline_object.md +++ /dev/null @@ -1,10 +0,0 @@ -# Org.OpenAPITools.Model.InlineObject -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Name** | **string** | Updated name of the pet | [optional] -**Status** | **string** | Updated status of the pet | [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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Inline_object_1.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Inline_object_1.md deleted file mode 100644 index 2e6d226754e..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Inline_object_1.md +++ /dev/null @@ -1,10 +0,0 @@ -# Org.OpenAPITools.Model.InlineObject1 -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**AdditionalMetadata** | **string** | Additional data to pass to server | [optional] -**File** | **System.IO.Stream** | file to upload | [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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Order.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Order.md deleted file mode 100644 index 984bd5ca063..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Order.md +++ /dev/null @@ -1,14 +0,0 @@ -# Org.OpenAPITools.Model.Order -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**PetId** | **long?** | | [optional] -**Quantity** | **int?** | | [optional] -**ShipDate** | **DateTime?** | | [optional] -**Status** | **string** | Order Status | [optional] -**Complete** | **bool?** | | [optional] [default to false] - -[[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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Pet.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Pet.md deleted file mode 100644 index ce9fe873cd2..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Pet.md +++ /dev/null @@ -1,14 +0,0 @@ -# Org.OpenAPITools.Model.Pet -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**Category** | [**Category**](Category.md) | | [optional] -**Name** | **string** | | -**PhotoUrls** | **List** | | -**Tags** | [**List**](Tag.md) | | [optional] -**Status** | **string** | pet status in the store | [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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/PetApi.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/PetApi.md deleted file mode 100644 index 373f0348fe7..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/PetApi.md +++ /dev/null @@ -1,526 +0,0 @@ -# Org.OpenAPITools.Api.PetApi - -All URIs are relative to *http://petstore.swagger.io/v2* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**AddPet**](PetApi.md#addpet) | **POST** /pet | Add a new pet to the store -[**DeletePet**](PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet -[**FindPetsByStatus**](PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status -[**FindPetsByTags**](PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags -[**GetPetById**](PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID -[**UpdatePet**](PetApi.md#updatepet) | **PUT** /pet | Update an existing pet -[**UpdatePetWithForm**](PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data -[**UploadFile**](PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image - - - -# **AddPet** -> void AddPet (Pet body) - -Add a new pet to the store - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class AddPetExample - { - public void main() - { - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var body = new Pet(); // Pet | Pet object that needs to be added to the store - - try - { - // Add a new pet to the store - apiInstance.AddPet(body); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.AddPet: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | - -### Return type - -void (empty response body) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: application/json, application/xml - - **Accept**: Not defined - -[[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) - - -# **DeletePet** -> void DeletePet (long? petId, string apiKey) - -Deletes a pet - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class DeletePetExample - { - public void main() - { - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var petId = 789; // long? | Pet id to delete - var apiKey = apiKey_example; // string | (optional) - - try - { - // Deletes a pet - apiInstance.DeletePet(petId, apiKey); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.DeletePet: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **petId** | **long?**| Pet id to delete | - **apiKey** | **string**| | [optional] - -### Return type - -void (empty response body) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **FindPetsByStatus** -> List FindPetsByStatus (List status) - -Finds Pets by status - -Multiple status values can be provided with comma separated strings - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class FindPetsByStatusExample - { - public void main() - { - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var status = status_example; // List | Status values that need to be considered for filter - - try - { - // Finds Pets by status - List<Pet> result = apiInstance.FindPetsByStatus(status); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.FindPetsByStatus: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **status** | **List**| Status values that need to be considered for filter | - -### Return type - -[**List**](Pet.md) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **FindPetsByTags** -> List FindPetsByTags (List tags) - -Finds Pets by tags - -Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class FindPetsByTagsExample - { - public void main() - { - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var tags = new List(); // List | Tags to filter by - - try - { - // Finds Pets by tags - List<Pet> result = apiInstance.FindPetsByTags(tags); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.FindPetsByTags: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **tags** | [**List**](string.md)| Tags to filter by | - -### Return type - -[**List**](Pet.md) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **GetPetById** -> Pet GetPetById (long? petId) - -Find pet by ID - -Returns a single pet - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class GetPetByIdExample - { - public void main() - { - // Configure API key authorization: api_key - Configuration.Default.ApiKey.Add("api_key", "YOUR_API_KEY"); - // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed - // Configuration.Default.ApiKeyPrefix.Add("api_key", "Bearer"); - - var apiInstance = new PetApi(); - var petId = 789; // long? | ID of pet to return - - try - { - // Find pet by ID - Pet result = apiInstance.GetPetById(petId); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.GetPetById: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **petId** | **long?**| ID of pet to return | - -### Return type - -[**Pet**](Pet.md) - -### Authorization - -[api_key](../README.md#api_key) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **UpdatePet** -> void UpdatePet (Pet body) - -Update an existing pet - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class UpdatePetExample - { - public void main() - { - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var body = new Pet(); // Pet | Pet object that needs to be added to the store - - try - { - // Update an existing pet - apiInstance.UpdatePet(body); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.UpdatePet: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | - -### Return type - -void (empty response body) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: application/json, application/xml - - **Accept**: Not defined - -[[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) - - -# **UpdatePetWithForm** -> void UpdatePetWithForm (long? petId, string name, string status) - -Updates a pet in the store with form data - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class UpdatePetWithFormExample - { - public void main() - { - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var petId = 789; // long? | ID of pet that needs to be updated - var name = name_example; // string | Updated name of the pet (optional) - var status = status_example; // string | Updated status of the pet (optional) - - try - { - // Updates a pet in the store with form data - apiInstance.UpdatePetWithForm(petId, name, status); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.UpdatePetWithForm: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **petId** | **long?**| ID of pet that needs to be updated | - **name** | **string**| Updated name of the pet | [optional] - **status** | **string**| Updated status of the pet | [optional] - -### Return type - -void (empty response body) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: application/x-www-form-urlencoded - - **Accept**: Not defined - -[[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) - - -# **UploadFile** -> ApiResponse UploadFile (long? petId, string additionalMetadata, System.IO.Stream file) - -uploads an image - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class UploadFileExample - { - public void main() - { - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var petId = 789; // long? | ID of pet to update - var additionalMetadata = additionalMetadata_example; // string | Additional data to pass to server (optional) - var file = new System.IO.Stream(); // System.IO.Stream | file to upload (optional) - - try - { - // uploads an image - ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.UploadFile: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **petId** | **long?**| ID of pet to update | - **additionalMetadata** | **string**| Additional data to pass to server | [optional] - **file** | **System.IO.Stream**| 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 - -[[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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/StoreApi.md deleted file mode 100644 index d68fa5efb81..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/StoreApi.md +++ /dev/null @@ -1,254 +0,0 @@ -# Org.OpenAPITools.Api.StoreApi - -All URIs are relative to *http://petstore.swagger.io/v2* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**DeleteOrder**](StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID -[**GetInventory**](StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status -[**GetOrderById**](StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID -[**PlaceOrder**](StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet - - - -# **DeleteOrder** -> void DeleteOrder (string orderId) - -Delete purchase order by ID - -For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class DeleteOrderExample - { - public void main() - { - var apiInstance = new StoreApi(); - var orderId = orderId_example; // string | ID of the order that needs to be deleted - - try - { - // Delete purchase order by ID - apiInstance.DeleteOrder(orderId); - } - catch (Exception e) - { - Debug.Print("Exception when calling StoreApi.DeleteOrder: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **orderId** | **string**| ID of the order that needs to be deleted | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **GetInventory** -> Dictionary GetInventory () - -Returns pet inventories by status - -Returns a map of status codes to quantities - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class GetInventoryExample - { - public void main() - { - // Configure API key authorization: api_key - Configuration.Default.ApiKey.Add("api_key", "YOUR_API_KEY"); - // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed - // Configuration.Default.ApiKeyPrefix.Add("api_key", "Bearer"); - - var apiInstance = new StoreApi(); - - try - { - // Returns pet inventories by status - Dictionary<string, int?> result = apiInstance.GetInventory(); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling StoreApi.GetInventory: " + e.Message ); - } - } - } -} -``` - -### Parameters -This endpoint does not need any parameter. - -### Return type - -**Dictionary** - -### Authorization - -[api_key](../README.md#api_key) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[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) - - -# **GetOrderById** -> Order GetOrderById (long? orderId) - -Find purchase order by ID - -For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class GetOrderByIdExample - { - public void main() - { - var apiInstance = new StoreApi(); - var orderId = 789; // long? | ID of pet that needs to be fetched - - try - { - // Find purchase order by ID - Order result = apiInstance.GetOrderById(orderId); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling StoreApi.GetOrderById: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **orderId** | **long?**| ID of pet that needs to be fetched | - -### Return type - -[**Order**](Order.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **PlaceOrder** -> Order PlaceOrder (Order body) - -Place an order for a pet - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class PlaceOrderExample - { - public void main() - { - var apiInstance = new StoreApi(); - var body = new Order(); // Order | order placed for purchasing the pet - - try - { - // Place an order for a pet - Order result = apiInstance.PlaceOrder(body); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling StoreApi.PlaceOrder: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **body** | [**Order**](Order.md)| order placed for purchasing the pet | - -### Return type - -[**Order**](Order.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Tag.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Tag.md deleted file mode 100644 index 6a76c28595f..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/Tag.md +++ /dev/null @@ -1,10 +0,0 @@ -# Org.OpenAPITools.Model.Tag -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**Name** | **string** | | [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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/User.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/User.md deleted file mode 100644 index 04dd24a3423..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/User.md +++ /dev/null @@ -1,16 +0,0 @@ -# Org.OpenAPITools.Model.User -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**Username** | **string** | | [optional] -**FirstName** | **string** | | [optional] -**LastName** | **string** | | [optional] -**Email** | **string** | | [optional] -**Password** | **string** | | [optional] -**Phone** | **string** | | [optional] -**UserStatus** | **int?** | User Status | [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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/UserApi.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/UserApi.md deleted file mode 100644 index 74ca98353aa..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/UserApi.md +++ /dev/null @@ -1,488 +0,0 @@ -# Org.OpenAPITools.Api.UserApi - -All URIs are relative to *http://petstore.swagger.io/v2* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**CreateUser**](UserApi.md#createuser) | **POST** /user | Create user -[**CreateUsersWithArrayInput**](UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array -[**CreateUsersWithListInput**](UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array -[**DeleteUser**](UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user -[**GetUserByName**](UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name -[**LoginUser**](UserApi.md#loginuser) | **GET** /user/login | Logs user into the system -[**LogoutUser**](UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session -[**UpdateUser**](UserApi.md#updateuser) | **PUT** /user/{username} | Updated user - - - -# **CreateUser** -> void CreateUser (User body) - -Create user - -This can only be done by the logged in user. - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class CreateUserExample - { - public void main() - { - var apiInstance = new UserApi(); - var body = new User(); // User | Created user object - - try - { - // Create user - apiInstance.CreateUser(body); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.CreateUser: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **body** | [**User**](User.md)| Created user object | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **CreateUsersWithArrayInput** -> void CreateUsersWithArrayInput (List body) - -Creates list of users with given input array - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class CreateUsersWithArrayInputExample - { - public void main() - { - var apiInstance = new UserApi(); - var body = new List(); // List | List of user object - - try - { - // Creates list of users with given input array - apiInstance.CreateUsersWithArrayInput(body); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.CreateUsersWithArrayInput: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **body** | [**List**](User.md)| List of user object | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **CreateUsersWithListInput** -> void CreateUsersWithListInput (List body) - -Creates list of users with given input array - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class CreateUsersWithListInputExample - { - public void main() - { - var apiInstance = new UserApi(); - var body = new List(); // List | List of user object - - try - { - // Creates list of users with given input array - apiInstance.CreateUsersWithListInput(body); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.CreateUsersWithListInput: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **body** | [**List**](User.md)| List of user object | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **DeleteUser** -> void DeleteUser (string username) - -Delete user - -This can only be done by the logged in user. - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class DeleteUserExample - { - public void main() - { - var apiInstance = new UserApi(); - var username = username_example; // string | The name that needs to be deleted - - try - { - // Delete user - apiInstance.DeleteUser(username); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.DeleteUser: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **username** | **string**| The name that needs to be deleted | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **GetUserByName** -> User GetUserByName (string username) - -Get user by user name - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class GetUserByNameExample - { - public void main() - { - var apiInstance = new UserApi(); - var username = username_example; // string | The name that needs to be fetched. Use user1 for testing. - - try - { - // Get user by user name - User result = apiInstance.GetUserByName(username); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.GetUserByName: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **username** | **string**| The name that needs to be fetched. Use user1 for testing. | - -### Return type - -[**User**](User.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **LoginUser** -> string LoginUser (string username, string password) - -Logs user into the system - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class LoginUserExample - { - public void main() - { - var apiInstance = new UserApi(); - var username = username_example; // string | The user name for login - var password = password_example; // string | The password for login in clear text - - try - { - // Logs user into the system - string result = apiInstance.LoginUser(username, password); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.LoginUser: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **username** | **string**| The user name for login | - **password** | **string**| The password for login in clear text | - -### Return type - -**string** - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **LogoutUser** -> void LogoutUser () - -Logs out current logged in user session - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class LogoutUserExample - { - public void main() - { - var apiInstance = new UserApi(); - - try - { - // Logs out current logged in user session - apiInstance.LogoutUser(); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.LogoutUser: " + e.Message ); - } - } - } -} -``` - -### Parameters -This endpoint does not need any parameter. - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **UpdateUser** -> void UpdateUser (string username, User body) - -Updated user - -This can only be done by the logged in user. - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class UpdateUserExample - { - public void main() - { - var apiInstance = new UserApi(); - var username = username_example; // string | name that need to be deleted - var body = new User(); // User | Updated user object - - try - { - // Updated user - apiInstance.UpdateUser(username, body); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.UpdateUser: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **username** | **string**| name that need to be deleted | - **body** | [**User**](User.md)| Updated user object | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/nuget.exe b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/nuget.exe deleted file mode 100644 index 0cc40884a0d7aef1661d7c3563dabbc3456b4c24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5336752 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
oK?Wl04u; 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

*kZ{xv9II)gmzKo) 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%0A$ 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≶fl0sMS!*W^?T;mtOZN<3+h*yr|L$Ka(

    ko?*> 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%0AA` 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�ycJU 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 z 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

    _wzO}bR)PMa%-(O^e$hoo7b({#ymp_h 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 uoL;bFe*9Ik57pNBY?XPbvG4`pUv;k+cwJQkMB zIV3PTUvVZ)Uoy8P`?C)+ox6Y_+TRZWV~P{k(S{G!W`E2h;9>#JtN=3ER4!4deWk5( zsYNIYGzEV}M!{wno61l09Q9b|VzJ9gDcl@f|0Js-#o$zdLI<(+!4^VoOz*~?r^^V< zxh3QEiCn=dKnrI1LB%&>eKacZ^DiLk|a)I&>aMk8#TANq;kq{`PfVX={RJ3_J zfzx9w@Xb8JoE`d~mt|)-&X*3OY?U98j1yu$GUij|)_aJp1DnCpH zOUz%P1S27M4-xP*+n6udDzL3ip!|{KuJNVnCOAgNAT0A>?+xh5wd`$M%5B|yma0UX zs4aK4lwS!=oIP90*H-q6S@uF`OSz!enl1lETlscd#7%!96})sPB4GcW*a%C`FKqaI ziAD-pr6@*Yddf%lK#mj-CthhQRrl67Q_)I=&zTI*jM+4qz=;n+Y?SGABuox+D5C+5 zmz=8g+XydKyV=U$@hR7uvOKOSH@P96trVJ6tTI?BtXd2AFiqK7_)6qQou^?ll1VPMxLC zmyS}gZX~2BTF9Eq&+zA?Yt8++x!0L{y}38wjyAYc7Br@t1j;|fRbyI53SpKa5`xAg z;0^9XMPt(7j)NLJxUb8pB<^{nc(kf@TOtJOl3K7Hj^E8%zLp`~>~=&;H$!KbmSB4j z>He)JUQWjwVzdzKAguQ4wApwgG@1PZ6inR$KxS@K<^*-CaraAee`W4%xTB5AlorCd zU7&n3u7tC`gfm-p5eb2C1iVq1s1T0ZUC^)H{w<~Vs9s)im*7EL4Wt${GhQz&3rm|Z z*iMo|my)i=Gz2@lqNd}GORrC5A-?!FMj{KhH|P5%i(iA9`*`DSFzlf>_b%Mg#v4k7 z@y0y@uvV7wvVjW6%Z?3&h(UXE?iICPzI1?Ni-y%!(Q;(GaetO2{ojVl@)A`>B!tErf}T~h zJR6)I;jZ`xNnfwnySC?V;bN%DP6zOVTk!jqRf#ThA{ ztfuc??u4BC_btceevX|hnVvpDEZXev0JPbMB=gd-vUAT7!uD}XDr~^EI1>NL>MkG@AqPHjdgflp!_7Rtiwjqn&(Vw zgg{XRJku$v)O3nXXF63GLyzH9i}FN?awU6D7Set9?(w>4Cn?&>7EQ?b3w%m_qQ0j~q% zyK>l)l^chCX^hnrO)=y2XV7eO#|?kLHUv95sV?LVot#W(1(X&o^G$*BYq)Ben@ffd zkrvz838LBrymOPHBB_6nl)8|A@JL_H7I-}Ux&(xM_VP0P!}~YIZXD^_Xa3wIHUVzK zL~d_)={hbW33rp9k1P=*+z~&U;QkKzT*`34+{>UBg?X1@#8~;pGB8j#COe9|vrC;L zc|E1;^+ob;;BuNzGLpYxTD!& zrGg!PU!eRpuI%s@YGJpSb_#(V7Vzw_s8Tz;x<&M|8^sP=cFmO!p^vkpL2s$-*0xlH zpg{|GcG$AZ?C=Moj=T&$2e z#XU92Vk4V!aa#)6j}_xf&ta$8Vx_NOCP5#`bXy&DR$Ni^V5VChXS#ibvLaaJpiot> zwH~I~z1AlBr2XBmBhr8H^YlqIoZ9VVt#`A6ePb;jeGGO|uuGn|F}@GWaAWurLejC~ zR(wBpPgD`G7ohZvKD zc9L*!OO@P? zLF2%3W<0SkgwiP1d!7i=62wY))K@yEn$K{xfNF}VSDM>&#Wqhpd|=+EkRUqOEArM zCF0}9Rk}7*AX@U8q}m!OUaAQ0jZ;YX#<_#^a!2W1JlqVBo@)ZH&ZlqlF4$0oQ^x1Oq3Ba zSze&L6s}~li)8X$nBfk0f{=-TClgWmO|z;^S(27kZJY8iX`4#qa@`%NT*QXgj@omY zK{>_bvH~dNvJwEfxLpm~Tlc*(LF~3RcU5y|nA>me0B*1rN4D&!fZh@9q(J(PsC0Qp zTuq?7BCg&Mca<320ZSnmQVMwI1VlwrIw#;yqF7><3X>?d4?fw1kYQTlZSbjHoPR}H ze&z4&S?|mpjGZ~v%D*}&%D*On^6!LP825YzU@Wi}f%#~rxwFh&8#fr`yqr>_)awb9 z*T7Y&cT=fHtn!7R)B@g&wx}p|d|pm7+7sQ;f`&P_ij&Ayh}dZfM;NEtr-IqMNdQ|g z&Gq<8YsE$=*#QoXP>exFDC>*JamWZ|cX7CjaVUgFD1u(a7>iu@NyQ|pX(#e5JxhlZ zc~vJAJWNAUHC5w{WvK(51o6hfl2}?#$#{c3j~j^F=sUu)l@kywjKxyF?!FH&ZKHg& zk+9*L^zz{$c5|}M(cZ>;+38l#8-u2vHw947FQ}|;W^h|VSZL(cy|SIWZoBfA^x~E6 z_1sh00Wio~%pE|fEqmq0iESm&z-3Lr`q`$qXnUjy3 z8)gf0w={Pv+(4TM8JTugcI0WsmWYHSd)icJ^=G>ZXNg~J$WSqKv)fLBGD zu(4*dHQRvfUdtVeQN-{tMT-=?`h})JDuufS^(1>XDMku4G1+&I-1egmJMn4pUq(o! z6Ls>%iH_}P9r`+s$$m7svJsP%zfrhlll1wmjMnuI*3mFN< z=8e6nc)Nr1QSLV0mDKen7F{V?WjWI3(%w{AZ>Z0EctSe@$;E-0yeu#uDFr^Kpz-`jNiP!Kz0+QIjR_r6K*%||m_k9&@Z{%mDM=#%IdD0GDLStOBzd(6+ zT#ak?A^x1eN+|^68UfGlh>E1NpP7E+ZOWe9hC0X2z@-vk8ivDZtyPD{sj%}>7EAM z(`pXvL13^ePIs^yZq=Q#&GsppX170>o{!adoLUKG z2tllxrdp1xVcA|dn9hK5mMcnuv1x03YW8@ZF(s#1h3O&KpNox4NAaQ??#+rwJ{lr0 zA02}mx_PW&d3P|JdAB#OXxTh!t}@BCvgi&Go7_qbfH*>NP7o-Uaiuu>X9hqB6i2|D z+7cB>X)8qLH_0HRO)?~x9H_5JFFDX&e$5(%$C8qb zWa0q8e2BSp7pAsXcX=E~I=1yEe2}0C#g>j@_$w?(awWnIqh5*7RQ&-F$;xd6kK~QD z*LFCWXiO&Ta5@gIQUl;&nu6oOWOpHGc}It+^e&=m)*nqir%f#T5q3JiMHCqSY20!p zVOrPs?1E~d5S(C1vlh{wdy9CNnhu=^3LVnDF^n!x<%!GR%{>KowDkv3QrD*mluyD{ zT_2#jK2wQBLQvNN-ui>6;`N8gQ)b#mMVFyB6Tg;5la3X+Hoq>9&9Ap*7wZ`ZmUTS2 zp4fv75zno=_uZ!4t#_vP>WSmJ`E>5aKb`PkGi!<5`@sF~JV%4H@L&@cSQWOZ3rpJh zpuHJzJG~MQBaqg#!hFGvi;{Q=+$|rSqx8?h$wz172AeCz1kc*lxdbw&|B7tFdGe>Y zLioAn`&V!uwV$0d%g951c!*hL4%+cy<{Vmk0cqB7RG7{FL3R)tG= zVt=5yKgP{eK`-)S(WPwCT?z0?d#OPAB3!-F9w=4NyD1wJ3F4Jjz*7ZLk(90unmlgi znu^&J9cFJ&%GMNO=t6vn4N#Frim%HCoCs0xu#n+Ncq@)uxuz}hn6~&c1jePYNB?1q zF^Rrpm=?Ddlgy92__wsrP_a^dQ5*UkhA%Vu{RC9jhOXp^9kAwJftv}g{>~*)(uS@Q zC|`!FHuOCS?qU<15VRoyPjI4&+fZBcf~)C`qIn9|K9{s7W$v}7t*P~jV@s|{NS-ttoe3_Pq&}ph`w>!rB!kqpLw>GP;&0HdUJYGu+W+BuZrTbAj?t zaV4XJBqQBd!3Eg_AtM1#Mxu&kv`8Wr<>!fICyB*zBG<$sPpz3T1}x_qGm{}=GZW7% zHRW!(BegT)IF(7#c6GM-3An$~WOE%+qQgz`ug9B@Zom!KfIV8}jriT0<5CdNZU2IR z-U0Ond?b3L_?DW(*>qUFV=6*%l~glFzqt;ahXJD*y2VJek9X?O&G<)(@1|74LOPn_ z(5-b5-&4est+fdm9E{-2$ORWLB%QoSa8Po0T=L$xr)T&a`^jy7vQ6)h-mrK`?budv zeCw{0^&nWqW~ByHX@65ZTO=Z$zJ;YTLsy$@ZzC)8?nfX>{~+%%OkVt&u!@9^{|@;j zb^LeAFWKY2OMb~7|K0LSoK0n6-FEen;+qo9DTt=YDl9kz(S)b+ECYEOFf)+i0t0!E zK>2oD8OTsN>}EQJz(5L&bS<46^b{3Iola7|9kawN6BaX1jLpr2cm4UQ)T*&?^biD2 z{{|MWiLeK2kA4IeAvL!k{m}=HuQgdb0zLYpmEY3G@FD$qjIfG?g#S14OG@}3mtV5N z|AhRK82%^am&EY@R(>(nR2DYTrB77EGfbB(`1{hOGhRX$N-@1GMWKZPrMf2hhgOzLbjB?x;jFw(Vr zQa(|U)OjSuJxFbe*<9K~7T)D8*DSm|bseAOX_?h_d>JO`_!2o>bzLe4ahck9>Ca!t z{|1x8^Pn<0yv$QRdePjMa7UAaD3QY-1j;YqN)Crf4sOm=2;?B($w5?^9LAd*T#lvv zB@M@cT$6@8b<(h$Ez4SIWSB%6**M_mH>dItw^j0xUfg8z_#>!H9&>o&0%dbw#T`u^ zqC_6A36x*Kl{^m5^g;;aA>heFRGBD+tL&t?6WJO6&O$?LB~$BexJU~FzXL`ru4{ar$m^Y4GhKic{C ze}HGprMYjJ`?k67;Qs$O|Nb82HRs3qyawS1stTC1}^B3u#?CyU#3MIzVXHi%2hwq2F(<2vrPj z;ueD77oNJbIZ=eeDMzcDTxm- zUSRx?3_yF>2ju#*JFJYK5hb%*U-HB?%I1E7JDS}RC3fp8f%50LvRg-Hc1sBCmVjrs zL{(?E24%Ng-g3=u$x~;yEKkd<)^25(QS6quOzqaKZvB)Sxz0zM`Fi>V0*#d)2#js0 zTxhVd@DTZ{H3dZ$FS2NnMT!)q)IzNu`e|cs5|OjC8&*U-4VAn=VPqWZFWK5pa5M8Gl^4z5Re1qejP&Hz zfsUdIShrF@aH}R#NK)g!M8_vgZ^|7<*xjUAnjfZHi*7ZzO-w~a+~_z{`X&o#Hn#=W zls+Gg!Rx)Kjg>aXFKR-$;ch2qb*Rg)tJ*_=DnuZ?L>)-F%~a7-OL?_8?FXp=)5Ksi-EYD z)*17Ww2k{MjSeDbZKKN)m|$+Fk{M;JCra8zw?KJ3uG&Tge&ey85VQ>euWg8`u5Fy4 zw&C)YYi&cGy0&3?T4uFvBg2f+HpFGxHZqxxwfVFMO&&c&iH=7#ocTEi&IYC+#9$#? z%&tMR_o}t@H4e+#DT>W$B$AI7z;!bLys9k1gQrkEoTyL7bmD9iQ`{Feu*4^uly1`{;BdS zU;InTFCpR&4osE#mWC&&8%F{%yuxjIeOr_P4a%#&OYaJJ-Nn(atemNJGVdc1CM$1_F-{h zFXX3v9o=K**cyMAG0@Z2-L9Q6ot1vElaE#fgcmZSQ5jIci<+1tSGzQ&|~@tw}0j&zL#C7ADT9yS=4frlF-@v+g#^ zbu?KOaOq~6l_VWL$vCWgb!`GCec`MuJzPGfhY1bcZ4^)5nE&O`lY!;F=CiaWN02I3 z^T47mg^a_A35Ry-+6fHtxhhyvRnTPLjldMx-|mQ4KdTHvj?Oz8mv6lKW+J4QqgQ7Q zMUt4dVCfN5<>>Tz!t}h&8$FrUjl+EF3}x9}nhH;?=HGt%*3!UDFkLh z!0Q`DRo6G3MsuyWyyaToC{JDAXn9&@wS8lT8KrL&mucVFS6Tsa46jXC+IH*Tb=?`{ z--fyK`p9ky9`n8oe_zgQk+#dQtDwiH}1Mr<@FRbPVAJ_i+`0DKM zfOGrnxq&$i-7pOun;u7DYhW7cU$eb2p>B#UABhu}ANvc$Eg5QkW zC`HFbl)_!Cu7|#UD}{xZ(dS{)leoIeV{66Q8u@zRq_GXb;U%qH)74oza!s%a4fbJM zaJ1XD+z0UewCUn@1ZC}ZC!W}JXzq@f;?0`5=+p_Kxdw{xp)?~8_DB9`X0NUyER;t~^13J?>k9N8{_<6O{?}Dpur+cKK zemmVW4fWgUUW6v?RGj1^<;TU4=87h`#@cCTa4@s}{rAChQ*?^Gy(xZk*gi`aY4WXV zwcULPBGzVBGCkxY@yHH5+#qecc8^8&VKwc&m1uN+Y+u3huDH7V{$$nu@s^qpj0DPp zUh@^5Zqm2r+gROv#X#JAKTdXZx%Z}Y;Rn6DKG`i-SeAiNYK!*8gEK}Qd zhY35Yy6vhgY1{29tuNcYA7NQLDg=u#o==}?a|ehf9~}q?u8rI6_Y@Xh?%J)|+{f_n zg6Y*kpt3eMo2Ptqh`Ax|Xl+iEw7KsKln=&Ln>$5P*MN+B7YU-x33zQzRB4-A#9v2` zo1HRu&F*qFJI9e+Yj*O~H9Ou~FxhHb>sQ`O2YS zdkd8kV5GPOVWle=Czh_nvGH%b*PS^n#f%1V*m{N=^wM*tb;CZF!xXr<0+CQ(X&cq& z;e@4e4liw~JPQ@Y94T&PnNe+}D_z|kUfRLok2d^{!aqpsDRIExY;qx3q9#wp434l- zS!T00%133wxvWvxsm9Ty=@WAwqJJ-$UQ|GM=cTo9z9vY9l*bz3G3E~AhNn{J;Z-oG z*RHF9*=v_lK}U`kC=cOEM^2NDoT9`cAB-5UJUzLa1o}XtC#QqSN2i*58t!O%qEyh6GX%<~;7U)OGOA)a|OIQvfQ#` z^=FFOFJ7vO)4j>_(~I8R>kLp|F}*kk z6ndc-$V2$O!%r`e@A2bKN04staqU}$(r&N{&Q&tUDZYs%N%9zF_iY`GZ{m2+J3P44 z?5boeO)8la@yH5P& z;6hPtZf~}JUwd;neRs`F$vzx6!Pl|xI(RSx2#1g?DBcQL4A*P;g9?P1PiJgm?M(71 zn3W4XxN_m205Yjs23YX3or>vb%)_L;h`MrtkzK&gD;F}ttX!o1iEFsK((-jOZa4** zW?%4bLQ=sO=p_g^LQz@MX4W=t*yr9-p~z(CDT=U`fGI8d5~l*Jte4Ee5%xY8_B4h4 zj=(x+w*q`EwDNd5aIcI>%=@{%+k7QPQ?HGsI2_T@#7!pSWyM@HNeu2g`jf0n66-tA ztlMKfum5%9e0}|Iyi?-NRl1IOR@{#l^M@N9A++Ky->d(P`;x2w%PAM-${$lMP@l_+ zSTf_*gEMabP83Vu(j9y!iia8IPLvOjtiHwP*|xNv*|zpHYft=hW@G1pVl1%*IpW}! zObq@m0?3v`b1%dVGdan;@-CZdauLA1E|FI~A6Mpef~3?$BHV5X2=kKX2}!XarAAUU z`Ng~zBe^r(@Xt$o1oN`ATjEO<+og?pov5^bXBrX$^OEP8m!&<}yj<#)W27aQeYvI{ zJvjCFLrF{95@je^SNC|BrsO78zwS|2OLyaY`jOZ?{Y)-wK^^dd>E|*~Nt?`yRN)GK zOB4C8l5J;v71&~Qg}GPaj#Lkb5{mkVyz1q+Qq)Nj)@vdb34x;IdG&x|CH26}eJz|) z3r{AV_2Jc1%MC)!tEJN%UrVqg9eQe~D4hc>z7X`(ZJ4@2t;r#eNO(HE!|qo=*r7bn4izi4!%t1fUTSB^L@rfb zf;C0u*SbBwXckd5LlzUTGzKz`>@oC!R3&WHQuV&e)i5(f>+3T zWRq7a#knFUo3s?M$=mZJvB|TPq-!^XkWI?3b*)pECg1-SRgD{zD6QAYG6|D!XTpbG z%ogpK=|b(B1cxmRBG zPFzj?pDh{hXQYLo=9lLcK*geu(v66%?6o?c%9YjW*|jwz)Mh77{}vug%F<3D{!jxhXAq#*xUzkM=DApKv8;FUiE%l z6{WvR3ZaNaLQs_Cc|}RFlA^?dj0#ipyq~2#DqDYT@xF)J5~y1h|BFb)NUqc1X(nd9 z+XWgyjgwomDhBj;&onq_-bL+%F;CU|h$uVm84{f%?k_PqLTE@N-&3No@8(@hi4-Nr zSbL-C(InV62@-C@+xrwCC(z(=rqq%xB%Mi)ByKBAdKg-mj7ei|aAEQ=>Bu|3V?c8< zYNAi&=ana^$g_pcf^LF+%WUCMP}qW|(&>jiDFJlGPXa7PkK=~tB9}!>*eNPj@RYpj zW4N+{^CU<06pE1$Sb;px3KT21g7cMN^SmF+46ag*^E7C79OH(sGHKeqmg|>^mtypU zz?p9AOQ%$89JRy?71(h^={#Q?{YmLWLQp#8d5SfThW5+EL*+E_Wa8*dSksFsP7h9T ze)r5+u(Stv&pb@pJ1utXy2{Zn}q7=t)ox@|E}q6090Ov?{|889w7I_n)@8? zNM%?A(B2F3s?Xp`dlyJn?WR2;(4IU`dy187??k7)pQMF2ei3vX10yKQ7-)%KQWVDk z%DOODmJldQo~JBhV5qW`aODgs%Vf}*aH1DemL7&G%UH0q2P@0Nq{{N!EZqP*w_aBg zp{J`ch0hVr2d1lkgF;v8M^m_7T|Db8*n!*lV?jOOc610Ptf8wMe5iF3Sa}4f2>sWe(75-c@GY&TP8ZaD z2QZQ*f_k9!`xGP%hPa=}tGVWSB)XYx37v6;;8L{69&Z7Hmyd#|gk}_aZ#g*SmRAmsw$hi$X$6vx&3TPCd<^h@jctu~C zV7t1JC<&FdRhn$d=M&ZK7YEeCqvTbKxT=RQlL;QJ@*fF7JuJ^_s}u`T>h?3)L%0Oj_KPLoVOZ zS7fVq*3yKYno2?fs+A6s(dvSs-j2ptq1c`1T{Vf7Ongjfj#h9dKPE1&ko-2cA}oX^F64V<*aTQ|Yaiu- z4ubAGN86+A{;#RseKK2p^iq-P(ku+jPN>iP6N@-WFVsDzYm|JWM&b0Sx7G?vD@^ zY-qK!h2Ph)wmH0y#`ocW=6xC9AwK`M{Pq9=uI9zxccMP3?oe-}TzYkcN<%|%qf1lw zE=(Y9&C2ZwKd!3!f_4Z6_aQ&wxOX$jbdM8FcE0Q9x+=~W853t)W>zI@i0xP zYO;RObFXCmB4yc=W(Zg|uI%A5as7IybS$XHMhm}1mrZa3~oeMwP4z~kjr zJ8>o8t0dreMJy5m0n77>pkn2H$^8|wdEQSuNlNP=@dVJEg23$z)^DLlqn(Cz9A&lY z(BYbK)Dlk;4aX4;`#;3dPDVut8g_YJt!f;3BY=3K;u{a4y0e@^0ARJP^~;i8hQu@C zhu@4F<^`4zImZt30#}P2x8f;;<^|+?*V!9C*@xfq#MznQK651X!@aSxDCQ zuT(jL>VN)ZVA;CjlHI|8K6S5eCp=Hwvf1iV1VIH~!_&7Eb)cjiY-?5J(!d69K^*@P z8-H!9Fm2qoRiBr}uknhs-yQc7o}#*$fIVwyb7ncZm#**3A7+o?Im<4x|0_=D|4x-x zor0_W?=@2AYARWg5cGfLdHr9-O8dXnWq5JB47hNa=kXIJPbsj^xu?=SiC)cefW+Ef z#?L*lR*vq%wL689NA1n$XbK_A(XAHZPFxPR0121SV);vSwN*Cq@3W}MH11pCfM5yt zl#Oe}{eD(9grIE5^S;kw+&9?wS?Fnt<@h#|V=J+4YRwuXv6D1NdUOqvTaZ|mcRK!( zy*^Njob;&sMtkNQZ|@4R&m7v2j&eD=9qKG7ETH}!CL@}bUUWt-GIIZKMyxNx2_Ta7 z+GYpXKX_UOun>pZP(cQ!K$VPYDb|@wuT3gW?JEHZ+*c8^z14Q}mvLwoLf@cnbEb#! z_EyubVnBrt_|b_doPuQic2f4L?>=3}Px}<-AS#7llix->9LjGB&*`6x{&Zj$@$<@` zEH>NE$(VR~-ff(055xgBErr>GgH2Ci_FypAZ(pf$yvpzj!l!!!u4xF*WjA2|(u)`N zo@fJFyST=K25kQvWmB!wI18WNvo~qR;)TiNuf@vz*C9!n|0W*$jn5@buE^$PaACK* z^{ucMqm{wCZ9V?(;Z-uIzk7I9(bCm<*tF=n*u_Ypx%OJvovC5Mf6@ujIQS;~ykjBm zs0UV)SDk^Ydf+;1WsFlHs0ZZLx;9K#MHCBCH$y7C1;^jIZ4`|Zdr0dp<;XGK_q25| zf;-Nic{6M4#f5h-$N0i?$a0j)a&=J1axFY$c^@&UV73R%0U%%_iF6kDMQ!0;1Kdz? zubDx8aeqtcB;r<@oFFn+p^K4WM-aC%fVgMNtM=ha+}BIoH50cGh+Cc~ZpBK(%{d{x zG=#Sy_L-WvEk_Sg&9sDn#(rDEV{wPF6wXxFvd8YWrjs|G2e&k)%G7vbX>1OJ6Q)=i zyFpCtVN403r7`*Jf*QwX?z@tB5Ssuo+dECia9P54;;W>(uAdRNoYM8X9iFpZxrb>A z?f_%wq=<+$6bh%I)C>7}WnSWH2<}u!HwOL>_%^ePxuCF%4e+pw7m1Hu==cU#hyxqR zF4h6RD7#n}oU;r62+n#L)GwUtXHef-z5_J17IDHs9CH<#BQ?T~U@giP*0Q0z>e{%n zmK&uQw@fMo)*{cd7RAb}McGTOMeBRRS&Oncl(BG@Y)0*`EvH%oJQoT!W;M>RnT-_H zv4+k3Q>@VdAa)^SGxEJA*mz?$LsXr)bk~`S(KULQOI>T@VUnW&+4_L&}4}N>_yijaWaV)r|i?V%FkPEl0kiCe?Noz%H9-cs%%k9 zE+!QTP63%~K}OKH7(?Tm%d375R~o-bVm->36atOQ^E9qlnZ_+;b*xggYbvYk>IY6J z5!5kL*;IqM;XWyAOjznnVqZw_AuF>UrZKn(OkJ7PZt#iqI#3oGf{PVWZL(`?kE)za zEya0&?ZL7|e>=Qd>F>ZQcTu`4ce^59*pQ<`#_qPb;XMXTX}rKuB%sk27C;mdz?S*r zR{7)BJO;avVc1~)Y>a(}Wvto44xq4wo$#;)4Ie9igB6`Q7c5o^JnyV$5$AaqJ&QWe zyXslwdH#W(#cb#3W)7vFsT|!4+p)6I94U6V8@<|@%S$EE1Jv8ik-|4yMu~EkqTEN6 z@P3@peXgT6IAHjIkS*bZcvd*AO`i)g-`Gwy#Pun*IMZU zne5=J*;C|&LOuqU30dVSGD$_h;4!=vHCfM8W4!vFsdU3;l3&WJ{uEc6Np6!7yID~o z7~{$FY*?`%Wj5Ss+s(XTQ93Eg+^ljxXj1eQs)znrmSyG4Y|(DtaWkV$-pnXnEDMrl zhq(!xBi#}?4wE2VbC+P<9O-i;=o4}#RiAcy+0B_UfD^*e>Dk7<9$_ZrARLndJNpuw z6;1ZZ*he8viY7kxpw*RK57U^G-S4`&PtAvFc-xF|>h%80yz_7Kq=Nq%_$v6CgVUed z-v@bqhM(8|N@qjLI)|QrW%=08++Qn9I11wmeqgopq!~Shdq`}8mCpz?bENY~pjf#? zrQ|@1=G>U)*imzUc>*}X4sd_~N~0Lf#~o>gRY@@c_#1iEDy}8~Z#f|(?1RPy z?l$p-z-D!VuLBcg00eQqff`o4rS8UXcYhAJmBB4+PETFCJHbiXiHezlI@2;)nh+TR zTC-r^1dzFK>wIB-{0Lv;|MXAu=SKlMo}Xt!QbcA$vJIVfn{2l6TTs}>#zdsE|2iIJ z-^V5hZ>xI!Nx0cO z>7*I%T+n z*L1X{s z$;n>a1V6#9vvW;?2YaYp9el1y7+YtkyvCUxXFi>=iM2C!`IJdnvCzZN^#jX@Wnl37 zfrlAx{opJrzCq`jWQ19{Nc+E>YdQ`%=e2PEr*lomE5hJ&O(y^x=3LW>3Tx+@m?J%j z7n?V=2Z|uDlT(;IIM^vE%pMGu&YRvr`!fGj;nRGq+z{TFHac|ky?N2G1vREiTlrr= z6uO0f$D{9kF5!yN-*_2mvgSQqe)iZE45Pv{MJKs1Jf`PcaTGy88yr^P9>N!ZwJB{b`+DM6~ zR=QKo_VeI+=L;D;2swY|)Y7!X2G5-4m~`eet#{S;Qs-<;eZ4D=>*i3u0KbgM{ajGU z{SrLn{x71_e6seB_|F$tU9|LzxCY|_@Qa!&yAa$^)m)T8ebrp7bQ0AlO-?nLD;iu8 zZ?1*eTMBw1QP7KZ3Q{&u(53RK=iy304@p7pjEN8^NM5aLt5iXXg@Rs!6#X*|!(Dp) zyIa3MXU4vM7jDD82d=&v&_>*H#ITonR+)B7cndDK)I-i^*qdk7Y18_7R^ymj`7%Xv zEK@5#ES7gQMubqUEZ>`FHJ+QidDf(VZ%gY&)QAn9U-dAJL+4ku{&F`zudgK`dh@H} z3-5#PHJiB{6gG1m9yaruvl(0Nj;;hYlFeKNeo;2_4{*+A{Q1?ZGpIl1c1;HLE$LdI zsU?XMuE#f5G`I%eTnjUTB`I@Q()IGHSK!K${w1~8gg_(&mL$)!B*n@tNj-h7o4IlH zP(x8pxuW0PoGWjNRpwGZ#cFI}E;lHW;|p_nM0~kf93f;b^1UfmW30(dvHF%`^o-8n zsZ|e?E#&$2%ca=CKkIEpV)EuzI}7WBU(RghMo`$wZFtzq#b((z@!}Ni&#m5^L48Hv zl0kh%-wHHUw5TO>tM=$tkwuMjO6FSV5mYW7QTgris{h25${&?ze`EX#fy(81Dp#y} zm8))8gBVP&s#@Saeu6kA(&<$dFto%j7)#Vr8$7M*VUlUpy1DH#vhAvuzjz)pugYCi zS-Z>K{seJ%QR$u0uj}zN(D=i75 zOilh0AZw))>VU_G{>DUYhyGhYen#*`ec-_Gf@UV({d9 zlPNsi+c^!nYJT!%n~Q9S|82gzzxO43?uuW;FGYHD^OH}IALb_osJp*cXU$J#esa3$ z>S>ZiSI^?1t3Q~o9+R$~0aA>dJHT@+#+g+7H(uXl;ukAVDBMdH&bbO5Kbir`(NnZ% z{R^z&Q;0}7lR*E)GYWeL2WqlX8D|RfIg2LhHf0#U%oFq2Ct#Ju%2P_|c?;oOQH!6- z0F~E~bNqPrZnr^JKBb=#Kal|=?@>`r+afs}v&2f+ydn z&4F2tZ06O`i9{ygY~QQpmGzywyri%8qS!>F8L&Tk7|g zidL=kv;w_>sEW}G0E*FzxZ#r+%5bZ2>ZHm%G|~Tx{OUqnP4qvdg68&!389I8`Cb#D zcue$b6|Sv$*2VUnSj&%e#8iM5a)z13q<)hH3^#51aBfAi7;oCNIE^$} z%0h}uW|+y+dOIyf_MWB4efEbixZ9tJAR+LiTStyL)0Sd;ijyjs`e>84-Bg48aM zn)f!(=@?XEsg+((CG#$N>YXoSFaSBfU9~hVvB6`|9P?j}LB+8*2JNwLf39kB{|_kS zUc*D~$r#jCS)Yol5yqgOfnU^k;&X6ARr5s#^;Pqw(n(aKG&%BPu4r(E!(0m!OF{1; zF)8SM{9HlG1`7I0UiA}PDd-s~NZqYsBm@eQSL@n79fK+sq&`q#acczm5c35aV#;D$ z!cTCE(O`Z?9AX+nj2Q~w%s67q@T@r6)i@GDV+Q%&5Yt#%)DY8%TJ{DHF+EH&#H{PL z>g@VC{Jc6&LK-s0T+M7^F<8PTTJW%mx-n)0u#s${5&WWTq6ys4F=i=)`a_R$2K6na z8E9%L;-nZUJq~u5t2msKzzs&Q6lD%e86~e;#FeEyC%w2arVv<)JkL@TtKL%bG3HQ9 zQBH?)HR2f4*uq{~71i;Dy*w|z+!#{`*^7Ly17VB}GsZM}MrZIC)5H9?V@!!@$QZNF zY^4npwlWS6TXAE|F}w^NV=kUSeMOJWpuVEpfu@QUwPcKGk8X@9Y8=)u*Fuk=a`A}D zJLFYI<4WZ(NVIN@DFiB)=c!z=>Q(NIF;y?{jSGS}CWekNEm2Et@EFs>{Fh@)@jToZ zGiy(aQ71v_$C$HBKV87l&v-oa6%ky{cTR=OxT8>`qB5t${AU2Ad+iR|p4!gDO zUL6vxW#t_b+jg%|E%9>lT+*y%y{x3Sx1@z&ElZv!b1@7l$vj;@w)qgth>^iow*#B? zwLMH@usxVuz8@^M*b;N-Ua#gDXb5&NwDp&FM80d9d;^k1zSHn@)>(_RF4wcvr)J=) zGf#;8azi}ZB|%Il@JJ_yMH9KNAg{VSuH^oTGOy)*zBK^|xy$q9u2>k{Aq=$=4t}mQ zgZ-r7mR81g8?b*?qNdlLbS)%mORXhdk?2Wki27Bfw!ft&1frH#>*`ATewJE8uo0v> z8q16frD?NTHvPNfw#saB+}3T=HCcgXIVLy^xcbm@R|SRtHGb;o zXu@43BmL9(W+`AgRpGV$l37FWJ4Zz2L8qa2u=s?L*wj>7+lsrs&vj94h;Q7 ziji~sc#cJ*9KGDdC+PO*M4mbe*V`FvtA!;M#bAQY2Odmgw!fW8t4yN|w@o@?Im&f! zcYmq3wD*GE9!Js`3O=P0UC=wezs*n+iq%;p5wwqH_nWrVE$E%tzp79{sgc6e+!9WQ zA~#y%QVyb5V1+7N2kI;Pvlk*c^tJ{>!p(TMLzi|Lj-9%k3y-!4s4VLqvTw<+u8up7 z?$H}kx28zg?hi=aBl+I0AjM-oU*|4$Zdd78zoNY~ONB7ljFVxUUA>Iw_EP^gk2UTc zz6nuX-&q$xdwwhIr{*Xw%h|1LD(V>3r_(g;qrzV|18!|^ovG5+-qPM`yQsn+6B?{- z<$1DhE6*tV6c#w!%G1t%B&n=c`q)N5`qFO zuh#WQTCXY=q_%`qWey*08y#+Krq$O+B%PGy&Cb`_&M!Mlt1B;y(Yi!*#cAefg0^sV z*eaZ=4d+6Hc&4Ts>(tcf)RY`MYw7SW5i{nEYwkU=qcy2MJWMIL%5AqUEQXMag$0F; z-b&RlrtoEJ)_yAY-uQe%VRz)dp~-!HP{@4)yw(z>#%+=Bj5h&Lj$Z4M>^J1uddT6K zh`TKTsGm&HHKaZB!HVO^@#u2&D$$tR%i>{y8$p9lrkMLZb2r8fK3yLXeMXtL&CQ?l z;7+S(&Qq*u&hz{7tKY%Zoafup;5nv2AvEVHzt**5I_g$D<~+X;RozB9L4nKCktO+i z@(^6nRG4mgWS_jKlm_M!s-qmNJ%QpeiCW9CUyfeyf=%|ajY{`tvLTbk(wH-**b=uS zNo8Fc4^s-30z-jOJF35Sel>o&zoZv`j+;KTdBUl{v}evMFUoU6FvZbOJF2^pHZi?z z3JSe#j_34tAmoab-C#f77GSEoEqHcn%hV#!yq9{Uk1csDMq8P?wYl5i=2}s2#gvlm zmQcEM47Zb4-3(WIb>ERrv~pgIgrK(~&r^wFLCRD@{XBCrVd=E6>mNiQjZn8n;=8>m z97`qRUWQeR*k7btj6LHEwJhhW#lw_>z=^a@FWT?=How7o(KV{Na>3J!^4$>QdFkbb!yp>uwu(9FGrC84Db5AV~O*%HUH}Q}GXZ)wj2V z?Q>&Sfx@R%5w?V{5OCfO0Mdy@<+)Z`43;WiB8=YoLI&@ufzwiwQGbI-E#Zr}?JR~o zkMES%68@X#&Pqkse(Xd%PTMNoo;L2Bg2#jnjxYeU>T}j!_LVM4fIg$Z1iXTVT3VABepjr5)LW*ABe**P%uX{K&TOuU+daAZN!Yl#$YjsStCZ5xkLi0;jYfI&@%HV&@s<4?W>+xohK~|5aAd<#>(|1x<4B`X%{WOrU^PO_c1!n+C>jj3hoD^c2Siof2yO7!p=|Q=hd@P zXhZOT3!9EzxX1k$z$+WUzsd;rxZjT%IcWGjpbgx`FuHIrxb3an^b;I|+82*eF>XlizTG~iaO6qZx|kC8#@b)Adu?{K zeD4Q}d`EcX`%y908PDUb810X{Z$r6IWK~!f0(9E70L{U#sEv~wOw>kao8J}2VU0ka zt_m(k?{=|Am~ja56hYTV)G&>uK?A5?7^=+J;H{&ve>=u*la3%V!#@|F@m~uAzV^li zy%Ttt$V2c84TN+rv>mv2DSl2e<>+mt_^wiP_eC8*vUFOhZxWO!)rOulzcS2}y5(Ci=#MUtoJ*4)!*Q1 ztoI-3?=!gKm;L*r7aE^x`=BISeWavGh40F z!8ZTKXyXtb@`Luq54Ha970EF~t^bJ_+QS$ULbbm9TG!Nc^l2PX2Z(CZ!14r5>S_O= zy%9H}EWOlKu^y%=tzzry*xgW0rCz_1R#wNZRGB~nJpT{Cvi`|-4f%N2%r{tv0!?ez zFpd7ncrIot6m~OvIFe}C!=Lf62ebXkYy!r|0ilBa6JFTMP%8c_PZV2C8T9QSgJCDU zkc@#w#m76OPM4RX_qrr}f%wFUxksCOjJd~}`xo4iW&*?))^Vb|>K}1s9iLidZN@4D z)*;WE2~ezLCV-nk=N-;#+V7Qo_!71HDs31~?|dPH&!8Bez|(+=TSud7Roz%p8E}~i z|Ara60cB&dhb2;^c}L*XCoo9~{DA&W?|dQc`?taBq!L`DX(dKXCRmdWb>(*ub+`cz zwY(_eIk}l=H32c}7&ZXa*Ezx^b&dtIDI;R)#nG>umoQP93~AmsBCV{>@i3*}yI`!& zQ74+ejrrZgPvc&}=gL-0LETzehwg2omf} zo!s&;+1ha`j|CTJ@(@#=JluD#e`fNy5ESyb7!P?^Woz?z@l`-llemQEVsxpwmzjIH zxmVzZ=c$<)eo9fqk<35jRWHJoWWJPSUN^}Ifn?-)6^UXc6^TtIj_%u0(y^(;jz)H+ zwKwK9?992~e1KKCOfj!Zr8{$3OXf-l+Uzj{f*k?R(u5=X;Q<5Dgky`FZ#>ao5NesJ zPFzdUtFX{@McXoGxf(p>=wXs6$FwhT78JDzt3Atu*M$OLtMT*7uSAy3L#F+C_S{}A zcvwS_6ad}Xpt}=8)8{py(C2k{=<@(&w6ZMqVtfk__Fv;x`e}({(I`hBbP0OB;chVZ zMsxpZ?oH<2j5|_up(N4rt@5hZ;!4Y3Ny`T-`A7(~EYH)jVkKHG*Gea0M3vFB4MAaa zVY=h9R_axSK1R^RfCfbzzn-v!Ek){ytyH6@y+>z=>(LzA?%B$XvD*-i-nE^WP2uKJ7 zB+siK6)UM9sUXzbEVl%b6HCRiYwdo>>j+E3h-=AMvPkO)55tnN%WEo&Q_jz1A--5M zcKFoRI+$l$fwcOONo7T}!CX!JAR$W)@dNTAb8DrQq^XO!O(OV*hMBsHcf(?Izi96B z#Aqfh8p*EakKEa~o%p~3I5xB6M)%PfAic`Ai_8EEA$8e?Fl5~5Mc!-2RxAHvWSFFVN9dE8oN?!9G#!34%5=5=^ z4GDK~>o^G+lp*h;)k@Qa8>=GH>_Jx$v|Z2^pus2{zu*|t#_iyOlVh@iZ+C66X`Gs-o?|`rIRaF!l_vF_+F5Ws|9L=} z-q-6tlEH6s1;Tqa{a9GJ|4PB^ayikNG-LTfKYNAuH5+(|=-9x^c-X+h@X5aaw|MI- z5~dt|+9jO}aK;q+4Z2%d7k}C!Yy39gC5J4uz5-Oss|&S;+RO6ls{n#=NLDMWuN!m{ z+ktcF68)bTbTYerftm<3ACfQ0+EOfo8He8n5xJGh#{O|rxsF6x&9GYv`$KY?gw}h& zg$L8^bbtSqU7B*TbcC7r0x71pBVpD`YseDLW|+`BU&vrr;s$KD(JWb`#izbtt~*b1 zyFp3nefT7WnfKz5B-hN76w*tQDQ%Zza*Z-e8@4)~yX!SKsCMJva(ZR3in`iBahiMJ=a|_$)UD3LE^<+3Wi9w2bO$TYP!e0ts zz`NS46JgSa-=4txi*_u)<~3KQtj^)*)iF{{L-1>trs{plNTF(F{yk8X`48|Y^GSdH zL(A+(=6-DMf6V>F+)r`C(^aMGM(Lr$8Ihz)|4d%>eOy)PZL*4(WZ4Z3h$>y4XB3K+ zG}mt5f^It5m&&p@x+S?vG`OWq;TsL5x~ALGvxF#$n_&8x$URJB@O?0<^U}8ak{h$O zTTC_to4NqnC-5fWVw2D3ppeg(c*y71z!~q@+mLzuT@rMJu@o0rXPF?W=?t+*qJ zKy(p7o4jfxu0$|aBG8HiSM&oy1oAu)C{`i@Klet=sE~WJj5PN-hC9Zc-qZXaeR`IE zrSI8AZ($S4+X0sU(V)ox;&|l$K=D@TpjnH1fE2NjvG}$S9*^g#9DUX$f#})cxcA(i z$C=w9&4$0db?xvKxJ_ zV;pxYV9PEuR}*7R`HZ)H43-2nDel9=v&c;`l6tsws1sEsyJTkdvdlZuMj5vle6Oam zWIoA$$3eqe(d`)J1{AGo2uxR|r1sYOTFJwVN{mnEy;QNQUj8?~$52qZze(^L_^ky@ zcP)sA^iQLj#R)K(pI6_@G%~wgsq!854JQK2`i4s{&X+b2f$BrX0~0iMz@KD(GR9y} zf!>SJlEe%`n}gjcg)Ifl&~A@*zSm$1h-9z9(n>MkYjBX28{rqV*I+aF9B!|{Slb7B zuor(_+BaKqpNIbvzwXw7_wiVMHwL0*NGAJSg^tkM7YWAK7MuAi1!Idc0nE1JUY@l2 zuZVrKgpC9;Q*UcdzGSep;LYJ=8ld=ViqK=>ds=O!GmW0a{07~@6|XJ^$`73hQR`dJ z2oKNJlCU+^V=GT(e42_4MqTE}s@sI{eTl1V_aZhDTYs(Chkgp6KkY|w0ud9*ysPCd z+mE2!`1=v;UHcK{5dY9j=GlG(X|--Yg3%vk<+!`D2|Q^(!m@;lmD_9&!d751`#Xwj z;6X;EZbTU^$73-H%v~P0A)GkH*{0T2*CRiN86VTYQRl9Jm-JOC+dx(KX$lsLB+o1A zSu}ZGNzbCp^Vjt(`o-Wu47(gPb*o}7<7$Ah`(%x&YP7&J;!HbT@R<4dHHpHs{E;h!i;!)PQ z<3|AW92q1X&mKjITMdMDni#vT&U3IEN{GM7Q;++g0copms;^@F!Svk+4t=kQhrVrJ zY-MK@5zhg_-c567;l`q!0@e^f2{=HfB~gw>chfd@k8VcOhqGc_j>Z6BpKTVfDptZt zh;`;TSaGo<0qJdS08>M2|K{LGNG(Ju;>B|4Q>>MCk=ZN(Np2R;60+PEquBt0HMFQ_ zHzC(w)1m!{%D&8IuKX$uotaIi%toy-J5>S6Y~*`Ks1y&g(HZQiUM`ZBKI62~#Qx;{ z{|mvG48kSJ#Udr(C6ji|?G72sg0arh;ZmZI&Z>Es#$XDVX=xj{6?vP(?=Sq)wvOhl z5TXLDQ2rG^h4X4-o{NFqz|XT+$*UpwnkdUI-Mrbx*xuS8*w~93?1S`~2ODE&4GuS( zTL(DW`VJm8_gm;!euxrP$E*h|R&1Wv*RyD#`wj5ey(vVk^rKwk8yWn&g1h80WvjZe zD_Lek-}ZwmS@w5)PhNFhT@DLO&JT{V%iGnA3BNERcJC`MbDs~~JBHFqoAU`-XJrO~%Wq|4yvD@~T{f_}5STG!rb^{ZHrS{735F>dWvMZlfn?J8WVLR!KdQMPTu zC`WCe9fM)7(q@i{NtPVi67-N>I2Bx7U$ZIMl%3Qh^nhLVEK6%;wS)GM)L-Ibd14RA zHgK6_iajLbm8r{-8CzXJXb*{e&t@!FC1*3`fqf+2Ve;m)KCU@jE*0m0uZoUlp9Y5v z{-3N9VyN=;A(KTb?_QOj=>Jt-M@v~}68;Oh>SOOC$aM!x@4u3(Dxwa%_rd6y(Q)rX z-QuH%DJQG3X&tCGSv^KwNaBwJp5uKt;Ok9Jz|JA@C$JG@r`;Jo!=whW0SUeMl<5uR*5?~Dv zu%-at5}-R?3$L$gRpe|7B0zStw>pXCXz^}oQN$vV>0gUEc)9~T=G*i7_Zh2sb^~Tx z^z0U(4OpzM~LJ&|c|Pxv#ugvPgx#?nJ+tRouh z3d?sG6-ws;*2AYY#|Way) zbrnm=CI!W#wfLT}r2*}B+xOVTybmdAA)TyBtb^{pdD4d7nOJR(TfKiVoZfQtAhGwI zg9T(GUCjsR!;HfaeA);~1)jFN+jN?}+jOWcEuG}^j6WGZ9SFH}>Tc8d|I!)drNf0Y zmQHK9tv&-uGKf+%xl%{-?q+}vGGX?9+(4eNF7xaRH^v=KVcG^gg2G%a{$DA~YH^#^ zH+rUcru8==;jCuxFnmE6jLKv>um5A7S4ZnN^7}f^+9b|@A%%~{cvR27JqW&E0^bT> zf70t*3h*ZU#MB(fa86l<$UKirG_Bv~vDuh<$T}wzdM3}CNC9;pP79X8VCnC66c&)) z$yQhFOHj_oo&r%eQ{IYK>8C1g#ngTUDi*1-Be;`#JDOSG$i(*{kbu<*vJZoDI$~x$ zn2iY>GAva#gTrF9AEbgQDrKAVuDW~+{JfVYR;bG(dDUOysxJSU%Gk#w%D!Si)aCMO zUHhfIG{u6{mXKoAk3Eq415jSHVpNQN%^Q1kal@?$V%z$yfZM+Qxe6nDv9u}RRRwp6 zQ^1#2;+pekXDelj1 zJMrT}Si}d281Bq?!wk9HHt-d~bR>F=U^zU9AOo5hm|C`tP36EK(gH2zkr3}Yjz|=d z3j~V(0HhclZmzK+mTi5N_G+GMwti#HmSKMjHf#C>ajDlzzfu9(8q@6^9V-xZb4D(C zl(@oWRj`KH9;}%JDMdx&kMgSrs5yJeS|4NFsYHVDTAx9mz{qmQRK0G>bvsa zep)rw^t0>&Z_}Lr;e|Kzr`EXcwxP!LQ#k`{5T5vM!akOOMfYRN8l=J za}xS0@8d_f=$%*;dt79@~ zzJEUWc{|<8{$-~X_Ad9IqzxCpM3NlRRp9U;N=b9D7m(4+eE$Uy1;Q=+X82%d2G3KA zE#oKjOest$=)bT|WfP`fEkZF8GsQ@e4PT6o73qih^rx%7Ws`aJEdy5$W#Grjul^ZV z20m2=t|?A776X!j%lE2p#nWbbCQw|0-FtS26=ToRuk25L*crbXMChl9rS!9wO@M-p zVY)WaRqDorr9F6?yoX7)$)|I$^C5C4zwe-{iTHT@)3oy2o+sU@@99_>%XFN!_dj4S zyWokej_28AC7aQnsUgBSoyV%+-!Omm>Xz zSk;|oOgX(-jvOd_w)1x@d^q8-mogoHnZ6!XFM--Tz)4kC2 zC;Xz;&VGyBhFd!uW9vZ|dGXT&y0^g_Ye{cQKwYt=9i2rAPQkmrma3AC-5J!rB)Yk3 z&SG?K1`STj!m=|Qu#4h?1Uu2>20zhE)?f5lt@DLvxlIZ7ZD86FC_D~io88~)VmF7; z2E@@xz>w`{qwEYflX!nq{2q(W>e~zvNT_kkya?Iq+quO+5}^(fEL$==P*N&SGySA% zW~zksldklqH8Up-MNN8eMp->LJHsm;{53Os*P5Bm0bG*FI$JZ7HtW{RjDEUiHXo+6 zW_C8AVu_FEbM!2^^L(D3CGBi2?NDN5YiZgGcmdd8Gh~d-h5#&TbScQ8=5Toi^%QSmgYB(*6~4rla98V7t0;J|8;JNy zp6DxGh1chL=LU%cID=MXu_W-O1a51dsVP(xez9Wp7)L!BYwSJ;Oye%ky%Zx+J93Ye z|Blx6$ep2@8(}Rh4skxV;C5J)}MWIT$+xA7HPf_soY42(I zyEc<$rcX({PM?-!s?VbneO^bXSVBUdH|SZC;rX9>R#r0I9`BdGS?sn4$(FDE)=~lE zyzs5OS2nXZzdYUsII)2{c=YP`>x^gN7gfKXPLjjb@6ClN*w6J|{Iq_*RQA(4pl&1u z+R~2hB!!_ybaw{z%|&6&T-fJZj1(r=5mkmWrcjID%d6^Lk?q^p>`0*S8z4Eo7T+g) zcYMFlw#XG3Bog2ZtYa}ZR=-`rdW;H{xgBLrh_Ya;uo#3q_fj+>7{nzQgrnyYrCy#D z*<}q96G(xxO8-=eu700H4?@w;uk)RR6f>#wjdoV&i&fv|>^-eRZp!4J*_)#kHA3?derOY4CLdtwc(Cea zE`l`zk11Gp{5W3H{2L?^z$z7wdRucsz1dM8KZLqsVI%U2Mxq#r95!+`W}rt}0nE*{ z17gwFp}nU%ye*Sorb9`&PKTDKREK9LI{X)*Vo3@eKB{L)C)42t^*Ve4T%yCLc=YOk z+bw_D2Tvjd}_ z+QCJzqO!b@P_d-T^D}x@j(L7g&k|N<6IT+$E7vc8OKjpL9zC15+jtRvQ8sa{DAOO-nc#XxyhU9iYRQFoC=*-+sP#mAz=W8ZWmAdn3e zT>J5&LiAVwul;a&vY=){cNPPQ2@^7k9QYs_wT3+R;y62UkJ;O*73qw{XJ%?wOT_i< z$83bBpWlAusU|jO3}iMZR(+eZ_q6VLAk$N3bFzdwn=|^U&HV$OWOFYQDwYU&epSyB zVP2X-s&-V1qBE?Ic*3wg#_MzIyatH`FvDUx zN^u?i=A@Hq@qdbSaU9Ub7A^5x3e;n{vo_1JSu{G>hse1XF7oG@R^?cXLy!5`LL_{> z+Iw1;Jd(*Y)2k$3r&mie)$2`(Uf(5DtSq3{_w_76@%*8lm61%xchu|nKj0D_f6Aj* zmpp2`2*0ShWB_;N^PJ2B{GIq|!|{n?^;jgY;c%&2bSw3j^D#^^ zgu(>NO7q>yq#BO2-MHzdyxquYBxTshWo1|i`?|Jw>3R+Vcp{TerfX@SPS-|1)%9I) zqB8tBp<>A-)9Hg?ILrAjy!kbyna=fbmU9mbID6lilO?MoFBPVA0Fs5}ya~80Y{!h& zf@Z_?*AQ+=pLyPdZUh-^qjfP(CXNcX8+o*GfC! zR`xCfo-bs;Z1?n@BbX57k{yrSf*@c9Zkjq^>VK_N*^$8Wcf!edddyg0Q@K*#8O%(r zY&C>0!d++3LlSmMt07#QafJgIJ@%^4fj8DNTML&H<4Kc!iR@B$Z3=*+C%kayKd!BS z7Nb!-=99>*X$`vCOR>4`w^d%XjH~N@m)9I3vVx!xT=y%_n?Y7ANNEOnKr^^)T2L@j zMx(j@ex)4Y->+0I9B@cs;vB@pnyymz?pGRR>wZsJ{@Os1zs-!DF}&DnRcGtKnHePb zrCQJR*r=>saO>me>#K^+e9GeTs-tnW3vQY+=$1HzU>BUcTGw*pk}V911*r`nRpD3} zmn{VAkcOLj8}2LwEi)pp#4MG;2aj?LcU8M1X~}(}hZWk6Nw;>E3#b1*+gBrI>&_vq zM0>T+WHJ^MGI87M$MKTNc z=ES&%UIcc*G8b`Yy3$9eUGl2!xDx7g3H1m|PzZ!7&$AlELa1)tK}jS$)!&uU0m5oh z$7-n6hJ}u$Rx>u+nqVAQ(k;OcU^F|#pCih_4^`?gFeagkg)IsPKAJ8emkXbKmD!&7 zZwP+m!lv~I^BKD-|Hn|rK!Q2xB?>=dILLw@f=1X)@^iq)TH=vwJ#3N)9~K*1s1#QeF1oOu!fnV(z}y>kBfya_gf~%=e9_d-k5i=CxZRyWkNpBbQef__^_lIyXqa6bn*^L27DV-xw_;(o)~J<%sM)f48^1TsZCQtd3FYUi&uIzD4%D z$zTOg6o8fR+#SRFz+5?6ie5^%IoBkPPoB5rncFYbqY|@@gP?ilR zDaJW!34cqwY)5nI*Nc^srlP+tzq%r>){9q`K&mDXAtH5?k z3@Jxbl=x~)dQ4sD-7jJ(T1sp!Jyg8~UEr#gGRGu+0yEzB!WowrN^_{HirnIS;f-m# zIHqv-6Ir_`#ywdsQ@9t~f6-()0~E4c1&=+T>ZfzOh!^)2nqWS{nXpDH;NT;+X1LuD z<%w}G%$K8OPEGCiqhF zngT=nmzS`x^^LZ;PHH(c?584y1zw7zQIJL)4tj;mp zC=`z8`AL5L!2SAd46q}Coy5X59MlOJ*~xfx>2H;bAkU6TcYs@#02v8=sP` z@>XX8^(?7pjWz<8&8o)JF{enVOInU(P7~KOGiySciJ6)99ceanLMnU~e#x%hE97NzLWztuciM2C{lfNoR6P z`$lRPW|Gr?BR{nZHERO`PK%9-zqIGB_zV0}q&L?dd=uVj4+ID{BB1(IZhqRGQA%mP zoX{+;NmdGu=3@5T6&LVJk=`85)f`O$hNY?fKwN}ac*XR5I989IkHACE8=9upLsM*$ z0%TR~xMCPl!e^N-pC*KdD@K1LSOQR8%uR~`g4JPSG^N)q>i-!KOMpj-;z(7om{C=H zwEXHZxT=c#q+q59NmmF}#qvE3D_&X^s~eE?SC}WtG7%JE&aZ?mElXo?C7fgOwu?ej zEbLs^@A0&o!5N2-vbtBCX7(^?hPxZ#b(8N#mYVDS-plP3zDANhuR9^MFxax#5M4mpdwWT5ioltq6s1yrQ zRv1(hxDlGsG9rU(pd6D5BP|cdEXeY&)V=(76@G(#y=nR13>5j_3XlB%R?6vFLsv1< zN8bWq@FF>kx8;cgT)49iBS<;=w%UaAK=mLaVV!h1;lne+*#<8+rJ=%6vIu88dDYEv zB^>UmOK-~)0^!K>griuAaQcokA&Mna6}NZTv$OG>BlP95v?zV4JHBX^oWA~Fmb@0j zXj#4n>nq2k`kE^>^QSgo9R$y3Vf;2g!tr#sc;Ruvy=}VN9u&IU84un46gUTYQh|(5 zo}EB;0&E>G8SpN=prc&{8^M4@9v%HaUUdgt>1d7IfQ3Lu@;n_W)=&dBT1I5BKyu8W z`uzB_Gy7HIbuze{P~P035g&{Y1#DmQ(+` zzTAo;jo2RYsz1V2Betfp?HVy5XvE}s*;cF}jhK-#8iN|K9N{vZmf6Ek$l5Ta?B#ih z!bXgJ-m^R(OLaz`|AMFQnw=-blk4MnXMdr&$KwXyg6a4~dq2tCJVa1dWyY4m!SE9B z(W0h!&6WEZ+|x3g%uBGA$eqelIa=RZAO$fovlCB`r{N%MrJ_wFJ!`1z)805?+n%+x z5uRz_(?QYdYzLfb=4vsXu;AD2ryi4bweLIXDjtd+X@0BC*0v{NCgD3@=jJ zr4nNTUykQj`7O(P`lq_8l>ig?iOD&TVLnu+AE!!v1j%F!V_20tk9 zesS6e4=v0hLt(xEmWtIAcu`@VD;@3vJvQTkpfJnx3`Mch!t4zlClbXvr$*Jt4Jy|; zA}QBax3?GO{n3pNRm*#2Tnu?-ysPjLa{kEjA0syMKOc{J?I&WkdH^r3Cm%gV0i0UFkln+7D$h+w^l$t+c~1XS?ydxOD?hK?Nrw%=6^=+g-f6J8wa?9-4kJkK ztZw2@Ef#B~(G<gR$->!2ZJuD6E-)xKqU6_PTZU%Q?DE;I3oL;3L7fJzi+GjX-biC7$C}@yjs^WX}h9Wkh&gHG#_~y=aEpQ zDg*ZK$h9<#IK!tKh?6w~9;Pw45e$as_d)kZZ->>}mw0Rl{^`O_nz2;j3Gg-3`O%GMt>lW zL9@+C6;SO>?Ik`oGJsAiXCTA)B!Ki#thJ$U!dq|`aD5@}1YW|!A?0Q&b;oA?Or>O@ zJ2p?2Up)p_cWkaB#hz<|5khxt%J*tk#ey1}P;ePoU;GON%_-G^c^(TXFQ0fh8&fOwtnax}Wg>Z) ze<84}ufAlryXs5xkva#txXJfof*{{Z@sRI&aLqu@j*xI z>gB>)Q`#9{!87BXtMDisnmgzFe^OV&4b1IH{x|$25s7M!SKnWNsITSc)%Q|GcAj0|0g^h}&3>){h5cNIhy7^kqMR7c z^(oI@FK*4O7gwy_AiOJmZy`5Vo=k_Q)69-c+!EQZrAcFDWA7 z28ceqmr|+%dLMpnQDP69xKUp9T3i*-4W+6BV3kucfGD8yYF)>rT{Fdk)cugM(=!tZ z%Z;Vqgn?PAg?V0;XAY+>%Nt+yaLuw^yJjg`QXECykexeON6o`D1sj3M@3Hx6^kPfQ zK?jVv#biV9T|=`zZtD`<_4iM}>Yo?wE(=nH`I~^v(y)kgGCT(R7D+81-?E#678Bc7 zxHPTS!dUKNRa$GgSQC1BDihh@m(>$TReGsAdW-RGMC)ycZ^f&Xrm9YS0D)8<#8Ew+ z*89INMhY3-jKlF8a}96{k3lodrTFeFY=X^nn$6q}0-L!L51Tn3T9suWuW^N7u_*C; zm!3t06EL`gE1?N<+2QEw_o^jjl@Ont#6DaMs`6#U_Cs(SK8zFJW7On^chmTX{{kqZ zc?3T<8u5qG+$*no2d<1}BN@$+CTt-v8hN#@6H=p5EJ!^HDO%|~jeAIFRx=Ux(ThGK zP>&3khRM3lzA<1a)7iIuMT~}Q!P>(#CL4?VzP={2j6XaxDOP1 zcn}Xg=-V#T{pubTs}BH63g_F%GntyuBR6e8fX}9xm=$iMsR<>4C?Aqny&qSi{H{dV z43%Oe1frDZHIRyhDAj=$ODL8EhwyQ!zG27P(M{5A!JhpPCBYK>0`3Fz|yr$ zQxn*C);096$27aotk0z%Rs?xAzhn5Vfp8Q!{Zpm$Jz(4O^Xg>@H2cPSS{{GEnbd!Q z=wEvAg8L$a`&7B>TeTLxfL4#`{}Do=|Htvr|9-%WmFd`G{3H-QFkr?=aZAEz(}Aj!caCXs@=p6t*WZ)%pTtup%SkhO3ZEnE@g}FI zL6QFRc*x1_LX8;A4XKf65Ylc@^bB|>rs8s0k288UgXW(BnanW%oW3x#c8$Js`HU3sRf7wp)%vV$yIM{r_w1aU<_5>{+lpV`rY^u(0<;bMlovNt{)D0O#3PV_eMi)I zzXjgeJ~;kxeN>oloD?HvSRXmDJTC}ZF%b8u+C+v{EbXhcmL1Cm*9p{_NsdX1W!*f= zb#QPuKd<~r7M{(Fv2SfoGMo7~C~W3cJZwf?;bQd_URlh+UARo}%`UN_J4Dg=3z=jBzg(!6#J%BxW{QsngoKd(8aC3taB zc@+;0!Aogg#}!t<#+S6beh7-Z{s)h|GH6y~e7TwO$H3Ao>p7e%QyzX)Co*LD6M5B- zaFyjPl;vB^l!YM6^1M-mWzJZZL{Q z3LCOPi+UgGs^plKL1PxLZV(UIm_>ceKVw5*v%G!>B!1%Ti6Nj1c2_fT??-`$Qks2R;%*qzrTo8+m`i`a~k##hkh^$4k zj;1AUImc3$@@s$`)9fz#h8MrDc|7lP5YphjruM9;*WtBw5^Q#-_ezzu=!VU20+x*% zITv*InmQl#|M=4yLTd7oEfVXy!knx6HjG^yeMm8PtfX4z zm2lJZToPWbG+W)-g_;suEl@tM4L~|Ap1^5LV~p ztP1&GvAXK;tm6wPgsaYv-&A z`Cqa6jp13HI3la>P)7b2R!0qC_1ihCLJnosO4Yp9AraS6#LXyuz4L_(eqJn0pVu}d z*t!b#R*!-SSt(IygUJ+#y2%k!h8065M_yKKmrjm&7{0x%9*sXY@+M{VGk#v3rn1}+ zyqflXT%UGXt7FE4qK=t_m$lIoc}d%7J&)ASQ+(=-CFE5n;Hu8pE^niSpw5uz_45=f z?dNSzOW?QBM$t&oM!)XY@;Rm@c*8Q2_D8%nT0AraZ`S9v*YY|U6nUM3m*sUSUedhk zd8E85K6(9`yy}v;%Io%dUWFj9^1Qq%R+`uDL48`IXr#!iO>3w9ksOnLMSGaMiid2z zI-M6;yBIBP@UJmjKr7yaLtRE#R$$5i9x zK@_XY;ii((^GK2sMI<%dB2LAXq;`;`v?GhNK!A{xJWo=Jl}L(~M5(se=*~?BC{xAC zdd&UC(|9b;yKF@Ok+D_Qw3r$->n~fYHdp+ssW4vXvaF!^Rbz%O%Z_43(@cEV2ZXvT z^1XJ=xM{R@E&K}`HaeR6Zigl#`{VS+$lkUA-9ul%F&ixdfnHnkU}DsSW^S#tsS3R2 za(X+OV};@*8dI#(XYMM3CF@UU7f?=W*+r4s%qOK#keUOj%3VZ;p|VkNQ!7*gOvVCZ z_qH-Bu@PVj?30Ucz|X9e27i|<`Bp?z`bllYsauXWahe!ej<@2OR!bfxEuU#0OuMWW z!b1t0(>hH0r}@4~z?SFd)mKu|kTN{YY;{FY*y;?ttPFphm(()#Jd$N9K9>0ndDWG0 zWtltWWmpI-Q=Vs;ij|h(Z3fj>M$t%7hTrz}mWo5qBZ)&~5XVe;)m3pNj-4fr z$59CeM66ce*WL*`44ne-8xmLPMveA>fB0Kz^EC;TgcXT+8QgHTBWPZ z?rEz4C2dFRSz*1AZp>HZy=f)1=p(I5(Q{L~-;}tgN?d71uz=ola(FXvbf3Ox_ODad zQdajb3h7wpU9TskEOeEu($mD#UVFOrv{#Ai-Kwl@D%&*h%8;lmwV;uiCbgP*-An*n zj}Dr)M5%-EIipivRZ+LQvQ+rJ^wchM1e8^^uWVo0&KpJQy!5WJjb*58-&`^@V3q5( z%9OWlWjp^A(t<=?$<_}RF{;8bs=_gR8rXb6!QFYXJ?cHa6Wz+RAiQ2e%$ssTX)tCR3uy%Hn=02I)|+8-jDb9gvp# zVBKpT^h;=7Vpp7@_&4CkF|Wc4ck=E{u<1d}IvetOv82C0F)&JiWOiR%e{(v%b*#Oq zT-w9|@^X9Os!g0EF>VWO9F`-BHX$!IU#MKP3C$N;-&j$nmS5(2##U^d<}e*eyg?LP z)w&aFo>l{6T4n2wCH{xxZ0JfJ*U=Wk(T9(Kvs=5B^_FF>vz!*6_GY~GCm2Y1ph%TyE7$e4rSSY*D%An8Ik8P1_C zApdFnwt|l>=g=-APJ1U~Iw#)8`n?V9eDFZijROIp8wcZ|8@GWoSm3i2ze9)*BEn{# zKa|*D#m`b?6;nHL3tKBoW{2=JBc1(DlZV%%skZ({ZxQwbolD(`i*Wf*n;~rVFI>14 zVa%=`CNFmou4Y$HmhyZcBC`T8yDBfX_NQE+vb8_mKbt2llD4%!)&j$|zm17Mo?qQD zE`iqmyf>I0$aF_mTm!C|z5l~9ptxYmfMP^^84&$+(zZ1~tCZD-HNfvsh;R-e1}X8r z2U0YLa18Q1tyrdFNy_^{DfRwXlgI<#)ns}&AY?ie51CG&CV>b|rbiJUL_{(@n%F?5 zmLjW|OfM~p#w6Dj%jie|{wavU{~yImbU)%p^Ohn& ztEUIOw{n5%Cs5hur;L+~r`|g*x+>z2;8!=qCD=j|3Vbr>ogqm1v-M2%$`7;+YYe$>);qdGJ9ee zd)!Uo0srhtVeEC`L55^*7_m0+yKLTYTjeLvm0Y27eXJi1=}t)5ALGN{C$Y% z>K((}K>g2Q4Smc`YS=-+1iV&jasAMOR#cYO~a-#(_JrvXAo&%{GV zHFlw+Z{e}fa0ZdyU}T&>n@}<S8t2H%osKI@ z<4iH?pDH3N0G5Wlm~Xi$NQMI?7b5QQl8eZNZYkvm&8rTVPBKO2tdf;JUrx3Z7t+n9{fYq zh8vCU@Yz30kz2Kh98M(P8w)b|XYica8SQVoQuo@Yvt=}NcO_ffl^v~w^GRIW*d0W! zi+yY1E{Zr6wC?Cjv0$JfCZl}7o zmO)f>@;7QPKA2eTv%FT0;b+yLNURa0G!Sc%T=l+o2ESPQ5}7f%RwZOd?{9Lw2oQ43 z;UU)>p@>hh!jbwnEhv%HzhrdgN#cu#-2HD!=xQN4e=+fn`^${`_H2T2eAc&J!BPWv zn}lM0+!ZzA?nwE$EUvigi@TQ?5dw(2@?+dpzLwnWU>QWsh&@xS&o&OPbqBN+YK5^J zZLAK)=@_JS$m?MK{_9`Ey%Qod$we7^)bq54c>hH|J)3KHRL3f7N;gqab zB4zQ%w`DN7m1b|_U=S~^UbzyVW)snHye-L%??qqj&Rl0^Vunv~Ys%pus=+|Ip^o^i2H`tYSER7v{ zQ)lYvE6rb~Y>vLtq?ZwWZm<)8ccz^D*kEV$mD-+N*X-={x?wXcys{S!b`hj7*v0!& z?e@EoU#!iEQ?W6vot;5A+;re_K24^AwR}<Ho~Hdw^>2(lKwZvf9Vj>Y&c zN+k20BDLlR_iBOWr*o^+0L^6*=kTo=a1WpaHO z8<)uq#1>?tY~Eib6E(ebdzdf_VWE+FX*;Yk#7TW@-fVHy~IMJ19|R+w(hD zwW?FS%eZ~*P(+&fmrf48LgOxT=QnHgI+QtD;^p+H2;?{_uALh_6Z@roZw zE{B{dKQ{%pBezdn7>QQ^=1_9-W8zglkVWFP_gBMaSa=mG5^n^F+mKW%p}kl2{ATgf zA(2KV3GnQ^-+q!CznI)bVkq~n{peOu@Z(IjHvvMn)9~1T!_=;Q>Y^R_$MNHMBLI_9 zI-T7J!KAZYa5KBXxqMf9uEE`eDNH?abq4AEi^RMnl95%J!jIl#RUTI540*Ymab;Cz z#X6l$)E@N^zIABtOl3lzJczdJNFT*)&gu3-KiM0iIb z{`w0Qo81@+{St8auVAX%V$CuFu0L0QX~Z$a-YWc#I)>PssAJHk904@M%5Sdj8k|}) z@>+SXf~;4pY(~_}f4^YupIJ}AZj10AD7g6Ol3}ze&}pQpb2uv!gS7TafwZuFpF<9> z@r&t?lki-Z$Jytkb$| zEkffm9Od@%NPp5hUz8BvAe|(#ZzCs946L zCF~=1Og8a~T3+jQ-pKUh06qgp$D2%fZK+|tRmRTM6x@!AXhGRSiW=#;mrU&@Xd5KJVOzFwU44J9=a z^2?*(n+kT$za_6W|4sy0rC|4w-4luYdkVVS1L;s%aMa%TuPEar)AbJka~^(w71}Ak zT8XnCnfo!WpOK|_6*isjkDVk#F?^R+PVPL7W9#+<$^N z3%I!d25}Z}ao+`T7I1Oj2XPi~aX$oc7I1O@3*s!`;(iR`Ea2jP3gRr_;(iX|EI?dv zkLYR0M|YE^?e0)-jK0-WV&Uq1Yy6U|p4>g6qiEXPO{xfQ90}EDxw}cTzXbR#U}d@< z2RSthhX1Sl!^88!icYr5TP*9%$<%posmFUt5@#-uuksK|dXM9Jmr`pVI&A3GgN+a^6+kaI@|&ygE+U}B>msad z4)Dg2!+mU~GER=?(Nkv*VDxf=>r`Nuq-aBz0ycCNZ5c4Cj2+BB*w_`!Ma3YcZt#N2 z_#8wvy4HhV%%+uO!?7%ymvU`U?PqIn=#P&^kkl4gHmPVjTypG61v5vY$(%O;mTjj5 zf1|QNJAcq+DuCN7&4J2zwXM{IdAv^$g7V0o@$k>G_Rxv+vHMnDQe)bPB9V+hC7F$R zu=`d%h?P)OWCzj}V3ko&bb22a%Iw;&f8quPFyG3o283>Q#%oiu;o$RB@ysGh&TnM- zom)#dFD%Kdi%|N!>K8<8s0b@P(+w)~-D0pVgrk|Qyb;E>Y{hP(w3`r0l-ON!k5E4Q zF%r8Ww6FQqabb{_HI&5fuEgC5b;2N*@6SUPc3EA+HcFRSEW$SilFT|+)aJ$aban`W zh-cHKbxkj_ZkE{&&ZJFHE?Z2v&#AdS%G8KfW*@_kY&&s|7T-f&t_D{tv*XoPw39KJ z6@Zmld9fSAlnYe4F-#LoqLLObO=AZ6P$N-sPWKj4dQ*zW;$HR{DaK|nqvuEg{T|}W zrb3aG>u=8UCKZ~uY_8GaTE84a#Ff=tvP7A6i_dTB`n>9D%V)(?A9_Q!$};t_xk_=h zrDwQIwLKUyC9?vkXOJJ8`mpM{sgF2uZPr2D3;$>0)NQSYxQDFY`~$?LvxlrjKjJ)+ za%Y}^z<`r4irAj;+V3R+Y$n!Z<@#GF(!;6JLgbbNTqmz{D2~{4zNeBqPO=brxj30N zVg=Abr2OXU`-48#IGOf(gN(U`P)A~1jTgQZ$ubY1;cYQvttoVJ8q&$=taGnt)`lJ- zRpvoUnpLYU_4|;SY=RbAp6ud=^L}RkqE;^1zo?Ca4puODt%1tmT|rJgBn??nM{ZTO zD$|i~O(EgjL<~~u^#wxb7_6IWD&=lk)Q-n{FV`1W-Q$&FkXDD; z{Y@0zqrB$ohXMvE7pMk+$~LZORfLTI`$2&znzsR+l)Dswjq)Tmg8bWwb;SDD5{#`G z8W~nT3@n;ujUaBO#I0ea6K}m2@=j!jb0gU2+w*MiSQdaZ;&uq)Ea2k$2XPj#xWLwT z{t4`ECk?xw&8@@rz75Cc+Qg>xsTY`x>H*PJ55QxdO;;(iHl`~`lbLtufAWonz`074 zcX(aIPKt0vxQLwUOokbv()JK;X{!ZZ|F3*CI4Vv;)O%z{m=evzpk} z)^zqL>rlfS-ZwVP9!=~f9cWNRW0O)fm#m1of6FFpemE>i$817AG}*-*bZn5kTm!Cj z>?-NlhcG>v6#yNR7aNn53sjnpN5jPjSKFjjp&*j5eDB|o?eAm?$#Uw>Qu0BBU?E*4?piswepE9I|jLE&ZTp<>=`52_N z_b?E(`MACNK8o=rzgT}LwxqmyE^%P*qJM)$a&|X!cgKzC-*$2v?Si*hdj6mYuJ->r=%2fEPX^ zqkTjp7D-7DVWi>vUi$<4t&*w;tJ!arRG^$y*Ob(i?(ndOHpo{9TDnmD8UsxFq56q8 zi~$G9%k7D)F<`QUe}~yb0x$;1i^*QOKqc9;rk%;>KWMsv~HJy;2qNYPL zC~7)N)m-vk)O0MHXpfqXy=+E{SyEji9@RbAC@|_#-M@?aHAt6jtN^6C@?)*X$ZzFZ zkJ0Idgm&rdk+f`^mgI9BD*ZJ`vg2*>=Wvr`<~aKF7^D4fG>!TzbBwm&o{+6QNNq?K zo+Gw(en>qHx0^z?XEaZfbS6J8ypP;bN6FyO45!`)bCi$4OMOn!P-FNE4@1p9Ktnx=LAdA; zNYNf@*^u4%#q>eMa27);^{v{^sqV;O#Krd*?1p{WyC%h44{5a5;C^s4nXFDFDY7~Z z4_Wn4WnxV+eI~riweZB>A8KSZ9DpBLrYZ`n z;VgN%;kdFIt`iTn<&JHVL}4|^Yp#AQ=t`6eR0o2}EYm3zjAhyY9YtHJ4<%k}6m^

    QGAS={ZtBZ$o;&UL44<^vSI1=<4fzg>JKlT0807ma-ph zOPNv>D!u@d*WEh(1chCcX}2jfmaH5^j;gfF^In*zfR&rzIc1g^3-XKH=?P13ex?l#8uBb-fK6Tg^_h}ofz1nvD~K0Io*J=@%KEX~)h zK?iBr)14tcvu~lDACNltWhORUtiM08DfX^ZBwmDuQKnDlk{o^dD<1mfUir@F!8?G& zY{J(F>qf2)rJ1u}8(SX%`~T4>lw`b+-lQ}Lg~Pp2qBj@H%bkZSy}4d`<2F?ZfZoV! zu0B4{8|4C3D^L|yaBYjKAu}v2$Q8YpM3DGeKU!Z$=?*ue}3i{aMFP*MRQ5Blyx}UG&85+Slexvcp6@h zHeQb;5xgFS2d@t!9=rNdp7bHA(fDj#Gj}Ym-&?Dfuk~;*)vx1692O!Bs&Vpim*C2v zxdK342~aLjX-h!7x`xcKP~A@ehF8Nykl=`;tzl|Mz@?MI`l|fc z8Am7Iu~y%!08!t`c#(Yn&XeSOH9q(Dn>z*9@4M~_3lSB*R$gurt|~k=s;~f5SYE8c z%C(jX8#2SvvceH0sPJ0ktKwtz?U1m&PgdXS08!r?@Tjj&FQudNST_ju&6$@?>3nocBvjV^ZdCk>N1f7U-foce- zyqif(=hPASTYSK^veg86%{6((jd*yA@Ym`Yn=%JMSU@UAny3E0A)5N)rg|fa1YkUmIi* zB(rz(>|%{Zj_f)jU7WU&uARyOYo}7LYU`$Qq80i3ROVD>bM>nX&&4yi;!@#V!Wb6J z;OZeZi)IuUgIdm_MUZg65w-#9VC!gEBs+^=%lCuc~L;~;%|~+1e6;#-ruF7?Cp=R6mp$F8gI8i z(kv;78#Sc5n=?ilz0Sj5|7V6>6;|7`(koc9b$6rkk}gdl_uADfRO8xc*ylBBj`~c zyqzT1QjguP<%NS5j}gtTG)`J@d(PuZLzh)v-;X?HelzD~8f1QQ$-F@S7MFWr6!T4V z1s732S91wFO-CVg4iDGITUZ&nOkLT-{$efi5y_Iz0{OW|a3!DVl8-Y21(1B?$K<1Y z1^L97Y}gD-OD0E;(VKM?yxXe3|hh&+ZGta+33?01oD;K^Bs+i#1 zxkKq_P>;A6STd_(x%3^^+a+uwzujc7nrSQLi}G_%<7zAA42i(4EC`^vAo(#7C|_Zd zJy*N);BE;zLAP?Ke+uVU1S|B3mMrKK_27hOdoYa-E5GF)%m@+)FPLK)OF8%Q(|5R9 z_K61(cWiOnQRQOt-7um1i>H`;Ujl@Dm*FAb>7u`OKpkK%QztGIvmQ)#h-s<9Cf7|Q zs_ZLzRtqVM`UR&5^%sIr4Mj;@MlK{*^1-2Gq|ecmqB<|pq{i`v{M^g9Y8oGFQ;RB+%)Vx>sM3a(*X>EwDo{6Q9n@(QT@Q6K z@sio!r>?-lZg4NwUz#=;cB^wsZHOSh?JxCyJb_=VzZBa-nFsG`leyvDYWb$QZ<+g! zxo_ioyHan>s|D$qLt9CFA(I7NP7Av1D=fQ36yfNb*--C;s{n`ZlMN~VP^`&bHC}rz zO6Z;Vz2~m|x+m&cEV#jR^#f3$s~_RXCY%AGC7lO6&3s}q(}}Y3Ym5}kf~9nzEGm9 zb5%lKtWIW?iM^<`L-Pu;8&$|4&QM!&CpuT3&n%CSxL8;1&w2LtldkKwW|_6c-{29$ zF>Ak(m-`S`X6;P1L$@#?0A{Vc*lo?q1uEUvOd~Z?Xv|WRboNx)?iSTtQcLYJTeG_{ zlVv|w&tz6a`Xd#t^+(|~y-P$e-6cJ0F6p8?hoM3}M+)drwXBkV8zj0j8tV3o&uCbk z==Q%=c2_C7{o7S3S(3@D0P6PT$IfV2ty&k(Xmm2EtkiT+ujVeg?!<(Ul_E4skbI@B zAYP{x)-tTi{8UCn7iQL+c3F?FG1c4BwOMKsIokD1Oj|9cs?;3Gmz=Fm{y0lKlYwcw{ zjCZp#e}M6B*tBC$hR)>I^4L=Z35Lyt?y}O~NBm|Zn^Kfh-l;m zM`E1E?_>hqNZfLq{fW3T`leW)t0ofmxw`vWcTG&SzUx1L5cv;yjI&F@%Qfaa`1BCv z99!dRb)E_xhbD%tqo^plFRYcjFRZXq!)e2P)d%$fS7~h~MZZ$!m*7^lF2xKyO9LK? zDYSgx&Rfns!gV<-S5b_~|HG@Tsj1D(1WhvgBahyl>I`h}R`Jyb8kSWBeYfr>`MLk% z>brG!sO31DRRFC+$&U@o$`^dMPRw%C#D>kVw7mKtf`szhfPBfswuy>ef~&^bC1T%6 z5-l;lS0=OrYKHOsXF%}184teSMDg^Izw#7y>t?drQb7Tf%qAM7-5Z#j#P#-oFLk4$ z+}tE?z?KP<*;Y!vd%#9b+!Rk0h#)3zS}S|*7alZmGfPa=gl94<024RzVmwqXQ0cvF zWf#)fr-}`g;b?K5HUbnl7|dI}@K&NrBf8DErBrmtvtYch>X%MvCFEA)U5Toq_akmd zE%y$m*Jbao=+2hn>fY4MHgwb8034XByZADv094AIWSx1-y-Ud#fl# zgdKP+a|5=hb^V>b|5Vh~HN6i5io3UsqV7$=QmbY%TM3d_&n6Qy8dB6SR1ev!9p&fB zab>UGDVe&SO#s=e@?%4a@`22b{l(tq44t8A`8F3p3UZCVGwYkeRs3T8kx2QCj9>PS zFiBPcCGY)fkQT(NQss4Y!5-C2rg>$umBy}YC@EcIJZtNh;iq5UP2>G4K@ zBb2IFBvq`4jf5j+MU+|{+3KkHA*iZ<29tpHPJSidy!RJA0=Zt`=rxDw-C5~G__ z6+mK?-&}o4aQ%exAx0l$Bep%e)!F{SbYiQX4LVobYs3ZAt77HOgzclQBd+Gz?})0} z7+nBsXu*uI%PEWsD;?< zf*pjy;?mz^Ea=U%cQ=|-|E8p|UAM&9o3yu!uF}~vMXB!kFvVsDCCYq1nQ1tRXfEj| z#qMPrtSv>z)@VDh+e%3}YARCuviofQC!U0!T-QLbVZA{?P~{+(ZzA zwDOJtqVXh{3mH!M66E|Dzm_&y8G2XCFQ)rqO3M4QL!$4?E+qdwrki~Mp_~2i&`k}; zY42cE7#VF#oLlB?kASw*(>-w2KNdWa!g2V~`lApbh3)0#w!xJY?v)grp(FrOkk?%O zRIoUsT%h_3sNyTUhRm?ET;Yu%fuR(P^Re|u75|$tK>JOJXU(<_agOY-aL}&L&-5pb zHCv@9T_6Y(QfD?jE`qrBYCxH6~i7pqSL zK{6`<=9IkV>V*NTl?znERF8HH2^A}KdM53uztwvUJ)X)a^Vx>ZUzvOBca;kKSIdI_c~fy1>$oDgS&@)V~It#`0If zyfa^bSEor3_FO0?tB6}aV3P*Qa3NuT3d-bPM97BlEP-eUSIHW}bMkX}Tn*u~#Ufs- z!6|@-aQV&E&jtFRd<@|i3(CEQ{zwA#RpcOi3E|sBKU-lA77|Aj6E7moJvd^o7(Q?h zW`XGzMS91Q=4xe&y|Ws5Mi%d^qev6>a4`sHFoE&H|%mLV-^IA6yd zh5MP#RoL_zI=6Y^6y8(km|XS;#6ErNy0ZuJ;P$oFdf`V2a|aRYX<((6O5xu`i^v~L zD2TXO5kq1Twu$@RFWuGw14bfM&pSCO}9~%-hIsN>W;{ z9Sv?``59(O3Q25+g!f}3XND4|NmiDj-`Cb%m0ac@K}mI*G;`UXZjoK{P?mqX@|Q}m zt>OrH-PV#$om;K7l(&-7Y`6_&R3$d{7VJu=cGqBf!wEQ5t-Xrf^xCZQ`Bu|o1GT%# zRVq_9h=(*B6F;bi(qwkmjNoB}pkN3XiPsZXeUnXmZ#udy6OEsM$ld;+`({{^4_36?4BE_L0H9;7GAE(hRvXW~!%V(nkj z|IN7Gzz!+(3$6UI)-m+WjKd%KH$4R7yY_PR&5T$4W%2l4DYnPYL6_+7`(`ExJ~0m8 zto;Vw6^ekSzL_fpAIrOah__oR^MXC6GIz-DlDW!Kcgb)nhg^|A$>L8-)prC{%9~4> z)}~Y5tsO{N)0;UrJKw@B1d~ZyxEtc{mW@8GRbnqPK4pEH;M@)I^O3ttQ}n(g9(RrX z^sM;a2{*!dSCeH$Vx`ivjam=A-TYGDMCy6uk2DZ;-2 zr%|uh^duH>BN6$jIJ%rdCAiBea*Fb9!qMeMHw#{C;M%q;A5!*0YA%#g!dq~*=5h-0 z!9_J!zs^8ar|qU|De7lel-^+r7*v$HR1r+qISsE~DyyN_itij0-`|RN7~;jxb)1hE z5AU2vrh{%psqGVH%ESd< zReG(vG-QK56UsWgOGDaMbeD!nxV%pNKuu;TQY)t)mtN%M5MHLRL?7O%#lO!B_%%ZxG?V`4-@|__nG00~c=kD;a`0I%RGyIUhWk?>5i^kbvG_dCM^B zy{nzc!(6?;SpnZilx|;l(s_LKo%$QG-;Rm1U74;%?zp06ne0q_P=^skOvzH1;Vpb= zCVqcS4p^a&Y9dH|gZpcqH9Zo1UH8{CQJ=NlUsIlV1zMkrwKzqSXspcLEtQ7gCNURt51{Yb?*JM#=0YxXg`SB(`qLWP>+_Z>&|6 zW(6(t{v#u3Gx8^0Og^tnwT3r#^NkVVP-_-o>q$vZ^}-NVapBE3In~w81+!~NZF|uo z*Q76^Jx53iog^MkR;smUe8>s@+oYul0;E^HT=QdH(5wg8y!iiyqHIL zl)~ai*j`7GD%4lC7j>eGoD%uB(y9xZ^cXFyL8BVuaFpO)>;-pcmD(L+GH6GR z1s>w&9obswP_&Nm&#v50*BL|sh+O6WD1bXZG^pt8P~meW>Bc! z0S$$A_Kedw; zxc8kCCwh3N_&JNXke~ac>dPTJkY`=bg}g(U1?_#5 z_Xcfz#Fe}Ur2M@!FS^{?{G)|2;9&?1q$pyWOCE{DBcO@L=rlR(iuG$F;TkIHjtGTy zh|y(ZPVCw8268AKhv!p>Q_re?rHKP!(2KMI)YAYerhX^mnmXWQc7YLGLrkw^vbp4G zQM(T#B`bk5#1!oC zxX6Ms8J@dbKhw!Ola9o!grY$%s;J~%IPVdZ<(le3s3;x>e-Dl=piC(nOwj$vwtt%F z!npY?L14kS`I7bLg0E}b{3l#p+qhYkScRSVax8x^ZfbWpL(u{}MjI*p|$((D6XAxUBR0*<*_3z}F%{Z|Uc&V~50;`-lT}8!hIFOuw z*-$xGY1~*W24Q(G34zTei={TJFd@B1>7??n7)Y*79wf6uVT{G-Bxst{a4fPVfX`k z;zg*EJ+YWnd8r8D7ZjFA3BRPU`p<;oH7^ePQ~P3Q>I$O8?!r&2!}ebJ5?`qNX3OJ z^QP*$PP;QgQqU74HPjQ89M=~fdyp_WE?>a`Jy-Jwb@W7^&IV9U15R)*2O+2|W9ZE1cb ziBT(+hFWc}$U@STiNSF69q4za9BU6d5K-b)=_{Z*;SOd00!Qq! zx^E!MSxas50;Rpj^ajCoeQwSoW#@xef;01-)iag#%`TU~!)u@Z6^I^f8_mo2=K^0?wff)@eju1ZI1SFd!+*Ykl=ITaLv)qRRs0!n<+U3 z`~H8>5aPw&-A=ENeKTc({S=2eo7{Uq@ZKr&jS1v=NOAa&7W_E{{}J;GcH+w}UA>M= zu{~~p*sTm~i6iW5uBf3LSjvBxSZDN-N4Sde2r1j(TI87*=HcFGX2Q$4OZpPLdLLK#br zHs#%SNApq< zhC<(M6oq}aiVgd2l25m|d}v3n@dbt65%0STY_d_GFFpRq_@{XK z%rYW45}?tkrZ=opGdO+)eyhZ7vtD6aLiPHRgVX z>kaP#cb?GBm3Wn9tj5Me|BedXo);A(fslj4rs9U=g`L*zAAuMRFfP%cni2den) z5JP5I*d1~`z;Jg+1mSbk01EfKw@XaCF|4;rPkA>A>h}D;Nc}#wdT#@WdT)yt)_a3Z zRM(`rDRWzy+uGa`T<>(%dvq^X?^{6})ms>;_jdAf{cu(9`BA+Epx*MDt3M0stz6Xm zHc-XuZO9A@^}ZcoSnmi@=G~#11$$y*^;YRAZ5{vp>np?SLzuJtdwUZ_={T%-{2?v-~#oe>pbTM7Cg?5R59vlnd&f^5Adxz4k$G8`*| zxvl|%`u(<~(l*!C!cN!;aA+rdhD_FFCn(|ntDSIc%HNZ3PA0QEgUs)eWC(j-Gsj`Q zm?z#=X3jvtpQAk&ZcK+^K^pAqMxfbkdZ_NZD&g}a3~>P8jYw|bQ>qw>?rpE@^bs(O1T$Ex&LNl2!L|Si*U|2A`48Z+b#-&V#amddXe*N~tYhh}!T}=&;hr8KVgE5}ZrBDyY|8tapsxSegfaJD z#*+g9!IOjW;K>8VlcTqQCqv~NjFZkr&rGcId}I`Rgawa^A}re>EuQ(_WD%OfT09@l zv&Zq}5`Sf(TUmu4b;TkQ&JU57I|x^tUl?`80>F8B&DEO)U9ob(`FBAT?@kPvVWB(e z%GG#bR~$jgyo~@vWAA(a4tc5KQ{Kh~rY~-r_!yr3+jw~hAb5Eg9=!ak@p8K@VPhYh zbk>4fN5Q@p+%}5XCJNHswDLGcS>jJAaOBz|j;JU&a=5(Qp}6A6(-B7mfFtsntIGn8 zD3^4x1xE~-VSyue#W@l|%DlT>mBT%ow?7o}Le+;6~=sXrbVyeo6smIF89fK>TJ{KvC05DZv zb9Jxa7>aU%Y8Su071pQ2(!u zFUJ9bFURA-m&1)O|DtZ$&#bOrm}?QAtHwt(P~!?t$*9Kdbo561J(JqlC`{D&1bMl? z;Ht*YM>Q6J8p~_0J|w8Ia)GKnsNyv?WQK(rZwN4~aRe#zx&R3K;4yy>>#NdJUROcY z2e(N)0+HWXeNO~LeTU&uUpFo>Fd}TG09$2SE<>gMo zRV5cil@x$V%4@E!4l1c!pxPHy@k$yp!y>WLkitqv5X1_AYJ_sV=x<>?MF4Vj3A(aB zW#3_~h}Csq;+|HC#DA@>J|OCP4qjpJ;yrYVXR!ISJ2Pr*OFWy(`XDIDXGp`Xh`0@! z!%b(;5$IyJ-q-6~TcV`v7~VfJUU)!Dn5 zWcAutZ;3@I7?wnCP#_)v9@|Q(9_sSh5-Z`1__~hM9E6qDbJUmI~!Lg8D5ZLy^Fy3s5VhL z$soVE`p-dkp?sWV*hyHq*+fKfhJlq7O?m05?kp;?PMS^3V#OaI|D$z~uS-(aLw@)F zH}daWJIntd%^$9VW?fLQ9-6iP_y2d62dXd0dv_pt-61_8(V9D{&GpXY>$0|d6{M8b zdoz?$pF#4GUcI)%J58%h`=>~rrgjB6sbRRb;MLK02F>D(|8uh#h3wsVN2#L2)7d){ zJR7d3O}ggQvvZ+w2#ITK%oAwer91L(3^rZn$bZoUK?DhIS}eYg{w(^i96#Y|q-Ws# zx|&2dUm*MbJz)Q{evY0;^QM(Vpy(I!lxbuQAb$}dS}_RVq#pdG41ad_i9WelJctPi zpIpq!%Uyu0PcFWw_IHux7l2PL%8PaE$^|ML#P00M()Y?bQioSUsnEhKvX!q{cA;eg~T_Wws+x z$=n!-wgX-1>^4Go5}u2<7`wdJe1B|%t^A!g+_-y!SH{{*O;_}HyrrnuoHvUm zQ;dWNQ*SUOvr6M1jydSAIw}54l}2AlTwmzEOn&ZCTz#SYWoh#nt<^9D&}XXT$JAN* z3Sa1Ur9>8md(Mo|DX_~)Ch8Wc7FpHF#(~;sG-%KXmKdl@1gd`_s#6~^=BG$)?D@aZ zv+1LhC9YQDCie_eYCLu;V!h8bJgR-$NByE(*)*iDhbKenn*Rt-3gwB)rV}b5{bxvZ zr1%@7;+&Z?Zqy!E+qk(gKvY(85oW&@bx_mro8VWJVnan$mQ3TUBQi z&9j%w?822mtl8xw#% zpGTpER%-o+K!xY?FTM#sNiNm5S$8~P338^pW!XoNWw>Pn9YFH^pIVX~%5~5BwMtQ~BD0ea` zD3s8*L^I<1|F=Ov?IeyftYGbWcv4%{Zslxh8PBLXjTo?H$=P=HB@X$WfrPHT+%`(Y z$EJ0XRkI$lY9Pxj!S-4ZvcAOn)ynq83#&0mJGZbp=xRhpg@)n`9)|MC$>vyM{KQEmqQQ!yF#0`LOAbar>d z<4lSEto5g}d-I&#P0lV7oHHe&$bm!_Oo() z521^h5_vEP;kz_0?@H^`7vwBm{DrRf2k>p(Qou= z*m8o34^$GI=LRa%f!IK0&(T1|kRD--8paG8sD!4nY;E0rjKnyCP@y_ATNU9Ir{e?F z+GSj?jv=1SD!3&A;OrHY_&;Jw*b8b^dB<}1hB^qQ*vG6K+spIUk+8saj!M5Gw$GuD zNoEDWNXf~My`vi2%iaB)ZGsOHRJNH>)wZ&2jk9bjXi0lY?3cjn{I%p?2ay6*wymrv zvV0;gh`WWF{G^)LWLLY6?YwBROJBHhHEEZ>9&Cl0v`c!+R1@{moPGvS)s7Dx;KwGr ztS0Sjvdeo$_F8*}6W&Ys#wbkkp2kF|KY&o7GNXWyKwedc$_`z;V;Hm>_7Oj`s)!f% zCRLS{?JFxi4eFJZh1_O9Xy0(*+1~v$D^uA%mI8B1sAA%dx7*Q(JDIr*BQt-MrIK41 z07O=P9~ia{R+~P2zYZ>TSw9zVW4!w#Tuf#~P;<%UP#80VJ63j#6J;tNnZZ?YSg63R zE3WKVS+ySBi04!{U3J!OM1;^3tlcQ`cPtCpmIbrY@@T+{lNNHLc0CH9YtexFgFuPuG>}?nF(N+SQ5S`mJ&>S$dPa+>N-JEPYk|_YsCf z047W2#V$@%E>P*>#J16#p5ZbiEoMR^Kw%~ngI*P8{`1^yIFF~&WAmS`ULCDoEHy>- zn#RNL)=N34*K~QgTX0pc*P?m}K)vL}>ZM%2t(W04BrWO{0oGS9l^(0t(8RaALsVJ4 zM)5H%ETSen-Zv0`;#PippeM{0to4`7yvEdC{&gH~zsF7I-w4CZ5Q8bdT+!J#&3((< zF+}^rPz4w5cZq@<5%h=3=@vz9OtAiFvv9_e)t&Qwus?h6U)u+L`kD@4#Pz(Dav@lN z*-Z}U!y;t8Ub1ztGeK3jQq#UTQlLO3_(!!52=(Zv!j! z-%*McINEN!5)75jO5Fs;q*yCeA)LYuV+JNIMyqj zZZ7$NN4s0SXH_~c7_S;1;<@B}cvA3X;PPLU^BPW-4Exs!xJ5{t^5aSOO?|AKjs+O@ zZ-@mKm|Z4-414*_)!zn-kj8^j?=4|1OIDWUR|98N_sHGR*@Q;0Bw8_t-%tEjqNHu; z%nJ1%j(F;?P@1f=`Tsf|8D9XZ?pKqzQMqd}SCOa+K1zsOC$$bKYE^IDQk+AX$?PAI z;`x@c1vT2!Y}C{`YT6X2X|pbBWa+M(8dhNbAT^)DuQ+cGg$KO~%sU0X_>)+EYZwT# zoSwzf##)opgsfV**F(8%+P7`Twy~ExS(Qd{W!wBGBrNDaTRxH}9Z>I*%nDG&%8vZl z%bn>!TYI@nuCFELKP6wHr0ak^;HP6D2g`_C7aL^?uA7bTQSCn_)aj%Qmzz{zVQSRM zc2lD<1w0)E^v{s92m4;DDmqqpdlGPMMW&(SQ$>Cam67?i+YI-ZH)d0AbQ_fc!j+;S#W&M?>N$=v;QWO zpI6tXb+u&nP7+4F-hh^o*7=-9%5?Tia(42+QvR=Tv>odk{Ae6g(X7mVOJp*4HxF8w zeM^d|&lB*$3+3W_7kII8Ou0byUt%j(YUZ>+ll3-*aEnHvjVDo~&;VjZvy0`ssBCtz zysfeqSTzOEE*AN*Mq!0>mQIa=(Nk4q7t1>8s9t{Eb<{%OAF89->-G&ELuQ=f*w6Qr z9WKU4kTUNF0KGx3v%mV2PTT;W^qsnxPKe=r48uNgj5GEaVb|VpdBaR2} ze3{tlU}Rz&D?<}oi7`bVmY17@D^v6xaq>pXF94>fyci>u3shpH?SW`pnz^wPd+WU2 zam)M_-qtbi}&01z5uGHd6U7Wk6+^8`!*y#R~SY#T?%T5f!Cf5Rw zHt?uoBA@7ZWug=437?~Z5(1IhTQ9|J;XN{drDX0<{lO*+1IEA2!%(N1=-_ZGBMCVbdwNcT#xL&74 z>5omd%#dlVGB~4HBEN_qA4U1rRZevFq|DA~i(x504XS#XrY>ll;qnmJA66cq>ZR{P z{EKimYah>(fl<;ioYz1 zw-?zSd(+Bx;*_jx{+;oozEVYE^S>Z3w+L4@Klfw>hv)=g442nj-6h!1u3Vtn1ypU_ zdq0;LH0KSOVPW9P0u1|+2vX|h0H_}c_Fmunc-R(1K+4Oz1o{TUo%Ai67;jz#1aJO{ z2XBriKg$6RTSZ?c&J7)lcy82C!QC#3Ebgy0QWWxue_0 zar;D+Rm13K6J^oy-58`KoOg?j;~mB4VmXNovH7wJ+b_SF$>L2w$l`50WO1+w;1>u@ zX5S&oCYjRNW+J?OP&ofqbrUdZCVs?oA%W*Bu1UNJFM3#AR|2B0@8MC`9@Le7 zhf5V$)>uyZ{QCfs*>`cRYwq0mEJ?6xk2kIi-+@K#lW+=2)E#qFMzOZnEkAF9JGJ5-9E&$Qn@r(w8_ zM|4xmsCsCk#UOlr2uN>zOGAHZk?Ldr$&Vd?GW+@OY}@My-Of)XG!l=kCIO_p*Mvc1 zcXi@1;G3JCdV&|6J1y~Zq8uGW4#ka(M6gJ>JL z`zn$Q71(h)9&ez$u8tK#7w{WY{Y!~Ol1PXKa zv*|*qED>X#ajoUf>j+X>=m_KEmA1O-9`l&Y#rjx3*dfs#_!cJfPXQtG&+(A?4Uo>{ z1rPO_rFTK=3>&m++NmaU%t_iH{bU4GlPef^%IE7jNG7%9Nb8P>-;f%nXcMPQIop*G zzA%Xz6y^(gxiz>_m`|iIf3Xq;Kw;#?rmd6r-?NY3Zuao)Z-*Z|mS3Qk%p>P~sWywkHzaZG#8z_OQyfM^X434N-mvf_^2Ay2Ot7 zQJ1Kkbct0;oZF5Eb%~#ny1HgN}*w(2Xsve&0}aD)V1F>ZiF6#tn5Y$?SiKYiLVM=gb8dI&D|> zB|4qWBWg>S&Ni9Ul`fsVm~c8f64x7~w`Conl<

    P^vhD|DC+tx407i8ZqT#3gXj? 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

    dB2);wWCVi#5f|o9mtA*pZzve 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

      (4BrHjTN=mNO*?F9rJk312?9qQY(@Bg>jPYU=4z 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

      *yMX)O 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

      ybv9T--_*&UmzDw z)G~8PFqEqn;M00Hw;ZY>5-WLjq@{q)~9R8A5xZIrqpF{J!>q~aJIOQPy+WJDW zvQosA7w&bORVmW!9h#sd!n&SIKm0fjH_y4-+hIPgs}*RKc=rvBl9t0lx4q$Y!b-Pv z*&lwRMIPYPa~jQUNq;<5Ea&wPkT5r_?AO#HTUh8Pj%2A@vZPKR zh092bGS8;OT-e=h!M%xa(%+$*%XUjkYE_uEfF{&pHl6U?(#$yZOPscCoEQ#+;V*xW zUqDSyArBj_oh*f%=DYCM*vKVK4pCUmf0earD`QC#__CnK5B6Hg-U%1{SviCKwp@wL zI&Rd?@blj0tHRtc53I|{$WP>z%>W6*^Z?|IJpal#?e;@%ZD!mbj~~Zp8wI1|gag`% z2EZSevbH3cI=aBSUGT5cJvLz#>TRpyB8%R*ITCtE> zzC$Xp=+svi2ullrXb-Vej&MspYnbWwTaE5gx5Sw!C&-RqZDLihup;ql>~q5uv(Rmy zvG&h!nCmb7M(9{kJ+p$Iz-tAQXti#3L}~Sfm2Pj&IY}oZ%Z+CipDl2FrrSzCmbz{C z=o=mQQpbW4Z-*ILb{-?{up}#wG$8XjW&a$lOJKi{^vQ|^8rHOZ8R-fubuDm-4^~<~ zE*YSqYwFz&=yj}w=V|4tJR{Z{ZEdk`p^JlLy_IpE6dMZrXtzuq!n$jt7t8(cyM1Ay zILs9W9v=ore$k&(EuKA;#tNu#zA~(CcP_80{~@i+Bx^k7=H*Gxq1r;+SANLMR2zRC zGp$XjG<{MV@B~udF%o#t%fkQHqu16m^IMS=cDY8_XW#J>ZPgoJ7}?ewgEEEh$gyzX zg4Q`qG;Fh@;-FLc)N!L6^oMuARx#Gtybg1pYnQP5WtBi4I;@F%Sts@*w2XJTrpijo z7CHj8QqwPc&o6(Vl`_Jh8ncWpd5&zu$bCmPxZtyegO}B>Nlx<)tar;_!?R`kLfBWA zVr*olHCWN{UbP2Wj9gnK>i4zZ5O!UT7TD(hMnEIVW#`cBL*fn!cGoMJ*t0? zhU5BsMDf!w`_1rzC}%-4xum~e*ZTH?-hM;xzoBo3!;4`)d^!xO15mjLqLdZ;W72eS zXrGRBXSMvdl-(7RxaS>0qsI%4tjWh_nATkFd__=^VUf|F~+3I*J6ZTjo*W)#rd-mqq2m z_2$d=IX4~#kLuz!^|tqr>eduY2E;Mi)Fwmhj+A_JRdZ+76&D8%d#9QQ!4IAy*fpCH zyVI{KrLNNaciEbYTRN`Y!i)Zm%~y3iifmCfh1?Veb8K2yFChcSKZVP!Ed8`Rzm{4r zTcQMcsn7tcuBJniG)UV@yd?1?UvQl>3KJ88qBtw zT~R5&@-u94*uvs?l+W?k#(k2U+R$@JBYwHzqU)^&gH~OahfQA%^8)ce5Lyr!DZ)}B>R-lSV6@bo~yXsO8AAt&~~SzG?i^N|CVM3>7VQw)A_aS zBTb+yU63^7xVQBum|5gD2iL01zB`gyXY?Pw)KmJ8Tpc31v$ADo!=O57J7uVu4rb$4 z9wR&y*Phv)g#5GXV6mMkcV0GUy((K@xoj&QNn!_OR*~h0WMn%l6w0CUTnvJhO>Pdd z;w?Q#26JFb-8Y$4!`i6pa;?qL$OGo}D_iD3erbxO#BxOQvU)nBPcB0V-(D{tuk

      tVUCC7TKK<5+EM=D_J2;+rd) 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
        L7Fy-2JL`r@rh-Fz%(?$0Xj`anpvb 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�aG^nu?zoi>`=7FZic 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

        eU<2;ZafW$|_E`T%*w!I!P1 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 OVyY3zW!TIJgZ&3vzgW}& diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs deleted file mode 100644 index 7a6131e249e..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs +++ /dev/null @@ -1,431 +0,0 @@ -using System; -using System.Collections.Generic; -using RestSharp; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Org.OpenAPITools.Api -{ - ///

        - /// Represents a collection of functions to interact with the API endpoints - /// - public interface IPetApi - { - /// - /// Add a new pet to the store - /// - /// Pet object that needs to be added to the store - /// - void AddPet (Pet body); - /// - /// Deletes a pet - /// - /// Pet id to delete - /// - /// - void DeletePet (long? petId, string apiKey); - /// - /// Finds Pets by status Multiple status values can be provided with comma separated strings - /// - /// Status values that need to be considered for filter - /// List<Pet> - List FindPetsByStatus (List status); - /// - /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - /// - /// Tags to filter by - /// List<Pet> - [Obsolete] - List FindPetsByTags (List tags); - /// - /// Find pet by ID Returns a single pet - /// - /// ID of pet to return - /// Pet - Pet GetPetById (long? petId); - /// - /// Update an existing pet - /// - /// Pet object that needs to be added to the store - /// - void UpdatePet (Pet body); - /// - /// Updates a pet in the store with form data - /// - /// ID of pet that needs to be updated - /// Updated name of the pet - /// Updated status of the pet - /// - void UpdatePetWithForm (long? petId, string name, string status); - /// - /// uploads an image - /// - /// ID of pet to update - /// Additional data to pass to server - /// file to upload - /// ApiResponse - ApiResponse UploadFile (long? petId, string additionalMetadata, System.IO.Stream file); - } - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class PetApi : IPetApi - { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// - public PetApi(ApiClient apiClient = null) - { - if (apiClient == null) // use the default one in Configuration - this.ApiClient = Configuration.DefaultApiClient; - else - this.ApiClient = apiClient; - } - - /// - /// Initializes a new instance of the class. - /// - /// - public PetApi(String basePath) - { - this.ApiClient = new ApiClient(basePath); - } - - /// - /// Sets the base path of the API client. - /// - /// The base path - /// The base path - public void SetBasePath(String basePath) - { - this.ApiClient.BasePath = basePath; - } - - /// - /// Gets the base path of the API client. - /// - /// The base path - /// The base path - public String GetBasePath(String basePath) - { - return this.ApiClient.BasePath; - } - - /// - /// Gets or sets the API client. - /// - /// An instance of the ApiClient - public ApiClient ApiClient {get; set;} - - /// - /// Add a new pet to the store - /// - /// Pet object that needs to be added to the store - /// - public void AddPet (Pet body) - { - - // verify the required parameter 'body' is set - if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling AddPet"); - - - var path = "/pet"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(body); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Deletes a pet - /// - /// Pet id to delete - /// - /// - public void DeletePet (long? petId, string apiKey) - { - - // verify the required parameter 'petId' is set - if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Finds Pets by status Multiple status values can be provided with comma separated strings - /// - /// Status values that need to be considered for filter - /// List<Pet> - public List FindPetsByStatus (List status) - { - - // verify the required parameter 'status' is set - if (status == null) throw new ApiException(400, "Missing required parameter 'status' when calling FindPetsByStatus"); - - - var path = "/pet/findByStatus"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.ErrorMessage, response.ErrorMessage); - - return (List) ApiClient.Deserialize(response.Content, typeof(List), response.Headers); - } - - /// - /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - /// - /// Tags to filter by - /// List<Pet> - [Obsolete] - public List FindPetsByTags (List tags) - { - - // verify the required parameter 'tags' is set - if (tags == null) throw new ApiException(400, "Missing required parameter 'tags' when calling FindPetsByTags"); - - - var path = "/pet/findByTags"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.ErrorMessage, response.ErrorMessage); - - return (List) ApiClient.Deserialize(response.Content, typeof(List), response.Headers); - } - - /// - /// Find pet by ID Returns a single pet - /// - /// ID of pet to return - /// Pet - public Pet GetPetById (long? petId) - { - - // verify the required parameter 'petId' is set - if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { "api_key" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.ErrorMessage, response.ErrorMessage); - - return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers); - } - - /// - /// Update an existing pet - /// - /// Pet object that needs to be added to the store - /// - public void UpdatePet (Pet body) - { - - // verify the required parameter 'body' is set - if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling UpdatePet"); - - - var path = "/pet"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(body); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Updates a pet in the store with form data - /// - /// ID of pet that needs to be updated - /// Updated name of the pet - /// Updated status of the pet - /// - public void UpdatePetWithForm (long? petId, string name, string status) - { - - // verify the required parameter 'petId' is set - if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter -if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// uploads an image - /// - /// ID of pet to update - /// Additional data to pass to server - /// file to upload - /// ApiResponse - public ApiResponse UploadFile (long? petId, string additionalMetadata, System.IO.Stream file) - { - - // verify the required parameter 'petId' is set - if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile"); - - - var path = "/pet/{petId}/uploadImage"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter -if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file)); - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.ErrorMessage, response.ErrorMessage); - - return (ApiResponse) ApiClient.Deserialize(response.Content, typeof(ApiResponse), response.Headers); - } - - } -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs deleted file mode 100644 index 423d179cdbe..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs +++ /dev/null @@ -1,236 +0,0 @@ -using System; -using System.Collections.Generic; -using RestSharp; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Org.OpenAPITools.Api -{ - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public interface IStoreApi - { - /// - /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - /// - /// ID of the order that needs to be deleted - /// - void DeleteOrder (string orderId); - /// - /// Returns pet inventories by status Returns a map of status codes to quantities - /// - /// Dictionary<string, int?> - Dictionary GetInventory (); - /// - /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - /// - /// ID of pet that needs to be fetched - /// Order - Order GetOrderById (long? orderId); - /// - /// Place an order for a pet - /// - /// order placed for purchasing the pet - /// Order - Order PlaceOrder (Order body); - } - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class StoreApi : IStoreApi - { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// - public StoreApi(ApiClient apiClient = null) - { - if (apiClient == null) // use the default one in Configuration - this.ApiClient = Configuration.DefaultApiClient; - else - this.ApiClient = apiClient; - } - - /// - /// Initializes a new instance of the class. - /// - /// - public StoreApi(String basePath) - { - this.ApiClient = new ApiClient(basePath); - } - - /// - /// Sets the base path of the API client. - /// - /// The base path - /// The base path - public void SetBasePath(String basePath) - { - this.ApiClient.BasePath = basePath; - } - - /// - /// Gets the base path of the API client. - /// - /// The base path - /// The base path - public String GetBasePath(String basePath) - { - return this.ApiClient.BasePath; - } - - /// - /// Gets or sets the API client. - /// - /// An instance of the ApiClient - public ApiClient ApiClient {get; set;} - - /// - /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - /// - /// ID of the order that needs to be deleted - /// - public void DeleteOrder (string orderId) - { - - // verify the required parameter 'orderId' is set - if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder"); - - - var path = "/store/order/{orderId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Returns pet inventories by status Returns a map of status codes to quantities - /// - /// Dictionary<string, int?> - public Dictionary GetInventory () - { - - - var path = "/store/inventory"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { "api_key" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.ErrorMessage, response.ErrorMessage); - - return (Dictionary) ApiClient.Deserialize(response.Content, typeof(Dictionary), response.Headers); - } - - /// - /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - /// - /// ID of pet that needs to be fetched - /// Order - public Order GetOrderById (long? orderId) - { - - // verify the required parameter 'orderId' is set - if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById"); - - - var path = "/store/order/{orderId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.ErrorMessage, response.ErrorMessage); - - return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers); - } - - /// - /// Place an order for a pet - /// - /// order placed for purchasing the pet - /// Order - public Order PlaceOrder (Order body) - { - - // verify the required parameter 'body' is set - if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling PlaceOrder"); - - - var path = "/store/order"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(body); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.ErrorMessage, response.ErrorMessage); - - return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers); - } - - } -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs deleted file mode 100644 index 3f453e6b9b2..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs +++ /dev/null @@ -1,420 +0,0 @@ -using System; -using System.Collections.Generic; -using RestSharp; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Org.OpenAPITools.Api -{ - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public interface IUserApi - { - /// - /// Create user This can only be done by the logged in user. - /// - /// Created user object - /// - void CreateUser (User body); - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - void CreateUsersWithArrayInput (List body); - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - void CreateUsersWithListInput (List body); - /// - /// Delete user This can only be done by the logged in user. - /// - /// The name that needs to be deleted - /// - void DeleteUser (string username); - /// - /// Get user by user name - /// - /// The name that needs to be fetched. Use user1 for testing. - /// User - User GetUserByName (string username); - /// - /// Logs user into the system - /// - /// The user name for login - /// The password for login in clear text - /// string - string LoginUser (string username, string password); - /// - /// Logs out current logged in user session - /// - /// - void LogoutUser (); - /// - /// Updated user This can only be done by the logged in user. - /// - /// name that need to be deleted - /// Updated user object - /// - void UpdateUser (string username, User body); - } - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class UserApi : IUserApi - { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// - public UserApi(ApiClient apiClient = null) - { - if (apiClient == null) // use the default one in Configuration - this.ApiClient = Configuration.DefaultApiClient; - else - this.ApiClient = apiClient; - } - - /// - /// Initializes a new instance of the class. - /// - /// - public UserApi(String basePath) - { - this.ApiClient = new ApiClient(basePath); - } - - /// - /// Sets the base path of the API client. - /// - /// The base path - /// The base path - public void SetBasePath(String basePath) - { - this.ApiClient.BasePath = basePath; - } - - /// - /// Gets the base path of the API client. - /// - /// The base path - /// The base path - public String GetBasePath(String basePath) - { - return this.ApiClient.BasePath; - } - - /// - /// Gets or sets the API client. - /// - /// An instance of the ApiClient - public ApiClient ApiClient {get; set;} - - /// - /// Create user This can only be done by the logged in user. - /// - /// Created user object - /// - public void CreateUser (User body) - { - - // verify the required parameter 'body' is set - if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling CreateUser"); - - - var path = "/user"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(body); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - public void CreateUsersWithArrayInput (List body) - { - - // verify the required parameter 'body' is set - if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling CreateUsersWithArrayInput"); - - - var path = "/user/createWithArray"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(body); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - public void CreateUsersWithListInput (List body) - { - - // verify the required parameter 'body' is set - if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling CreateUsersWithListInput"); - - - var path = "/user/createWithList"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(body); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Delete user This can only be done by the logged in user. - /// - /// The name that needs to be deleted - /// - public void DeleteUser (string username) - { - - // verify the required parameter 'username' is set - if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Get user by user name - /// - /// The name that needs to be fetched. Use user1 for testing. - /// User - public User GetUserByName (string username) - { - - // verify the required parameter 'username' is set - if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.ErrorMessage, response.ErrorMessage); - - return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers); - } - - /// - /// Logs user into the system - /// - /// The user name for login - /// The password for login in clear text - /// string - public string LoginUser (string username, string password) - { - - // verify the required parameter 'username' is set - if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling LoginUser"); - - // verify the required parameter 'password' is set - if (password == null) throw new ApiException(400, "Missing required parameter 'password' when calling LoginUser"); - - - var path = "/user/login"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter - if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.ErrorMessage, response.ErrorMessage); - - return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers); - } - - /// - /// Logs out current logged in user session - /// - /// - public void LogoutUser () - { - - - var path = "/user/logout"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Updated user This can only be done by the logged in user. - /// - /// name that need to be deleted - /// Updated user object - /// - public void UpdateUser (string username, User body) - { - - // verify the required parameter 'username' is set - if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser"); - - // verify the required parameter 'body' is set - if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling UpdateUser"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(body); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - } -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs deleted file mode 100644 index 7b0d472a06e..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs +++ /dev/null @@ -1,297 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Text.RegularExpressions; -using System.IO; -using System.Web; -using System.Linq; -using System.Net; -using System.Text; -using Newtonsoft.Json; -using RestSharp; -using RestSharp.Extensions; - -namespace Org.OpenAPITools.Client -{ - /// - /// API client is mainly responsible for making the HTTP call to the API backend. - /// - public class ApiClient - { - private readonly Dictionary _defaultHeaderMap = new Dictionary(); - - /// - /// Initializes a new instance of the class. - /// - /// The base path. - public ApiClient(String basePath="http://petstore.swagger.io/v2") - { - BasePath = basePath; - RestClient = new RestClient(BasePath); - } - - /// - /// Gets or sets the base path. - /// - /// The base path - public string BasePath { get; set; } - - /// - /// Gets or sets the RestClient. - /// - /// An instance of the RestClient - public RestClient RestClient { get; set; } - - /// - /// Gets the default header. - /// - public Dictionary DefaultHeader - { - get { return _defaultHeaderMap; } - } - - /// - /// Makes the HTTP request (Sync). - /// - /// URL path. - /// HTTP method. - /// Query parameters. - /// HTTP body (POST request). - /// Header parameters. - /// Form parameters. - /// File parameters. - /// Authentication settings. - /// Object - public Object CallApi(String path, RestSharp.Method method, Dictionary queryParams, String postBody, - Dictionary headerParams, Dictionary formParams, - Dictionary fileParams, String[] authSettings) - { - - var request = new RestRequest(path, method); - - UpdateParamsForAuth(queryParams, headerParams, authSettings); - - // add default header, if any - foreach(var defaultHeader in _defaultHeaderMap) - request.AddHeader(defaultHeader.Key, defaultHeader.Value); - - // add header parameter, if any - foreach(var param in headerParams) - request.AddHeader(param.Key, param.Value); - - // add query parameter, if any - foreach(var param in queryParams) - request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost); - - // add form parameter, if any - foreach(var param in formParams) - request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost); - - // add file parameter, if any - foreach(var param in fileParams) - request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType); - - if (postBody != null) // http body (model) parameter - request.AddParameter("application/json", postBody, ParameterType.RequestBody); - - return (Object)RestClient.Execute(request); - - } - - /// - /// Add default header. - /// - /// Header field name. - /// Header field value. - /// - public void AddDefaultHeader(string key, string value) - { - _defaultHeaderMap.Add(key, value); - } - - /// - /// Escape string (url-encoded). - /// - /// String to be escaped. - /// Escaped string. - public string EscapeString(string str) - { - return RestSharp.Contrib.HttpUtility.UrlEncode(str); - } - - /// - /// Create FileParameter based on Stream. - /// - /// Parameter name. - /// Input stream. - /// FileParameter. - public FileParameter ParameterToFile(string name, Stream stream) - { - if (stream is FileStream) - return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name)); - else - return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided"); - } - - /// - /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime. - /// If parameter is a list of string, join the list with ",". - /// Otherwise just return the string. - /// - /// The parameter (header, path, query, form). - /// Formatted string. - public string ParameterToString(object obj) - { - if (obj is DateTime) - // Return a formatted date string - Can be customized with Configuration.DateTimeFormat - // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") - // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 - // For example: 2009-06-15T13:45:30.0000000 - return ((DateTime)obj).ToString (Configuration.DateTimeFormat); - else if (obj is bool) - return (bool)obj ? "true" : "false"; - else if (obj is List) - return String.Join(",", (obj as List).ToArray()); - else - return Convert.ToString (obj); - } - - /// - /// Deserialize the JSON string into a proper object. - /// - /// HTTP body (e.g. string, JSON). - /// Object type. - /// HTTP headers. - /// Object representation of the JSON string. - public object Deserialize(string content, Type type, IList headers=null) - { - if (type == typeof(Object)) // return an object - { - return content; - } - - if (type == typeof(Stream)) - { - var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath) - ? Path.GetTempPath() - : Configuration.TempFolderPath; - - var fileName = filePath + Guid.NewGuid(); - if (headers != null) - { - var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$"); - var match = regex.Match(headers.ToString()); - if (match.Success) - fileName = filePath + match.Value.Replace("\"", "").Replace("'", ""); - } - File.WriteAllText(fileName, content); - return new FileStream(fileName, FileMode.Open); - - } - - if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object - { - return DateTime.Parse(content, null, System.Globalization.DateTimeStyles.RoundtripKind); - } - - if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type - { - return ConvertType(content, type); - } - - // at this point, it must be a model (json) - try - { - return JsonConvert.DeserializeObject(content, type); - } - catch (IOException e) - { - throw new ApiException(500, e.Message); - } - } - - /// - /// Serialize an object into JSON string. - /// - /// Object. - /// JSON string. - public string Serialize(object obj) - { - try - { - return obj != null ? JsonConvert.SerializeObject(obj) : null; - } - catch (Exception e) - { - throw new ApiException(500, e.Message); - } - } - - /// - /// Get the API key with prefix. - /// - /// API key identifier (authentication scheme). - /// API key with prefix. - public string GetApiKeyWithPrefix (string apiKeyIdentifier) - { - var apiKeyValue = ""; - Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue); - var apiKeyPrefix = ""; - if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix)) - return apiKeyPrefix + " " + apiKeyValue; - else - return apiKeyValue; - } - - /// - /// Update parameters based on authentication. - /// - /// Query parameters. - /// Header parameters. - /// Authentication settings. - public void UpdateParamsForAuth(Dictionary queryParams, Dictionary headerParams, string[] authSettings) - { - if (authSettings == null || authSettings.Length == 0) - return; - - foreach (string auth in authSettings) - { - // determine which one to use - switch(auth) - { - case "api_key": - headerParams["api_key"] = GetApiKeyWithPrefix("api_key"); - break; - case "petstore_auth": - headerParams["Authorization"] = "Bearer " + Configuration.AccessToken; - break; - default: - //TODO show warning about security definition not found - break; - } - } - } - - /// - /// Encode string in base64 format. - /// - /// String to be encoded. - /// Encoded string. - public static string Base64Encode(string text) - { - var textByte = System.Text.Encoding.UTF8.GetBytes(text); - return System.Convert.ToBase64String(textByte); - } - - /// - /// Dynamically cast the object into target type. - /// - /// Object to be casted - /// Target type - /// Casted object - public static Object ConvertType(Object fromObject, Type toObject) { - return Convert.ChangeType(fromObject, toObject); - } - - } -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs deleted file mode 100644 index 7985897b93e..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; - -namespace Org.OpenAPITools.Client { - /// - /// API Exception - /// - public class ApiException : Exception { - /// - /// Gets or sets the error code (HTTP status code) - /// - /// The error code (HTTP status code). - public int ErrorCode { get; set; } - - /// - /// Gets or sets the error content (body json object) - /// - /// The error content (Http response body). - public Object ErrorContent { get; private set; } - - /// - /// Initializes a new instance of the class. - /// - public ApiException() {} - - /// - /// Initializes a new instance of the class. - /// - /// HTTP status code. - /// Error message. - public ApiException(int errorCode, string message) : base(message) { - this.ErrorCode = errorCode; - } - - /// - /// Initializes a new instance of the class. - /// - /// HTTP status code. - /// Error message. - /// Error content. - public ApiException(int errorCode, string message, Object errorContent = null) : base(message) { - this.ErrorCode = errorCode; - this.ErrorContent = errorContent; - } - - } - -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs deleted file mode 100644 index 10bd0088bb7..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System; -using System.Reflection; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; - -namespace Org.OpenAPITools.Client -{ - /// - /// Represents a set of configuration settings - /// - public class Configuration - { - - /// - /// Version of the package. - /// - /// Version of the package. - public const string Version = "1.0.0"; - - /// - /// Gets or sets the default API client for making HTTP calls. - /// - /// The API client. - public static ApiClient DefaultApiClient = new ApiClient(); - - /// - /// Gets or sets the username (HTTP basic authentication). - /// - /// The username. - public static String Username { get; set; } - - /// - /// Gets or sets the password (HTTP basic authentication). - /// - /// The password. - public static String Password { get; set; } - - /// - /// Gets or sets the access token (Bearer/OAuth authentication). - /// - /// The access token. - public static String AccessToken { get; set; } - - /// - /// Gets or sets the API key based on the authentication name. - /// - /// The API key. - public static Dictionary ApiKey = new Dictionary(); - - /// - /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name. - /// - /// The prefix of the API key. - public static Dictionary ApiKeyPrefix = new Dictionary(); - - private static string _tempFolderPath = Path.GetTempPath(); - - /// - /// Gets or sets the temporary folder path to store the files downloaded from the server. - /// - /// Folder path. - public static String TempFolderPath - { - get { return _tempFolderPath; } - - set - { - if (String.IsNullOrEmpty(value)) - { - _tempFolderPath = value; - return; - } - - // create the directory if it does not exist - if (!Directory.Exists(value)) - Directory.CreateDirectory(value); - - // check if the path contains directory separator at the end - if (value[value.Length - 1] == Path.DirectorySeparatorChar) - _tempFolderPath = value; - else - _tempFolderPath = value + Path.DirectorySeparatorChar; - } - } - - private const string ISO8601_DATETIME_FORMAT = "o"; - - private static string _dateTimeFormat = ISO8601_DATETIME_FORMAT; - - /// - /// Gets or sets the date time format used when serializing in the ApiClient - /// By default, it's set to ISO 8601 - "o", for others see: - /// https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx - /// and https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx - /// No validation is done to ensure that the string you're providing is valid - /// - /// The DateTimeFormat string - public static String DateTimeFormat - { - get - { - return _dateTimeFormat; - } - set - { - if (string.IsNullOrEmpty(value)) - { - // Never allow a blank or null string, go back to the default - _dateTimeFormat = ISO8601_DATETIME_FORMAT; - return; - } - - // Caution, no validation when you choose date time format other than ISO 8601 - // Take a look at the above links - _dateTimeFormat = value; - } - } - - /// - /// Returns a string with essential information for debugging. - /// - public static String ToDebugReport() - { - String report = "C# SDK (Org.OpenAPITools) Debug Report:\n"; - report += " OS: " + Environment.OSVersion + "\n"; - report += " .NET Framework Version: " + Assembly - .GetExecutingAssembly() - .GetReferencedAssemblies() - .Where(x => x.Name == "System.Core").First().Version.ToString() + "\n"; - report += " Version of the API: 1.0.0\n"; - report += " SDK Package Version: 1.0.0\n"; - - return report; - } - } -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs deleted file mode 100644 index 648aaeba5b1..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// Describes the result of uploading an image resource - /// - [DataContract] - public class ApiResponse { - /// - /// Gets or Sets Code - /// - [DataMember(Name="code", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "code")] - public int? Code { get; set; } - - /// - /// Gets or Sets Type - /// - [DataMember(Name="type", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "type")] - public string Type { get; set; } - - /// - /// Gets or Sets Message - /// - [DataMember(Name="message", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "message")] - public string Message { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class ApiResponse {\n"); - sb.Append(" Code: ").Append(Code).Append("\n"); - sb.Append(" Type: ").Append(Type).Append("\n"); - sb.Append(" Message: ").Append(Message).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs deleted file mode 100644 index 847279502e2..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// A category for a pet - /// - [DataContract] - public class Category { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets Name - /// - [DataMember(Name="name", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "name")] - public string Name { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class Category {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/InlineObject.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/InlineObject.cs deleted file mode 100644 index 2de88324c58..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/InlineObject.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// - /// - [DataContract] - public class InlineObject { - /// - /// Updated name of the pet - /// - /// Updated name of the pet - [DataMember(Name="name", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "name")] - public string Name { get; set; } - - /// - /// Updated status of the pet - /// - /// Updated status of the pet - [DataMember(Name="status", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "status")] - public string Status { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class InlineObject {\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" Status: ").Append(Status).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/InlineObject1.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/InlineObject1.cs deleted file mode 100644 index 03d1fa0c786..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/InlineObject1.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// - /// - [DataContract] - public class InlineObject1 { - /// - /// Additional data to pass to server - /// - /// Additional data to pass to server - [DataMember(Name="additionalMetadata", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "additionalMetadata")] - public string AdditionalMetadata { get; set; } - - /// - /// file to upload - /// - /// file to upload - [DataMember(Name="file", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "file")] - public System.IO.Stream File { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class InlineObject1 {\n"); - sb.Append(" AdditionalMetadata: ").Append(AdditionalMetadata).Append("\n"); - sb.Append(" File: ").Append(File).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs deleted file mode 100644 index c19511ca3f8..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// An order for a pets from the pet store - /// - [DataContract] - public class Order { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets PetId - /// - [DataMember(Name="petId", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "petId")] - public long? PetId { get; set; } - - /// - /// Gets or Sets Quantity - /// - [DataMember(Name="quantity", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "quantity")] - public int? Quantity { get; set; } - - /// - /// Gets or Sets ShipDate - /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "shipDate")] - public DateTime? ShipDate { get; set; } - - /// - /// Order Status - /// - /// Order Status - [DataMember(Name="status", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "status")] - public string Status { get; set; } - - /// - /// Gets or Sets Complete - /// - [DataMember(Name="complete", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "complete")] - public bool? Complete { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class Order {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" PetId: ").Append(PetId).Append("\n"); - sb.Append(" Quantity: ").Append(Quantity).Append("\n"); - sb.Append(" ShipDate: ").Append(ShipDate).Append("\n"); - sb.Append(" Status: ").Append(Status).Append("\n"); - sb.Append(" Complete: ").Append(Complete).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs deleted file mode 100644 index 71ec62aa9c8..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// A pet for sale in the pet store - /// - [DataContract] - public class Pet { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets Category - /// - [DataMember(Name="category", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "category")] - public Category Category { get; set; } - - /// - /// Gets or Sets Name - /// - [DataMember(Name="name", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "name")] - public string Name { get; set; } - - /// - /// Gets or Sets PhotoUrls - /// - [DataMember(Name="photoUrls", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "photoUrls")] - public List PhotoUrls { get; set; } - - /// - /// Gets or Sets Tags - /// - [DataMember(Name="tags", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "tags")] - public List Tags { get; set; } - - /// - /// pet status in the store - /// - /// pet status in the store - [DataMember(Name="status", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "status")] - public string Status { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class Pet {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Category: ").Append(Category).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" PhotoUrls: ").Append(PhotoUrls).Append("\n"); - sb.Append(" Tags: ").Append(Tags).Append("\n"); - sb.Append(" Status: ").Append(Status).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs deleted file mode 100644 index 6399695a50a..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// A tag for a pet - /// - [DataContract] - public class Tag { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets Name - /// - [DataMember(Name="name", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "name")] - public string Name { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class Tag {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs deleted file mode 100644 index c6af059dcdc..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs +++ /dev/null @@ -1,101 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// A User who is purchasing from the pet store - /// - [DataContract] - public class User { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets Username - /// - [DataMember(Name="username", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "username")] - public string Username { get; set; } - - /// - /// Gets or Sets FirstName - /// - [DataMember(Name="firstName", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "firstName")] - public string FirstName { get; set; } - - /// - /// Gets or Sets LastName - /// - [DataMember(Name="lastName", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "lastName")] - public string LastName { get; set; } - - /// - /// Gets or Sets Email - /// - [DataMember(Name="email", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "email")] - public string Email { get; set; } - - /// - /// Gets or Sets Password - /// - [DataMember(Name="password", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "password")] - public string Password { get; set; } - - /// - /// Gets or Sets Phone - /// - [DataMember(Name="phone", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "phone")] - public string Phone { get; set; } - - /// - /// User Status - /// - /// User Status - [DataMember(Name="userStatus", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "userStatus")] - public int? UserStatus { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class User {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Username: ").Append(Username).Append("\n"); - sb.Append(" FirstName: ").Append(FirstName).Append("\n"); - sb.Append(" LastName: ").Append(LastName).Append("\n"); - sb.Append(" Email: ").Append(Email).Append("\n"); - sb.Append(" Password: ").Append(Password).Append("\n"); - sb.Append(" Phone: ").Append(Phone).Append("\n"); - sb.Append(" UserStatus: ").Append(UserStatus).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/vendor/packages.config b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/vendor/packages.config deleted file mode 100644 index 7b9cf186303..00000000000 --- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/vendor/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.openapi-generator-ignore b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.openapi-generator-ignore deleted file mode 100644 index 7484ee590a3..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.openapi-generator/VERSION deleted file mode 100644 index 6d94c9c2e12..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md deleted file mode 100644 index 6b861dfd723..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md +++ /dev/null @@ -1,131 +0,0 @@ -# Org.OpenAPITools - the C# library for the OpenAPI Petstore - -This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - -This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - -- API version: 1.0.0 -- SDK version: 1.0.0 -- Build package: org.openapitools.codegen.languages.CSharpDotNet2ClientCodegen - - -## Frameworks supported -- .NET 2.0 - - -## Dependencies -- Mono compiler -- Newtonsoft.Json.7.0.1 -- RestSharp.Net2.1.1.11 - -Note: NuGet is downloaded by the mono compilation script and packages are installed with it. No dependency DLLs are bundled with this generator - - -## Installation -Run the following command to generate the DLL -- [Mac/Linux] `/bin/sh compile-mono.sh` -- [Windows] TODO - -Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces: -```csharp -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; -``` - -## Getting Started - -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class Example - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var pet = new Pet(); // Pet | Pet object that needs to be added to the store - - try - { - // Add a new pet to the store - apiInstance.AddPet(pet); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.AddPet: " + e.Message ); - } - } - } -} -``` - - -## Documentation for API Endpoints - -All URIs are relative to *http://petstore.swagger.io/v2* - -Class | Method | HTTP request | Description ------------- | ------------- | ------------- | ------------- -*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store -*PetApi* | [**DeletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet -*PetApi* | [**FindPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status -*PetApi* | [**FindPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags -*PetApi* | [**GetPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID -*PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet -*PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data -*PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image -*StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID -*StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status -*StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID -*StoreApi* | [**PlaceOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet -*UserApi* | [**CreateUser**](docs/UserApi.md#createuser) | **POST** /user | Create user -*UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array -*UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array -*UserApi* | [**DeleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user -*UserApi* | [**GetUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name -*UserApi* | [**LoginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system -*UserApi* | [**LogoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session -*UserApi* | [**UpdateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user - - - -## Documentation for Models - - - [Org.OpenAPITools.Model.ApiResponse](docs/ApiResponse.md) - - [Org.OpenAPITools.Model.Category](docs/Category.md) - - [Org.OpenAPITools.Model.Order](docs/Order.md) - - [Org.OpenAPITools.Model.Pet](docs/Pet.md) - - [Org.OpenAPITools.Model.Tag](docs/Tag.md) - - [Org.OpenAPITools.Model.User](docs/User.md) - - - -## Documentation for Authorization - - -### api_key - -- **Type**: API key -- **API key parameter name**: api_key -- **Location**: HTTP header - - -### petstore_auth - -- **Type**: OAuth -- **Flow**: implicit -- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog -- **Scopes**: - - write:pets: modify pets in your account - - read:pets: read your pets - diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh deleted file mode 100644 index 8e6e23eba08..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh +++ /dev/null @@ -1,12 +0,0 @@ -wget -nc https://dist.nuget.org/win-x86-commandline/latest/nuget.exe; -mozroots --import --sync -mono nuget.exe install vendor/packages.config -o vendor; -mkdir -p bin; -mcs -sdk:2 -r:vendor/Newtonsoft.Json.7.0.1/lib/net20/Newtonsoft.Json.dll,\ -vendor/RestSharp.Net2.1.1.11/lib/net20/RestSharp.Net2.dll,\ -System.Runtime.Serialization.dll \ --target:library \ --out:bin/Org.OpenAPITools.dll \ --recurse:'src/*.cs' \ --doc:bin/Org.OpenAPITools.xml \ --platform:anycpu diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/ApiResponse.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/ApiResponse.md deleted file mode 100644 index 01b35815bd4..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/ApiResponse.md +++ /dev/null @@ -1,11 +0,0 @@ -# Org.OpenAPITools.Model.ApiResponse -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Code** | **int?** | | [optional] -**Type** | **string** | | [optional] -**Message** | **string** | | [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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Category.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Category.md deleted file mode 100644 index 860a468e35c..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Category.md +++ /dev/null @@ -1,10 +0,0 @@ -# Org.OpenAPITools.Model.Category -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**Name** | **string** | | [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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Order.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Order.md deleted file mode 100644 index 984bd5ca063..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Order.md +++ /dev/null @@ -1,14 +0,0 @@ -# Org.OpenAPITools.Model.Order -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**PetId** | **long?** | | [optional] -**Quantity** | **int?** | | [optional] -**ShipDate** | **DateTime?** | | [optional] -**Status** | **string** | Order Status | [optional] -**Complete** | **bool?** | | [optional] [default to false] - -[[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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Pet.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Pet.md deleted file mode 100644 index ce9fe873cd2..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Pet.md +++ /dev/null @@ -1,14 +0,0 @@ -# Org.OpenAPITools.Model.Pet -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**Category** | [**Category**](Category.md) | | [optional] -**Name** | **string** | | -**PhotoUrls** | **List** | | -**Tags** | [**List**](Tag.md) | | [optional] -**Status** | **string** | pet status in the store | [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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md deleted file mode 100644 index 0051c617a1d..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md +++ /dev/null @@ -1,534 +0,0 @@ -# Org.OpenAPITools.Api.PetApi - -All URIs are relative to *http://petstore.swagger.io/v2* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**AddPet**](PetApi.md#addpet) | **POST** /pet | Add a new pet to the store -[**DeletePet**](PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet -[**FindPetsByStatus**](PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status -[**FindPetsByTags**](PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags -[**GetPetById**](PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID -[**UpdatePet**](PetApi.md#updatepet) | **PUT** /pet | Update an existing pet -[**UpdatePetWithForm**](PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data -[**UploadFile**](PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image - - - -# **AddPet** -> void AddPet (Pet pet) - -Add a new pet to the store - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class AddPetExample - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var pet = new Pet(); // Pet | Pet object that needs to be added to the store - - try - { - // Add a new pet to the store - apiInstance.AddPet(pet); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.AddPet: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | - -### Return type - -void (empty response body) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: application/json, application/xml - - **Accept**: Not defined - -[[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) - - -# **DeletePet** -> void DeletePet (long? petId, string apiKey) - -Deletes a pet - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class DeletePetExample - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var petId = 789; // long? | Pet id to delete - var apiKey = apiKey_example; // string | (optional) - - try - { - // Deletes a pet - apiInstance.DeletePet(petId, apiKey); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.DeletePet: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **petId** | **long?**| Pet id to delete | - **apiKey** | **string**| | [optional] - -### Return type - -void (empty response body) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **FindPetsByStatus** -> List FindPetsByStatus (List status) - -Finds Pets by status - -Multiple status values can be provided with comma separated strings - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class FindPetsByStatusExample - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var status = status_example; // List | Status values that need to be considered for filter - - try - { - // Finds Pets by status - List<Pet> result = apiInstance.FindPetsByStatus(status); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.FindPetsByStatus: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **status** | **List**| Status values that need to be considered for filter | - -### Return type - -[**List**](Pet.md) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **FindPetsByTags** -> List FindPetsByTags (List tags) - -Finds Pets by tags - -Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class FindPetsByTagsExample - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var tags = new List(); // List | Tags to filter by - - try - { - // Finds Pets by tags - List<Pet> result = apiInstance.FindPetsByTags(tags); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.FindPetsByTags: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **tags** | [**List**](string.md)| Tags to filter by | - -### Return type - -[**List**](Pet.md) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **GetPetById** -> Pet GetPetById (long? petId) - -Find pet by ID - -Returns a single pet - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class GetPetByIdExample - { - public void main() - { - - // Configure API key authorization: api_key - Configuration.Default.ApiKey.Add("api_key", "YOUR_API_KEY"); - // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed - // Configuration.Default.ApiKeyPrefix.Add("api_key", "Bearer"); - - var apiInstance = new PetApi(); - var petId = 789; // long? | ID of pet to return - - try - { - // Find pet by ID - Pet result = apiInstance.GetPetById(petId); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.GetPetById: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **petId** | **long?**| ID of pet to return | - -### Return type - -[**Pet**](Pet.md) - -### Authorization - -[api_key](../README.md#api_key) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **UpdatePet** -> void UpdatePet (Pet pet) - -Update an existing pet - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class UpdatePetExample - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var pet = new Pet(); // Pet | Pet object that needs to be added to the store - - try - { - // Update an existing pet - apiInstance.UpdatePet(pet); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.UpdatePet: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | - -### Return type - -void (empty response body) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: application/json, application/xml - - **Accept**: Not defined - -[[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) - - -# **UpdatePetWithForm** -> void UpdatePetWithForm (long? petId, string name, string status) - -Updates a pet in the store with form data - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class UpdatePetWithFormExample - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var petId = 789; // long? | ID of pet that needs to be updated - var name = name_example; // string | Updated name of the pet (optional) - var status = status_example; // string | Updated status of the pet (optional) - - try - { - // Updates a pet in the store with form data - apiInstance.UpdatePetWithForm(petId, name, status); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.UpdatePetWithForm: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **petId** | **long?**| ID of pet that needs to be updated | - **name** | **string**| Updated name of the pet | [optional] - **status** | **string**| Updated status of the pet | [optional] - -### Return type - -void (empty response body) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: application/x-www-form-urlencoded - - **Accept**: Not defined - -[[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) - - -# **UploadFile** -> ApiResponse UploadFile (long? petId, string additionalMetadata, System.IO.Stream file) - -uploads an image - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class UploadFileExample - { - public void main() - { - - // Configure OAuth2 access token for authorization: petstore_auth - Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - - var apiInstance = new PetApi(); - var petId = 789; // long? | ID of pet to update - var additionalMetadata = additionalMetadata_example; // string | Additional data to pass to server (optional) - var file = new System.IO.Stream(); // System.IO.Stream | file to upload (optional) - - try - { - // uploads an image - ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling PetApi.UploadFile: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **petId** | **long?**| ID of pet to update | - **additionalMetadata** | **string**| Additional data to pass to server | [optional] - **file** | **System.IO.Stream**| 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 - -[[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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md deleted file mode 100644 index 58e85fb6eb6..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md +++ /dev/null @@ -1,258 +0,0 @@ -# Org.OpenAPITools.Api.StoreApi - -All URIs are relative to *http://petstore.swagger.io/v2* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**DeleteOrder**](StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID -[**GetInventory**](StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status -[**GetOrderById**](StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID -[**PlaceOrder**](StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet - - - -# **DeleteOrder** -> void DeleteOrder (string orderId) - -Delete purchase order by ID - -For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class DeleteOrderExample - { - public void main() - { - - var apiInstance = new StoreApi(); - var orderId = orderId_example; // string | ID of the order that needs to be deleted - - try - { - // Delete purchase order by ID - apiInstance.DeleteOrder(orderId); - } - catch (Exception e) - { - Debug.Print("Exception when calling StoreApi.DeleteOrder: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **orderId** | **string**| ID of the order that needs to be deleted | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **GetInventory** -> Dictionary GetInventory () - -Returns pet inventories by status - -Returns a map of status codes to quantities - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class GetInventoryExample - { - public void main() - { - - // Configure API key authorization: api_key - Configuration.Default.ApiKey.Add("api_key", "YOUR_API_KEY"); - // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed - // Configuration.Default.ApiKeyPrefix.Add("api_key", "Bearer"); - - var apiInstance = new StoreApi(); - - try - { - // Returns pet inventories by status - Dictionary<string, int?> result = apiInstance.GetInventory(); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling StoreApi.GetInventory: " + e.Message ); - } - } - } -} -``` - -### Parameters -This endpoint does not need any parameter. - -### Return type - -**Dictionary** - -### Authorization - -[api_key](../README.md#api_key) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[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) - - -# **GetOrderById** -> Order GetOrderById (long? orderId) - -Find purchase order by ID - -For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class GetOrderByIdExample - { - public void main() - { - - var apiInstance = new StoreApi(); - var orderId = 789; // long? | ID of pet that needs to be fetched - - try - { - // Find purchase order by ID - Order result = apiInstance.GetOrderById(orderId); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling StoreApi.GetOrderById: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **orderId** | **long?**| ID of pet that needs to be fetched | - -### Return type - -[**Order**](Order.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **PlaceOrder** -> Order PlaceOrder (Order order) - -Place an order for a pet - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class PlaceOrderExample - { - public void main() - { - - var apiInstance = new StoreApi(); - var order = new Order(); // Order | order placed for purchasing the pet - - try - { - // Place an order for a pet - Order result = apiInstance.PlaceOrder(order); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling StoreApi.PlaceOrder: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **order** | [**Order**](Order.md)| order placed for purchasing the pet | - -### Return type - -[**Order**](Order.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Tag.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Tag.md deleted file mode 100644 index 6a76c28595f..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/Tag.md +++ /dev/null @@ -1,10 +0,0 @@ -# Org.OpenAPITools.Model.Tag -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**Name** | **string** | | [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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/User.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/User.md deleted file mode 100644 index 04dd24a3423..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/User.md +++ /dev/null @@ -1,16 +0,0 @@ -# Org.OpenAPITools.Model.User -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**Id** | **long?** | | [optional] -**Username** | **string** | | [optional] -**FirstName** | **string** | | [optional] -**LastName** | **string** | | [optional] -**Email** | **string** | | [optional] -**Password** | **string** | | [optional] -**Phone** | **string** | | [optional] -**UserStatus** | **int?** | User Status | [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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md deleted file mode 100644 index dad1e505005..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md +++ /dev/null @@ -1,496 +0,0 @@ -# Org.OpenAPITools.Api.UserApi - -All URIs are relative to *http://petstore.swagger.io/v2* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**CreateUser**](UserApi.md#createuser) | **POST** /user | Create user -[**CreateUsersWithArrayInput**](UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array -[**CreateUsersWithListInput**](UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array -[**DeleteUser**](UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user -[**GetUserByName**](UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name -[**LoginUser**](UserApi.md#loginuser) | **GET** /user/login | Logs user into the system -[**LogoutUser**](UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session -[**UpdateUser**](UserApi.md#updateuser) | **PUT** /user/{username} | Updated user - - - -# **CreateUser** -> void CreateUser (User user) - -Create user - -This can only be done by the logged in user. - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class CreateUserExample - { - public void main() - { - - var apiInstance = new UserApi(); - var user = new User(); // User | Created user object - - try - { - // Create user - apiInstance.CreateUser(user); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.CreateUser: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **user** | [**User**](User.md)| Created user object | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **CreateUsersWithArrayInput** -> void CreateUsersWithArrayInput (List user) - -Creates list of users with given input array - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class CreateUsersWithArrayInputExample - { - public void main() - { - - var apiInstance = new UserApi(); - var user = new List(); // List | List of user object - - try - { - // Creates list of users with given input array - apiInstance.CreateUsersWithArrayInput(user); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.CreateUsersWithArrayInput: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **user** | [**List**](List.md)| List of user object | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **CreateUsersWithListInput** -> void CreateUsersWithListInput (List user) - -Creates list of users with given input array - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class CreateUsersWithListInputExample - { - public void main() - { - - var apiInstance = new UserApi(); - var user = new List(); // List | List of user object - - try - { - // Creates list of users with given input array - apiInstance.CreateUsersWithListInput(user); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.CreateUsersWithListInput: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **user** | [**List**](List.md)| List of user object | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **DeleteUser** -> void DeleteUser (string username) - -Delete user - -This can only be done by the logged in user. - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class DeleteUserExample - { - public void main() - { - - var apiInstance = new UserApi(); - var username = username_example; // string | The name that needs to be deleted - - try - { - // Delete user - apiInstance.DeleteUser(username); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.DeleteUser: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **username** | **string**| The name that needs to be deleted | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **GetUserByName** -> User GetUserByName (string username) - -Get user by user name - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class GetUserByNameExample - { - public void main() - { - - var apiInstance = new UserApi(); - var username = username_example; // string | The name that needs to be fetched. Use user1 for testing. - - try - { - // Get user by user name - User result = apiInstance.GetUserByName(username); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.GetUserByName: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **username** | **string**| The name that needs to be fetched. Use user1 for testing. | - -### Return type - -[**User**](User.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **LoginUser** -> string LoginUser (string username, string password) - -Logs user into the system - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class LoginUserExample - { - public void main() - { - - var apiInstance = new UserApi(); - var username = username_example; // string | The user name for login - var password = password_example; // string | The password for login in clear text - - try - { - // Logs user into the system - string result = apiInstance.LoginUser(username, password); - Debug.WriteLine(result); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.LoginUser: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **username** | **string**| The user name for login | - **password** | **string**| The password for login in clear text | - -### Return type - -**string** - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/xml, application/json - -[[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) - - -# **LogoutUser** -> void LogoutUser () - -Logs out current logged in user session - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class LogoutUserExample - { - public void main() - { - - var apiInstance = new UserApi(); - - try - { - // Logs out current logged in user session - apiInstance.LogoutUser(); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.LogoutUser: " + e.Message ); - } - } - } -} -``` - -### Parameters -This endpoint does not need any parameter. - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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) - - -# **UpdateUser** -> void UpdateUser (string username, User user) - -Updated user - -This can only be done by the logged in user. - -### Example -```csharp -using System; -using System.Diagnostics; -using Org.OpenAPITools.Api; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Example -{ - public class UpdateUserExample - { - public void main() - { - - var apiInstance = new UserApi(); - var username = username_example; // string | name that need to be deleted - var user = new User(); // User | Updated user object - - try - { - // Updated user - apiInstance.UpdateUser(username, user); - } - catch (Exception e) - { - Debug.Print("Exception when calling UserApi.UpdateUser: " + e.Message ); - } - } - } -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **username** | **string**| name that need to be deleted | - **user** | [**User**](User.md)| Updated user object | - -### Return type - -void (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[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/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs deleted file mode 100644 index 66e0f6ab5cc..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/PetApi.cs +++ /dev/null @@ -1,429 +0,0 @@ -using System; -using System.Collections.Generic; -using RestSharp; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Org.OpenAPITools.Api -{ - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public interface IPetApi - { - /// - /// Add a new pet to the store - /// - /// Pet object that needs to be added to the store - /// - void AddPet (Pet pet); - /// - /// Deletes a pet - /// - /// Pet id to delete - /// - /// - void DeletePet (long? petId, string apiKey); - /// - /// Finds Pets by status Multiple status values can be provided with comma separated strings - /// - /// Status values that need to be considered for filter - /// List<Pet> - List FindPetsByStatus (List status); - /// - /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - /// - /// Tags to filter by - /// List<Pet> - List FindPetsByTags (List tags); - /// - /// Find pet by ID Returns a single pet - /// - /// ID of pet to return - /// Pet - Pet GetPetById (long? petId); - /// - /// Update an existing pet - /// - /// Pet object that needs to be added to the store - /// - void UpdatePet (Pet pet); - /// - /// Updates a pet in the store with form data - /// - /// ID of pet that needs to be updated - /// Updated name of the pet - /// Updated status of the pet - /// - void UpdatePetWithForm (long? petId, string name, string status); - /// - /// uploads an image - /// - /// ID of pet to update - /// Additional data to pass to server - /// file to upload - /// ApiResponse - ApiResponse UploadFile (long? petId, string additionalMetadata, System.IO.Stream file); - } - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class PetApi : IPetApi - { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// - public PetApi(ApiClient apiClient = null) - { - if (apiClient == null) // use the default one in Configuration - this.ApiClient = Configuration.DefaultApiClient; - else - this.ApiClient = apiClient; - } - - /// - /// Initializes a new instance of the class. - /// - /// - public PetApi(String basePath) - { - this.ApiClient = new ApiClient(basePath); - } - - /// - /// Sets the base path of the API client. - /// - /// The base path - /// The base path - public void SetBasePath(String basePath) - { - this.ApiClient.BasePath = basePath; - } - - /// - /// Gets the base path of the API client. - /// - /// The base path - /// The base path - public String GetBasePath(String basePath) - { - return this.ApiClient.BasePath; - } - - /// - /// Gets or sets the API client. - /// - /// An instance of the ApiClient - public ApiClient ApiClient {get; set;} - - /// - /// Add a new pet to the store - /// - /// Pet object that needs to be added to the store - /// - public void AddPet (Pet pet) - { - - // verify the required parameter 'pet' is set - if (pet == null) throw new ApiException(400, "Missing required parameter 'pet' when calling AddPet"); - - - var path = "/pet"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(pet); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Deletes a pet - /// - /// Pet id to delete - /// - /// - public void DeletePet (long? petId, string apiKey) - { - - // verify the required parameter 'petId' is set - if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Finds Pets by status Multiple status values can be provided with comma separated strings - /// - /// Status values that need to be considered for filter - /// List<Pet> - public List FindPetsByStatus (List status) - { - - // verify the required parameter 'status' is set - if (status == null) throw new ApiException(400, "Missing required parameter 'status' when calling FindPetsByStatus"); - - - var path = "/pet/findByStatus"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.ErrorMessage, response.ErrorMessage); - - return (List) ApiClient.Deserialize(response.Content, typeof(List), response.Headers); - } - - /// - /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - /// - /// Tags to filter by - /// List<Pet> - public List FindPetsByTags (List tags) - { - - // verify the required parameter 'tags' is set - if (tags == null) throw new ApiException(400, "Missing required parameter 'tags' when calling FindPetsByTags"); - - - var path = "/pet/findByTags"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.ErrorMessage, response.ErrorMessage); - - return (List) ApiClient.Deserialize(response.Content, typeof(List), response.Headers); - } - - /// - /// Find pet by ID Returns a single pet - /// - /// ID of pet to return - /// Pet - public Pet GetPetById (long? petId) - { - - // verify the required parameter 'petId' is set - if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { "api_key" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.ErrorMessage, response.ErrorMessage); - - return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers); - } - - /// - /// Update an existing pet - /// - /// Pet object that needs to be added to the store - /// - public void UpdatePet (Pet pet) - { - - // verify the required parameter 'pet' is set - if (pet == null) throw new ApiException(400, "Missing required parameter 'pet' when calling UpdatePet"); - - - var path = "/pet"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(pet); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Updates a pet in the store with form data - /// - /// ID of pet that needs to be updated - /// Updated name of the pet - /// Updated status of the pet - /// - public void UpdatePetWithForm (long? petId, string name, string status) - { - - // verify the required parameter 'petId' is set - if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm"); - - - var path = "/pet/{petId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter -if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// uploads an image - /// - /// ID of pet to update - /// Additional data to pass to server - /// file to upload - /// ApiResponse - public ApiResponse UploadFile (long? petId, string additionalMetadata, System.IO.Stream file) - { - - // verify the required parameter 'petId' is set - if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile"); - - - var path = "/pet/{petId}/uploadImage"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter -if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file)); - - // authentication setting, if any - String[] authSettings = new String[] { "petstore_auth" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.ErrorMessage, response.ErrorMessage); - - return (ApiResponse) ApiClient.Deserialize(response.Content, typeof(ApiResponse), response.Headers); - } - - } -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs deleted file mode 100644 index c23c321d637..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs +++ /dev/null @@ -1,236 +0,0 @@ -using System; -using System.Collections.Generic; -using RestSharp; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Org.OpenAPITools.Api -{ - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public interface IStoreApi - { - /// - /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - /// - /// ID of the order that needs to be deleted - /// - void DeleteOrder (string orderId); - /// - /// Returns pet inventories by status Returns a map of status codes to quantities - /// - /// Dictionary<string, int?> - Dictionary GetInventory (); - /// - /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - /// - /// ID of pet that needs to be fetched - /// Order - Order GetOrderById (long? orderId); - /// - /// Place an order for a pet - /// - /// order placed for purchasing the pet - /// Order - Order PlaceOrder (Order order); - } - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class StoreApi : IStoreApi - { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// - public StoreApi(ApiClient apiClient = null) - { - if (apiClient == null) // use the default one in Configuration - this.ApiClient = Configuration.DefaultApiClient; - else - this.ApiClient = apiClient; - } - - /// - /// Initializes a new instance of the class. - /// - /// - public StoreApi(String basePath) - { - this.ApiClient = new ApiClient(basePath); - } - - /// - /// Sets the base path of the API client. - /// - /// The base path - /// The base path - public void SetBasePath(String basePath) - { - this.ApiClient.BasePath = basePath; - } - - /// - /// Gets the base path of the API client. - /// - /// The base path - /// The base path - public String GetBasePath(String basePath) - { - return this.ApiClient.BasePath; - } - - /// - /// Gets or sets the API client. - /// - /// An instance of the ApiClient - public ApiClient ApiClient {get; set;} - - /// - /// Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - /// - /// ID of the order that needs to be deleted - /// - public void DeleteOrder (string orderId) - { - - // verify the required parameter 'orderId' is set - if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder"); - - - var path = "/store/order/{orderId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Returns pet inventories by status Returns a map of status codes to quantities - /// - /// Dictionary<string, int?> - public Dictionary GetInventory () - { - - - var path = "/store/inventory"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { "api_key" }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.ErrorMessage, response.ErrorMessage); - - return (Dictionary) ApiClient.Deserialize(response.Content, typeof(Dictionary), response.Headers); - } - - /// - /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - /// - /// ID of pet that needs to be fetched - /// Order - public Order GetOrderById (long? orderId) - { - - // verify the required parameter 'orderId' is set - if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById"); - - - var path = "/store/order/{orderId}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.ErrorMessage, response.ErrorMessage); - - return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers); - } - - /// - /// Place an order for a pet - /// - /// order placed for purchasing the pet - /// Order - public Order PlaceOrder (Order order) - { - - // verify the required parameter 'order' is set - if (order == null) throw new ApiException(400, "Missing required parameter 'order' when calling PlaceOrder"); - - - var path = "/store/order"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(order); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.ErrorMessage, response.ErrorMessage); - - return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers); - } - - } -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs deleted file mode 100644 index 60a0ccac599..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/UserApi.cs +++ /dev/null @@ -1,420 +0,0 @@ -using System; -using System.Collections.Generic; -using RestSharp; -using Org.OpenAPITools.Client; -using Org.OpenAPITools.Model; - -namespace Org.OpenAPITools.Api -{ - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public interface IUserApi - { - /// - /// Create user This can only be done by the logged in user. - /// - /// Created user object - /// - void CreateUser (User user); - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - void CreateUsersWithArrayInput (List user); - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - void CreateUsersWithListInput (List user); - /// - /// Delete user This can only be done by the logged in user. - /// - /// The name that needs to be deleted - /// - void DeleteUser (string username); - /// - /// Get user by user name - /// - /// The name that needs to be fetched. Use user1 for testing. - /// User - User GetUserByName (string username); - /// - /// Logs user into the system - /// - /// The user name for login - /// The password for login in clear text - /// string - string LoginUser (string username, string password); - /// - /// Logs out current logged in user session - /// - /// - void LogoutUser (); - /// - /// Updated user This can only be done by the logged in user. - /// - /// name that need to be deleted - /// Updated user object - /// - void UpdateUser (string username, User user); - } - - /// - /// Represents a collection of functions to interact with the API endpoints - /// - public class UserApi : IUserApi - { - /// - /// Initializes a new instance of the class. - /// - /// an instance of ApiClient (optional) - /// - public UserApi(ApiClient apiClient = null) - { - if (apiClient == null) // use the default one in Configuration - this.ApiClient = Configuration.DefaultApiClient; - else - this.ApiClient = apiClient; - } - - /// - /// Initializes a new instance of the class. - /// - /// - public UserApi(String basePath) - { - this.ApiClient = new ApiClient(basePath); - } - - /// - /// Sets the base path of the API client. - /// - /// The base path - /// The base path - public void SetBasePath(String basePath) - { - this.ApiClient.BasePath = basePath; - } - - /// - /// Gets the base path of the API client. - /// - /// The base path - /// The base path - public String GetBasePath(String basePath) - { - return this.ApiClient.BasePath; - } - - /// - /// Gets or sets the API client. - /// - /// An instance of the ApiClient - public ApiClient ApiClient {get; set;} - - /// - /// Create user This can only be done by the logged in user. - /// - /// Created user object - /// - public void CreateUser (User user) - { - - // verify the required parameter 'user' is set - if (user == null) throw new ApiException(400, "Missing required parameter 'user' when calling CreateUser"); - - - var path = "/user"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(user); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - public void CreateUsersWithArrayInput (List user) - { - - // verify the required parameter 'user' is set - if (user == null) throw new ApiException(400, "Missing required parameter 'user' when calling CreateUsersWithArrayInput"); - - - var path = "/user/createWithArray"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(user); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Creates list of users with given input array - /// - /// List of user object - /// - public void CreateUsersWithListInput (List user) - { - - // verify the required parameter 'user' is set - if (user == null) throw new ApiException(400, "Missing required parameter 'user' when calling CreateUsersWithListInput"); - - - var path = "/user/createWithList"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(user); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Delete user This can only be done by the logged in user. - /// - /// The name that needs to be deleted - /// - public void DeleteUser (string username) - { - - // verify the required parameter 'username' is set - if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Get user by user name - /// - /// The name that needs to be fetched. Use user1 for testing. - /// User - public User GetUserByName (string username) - { - - // verify the required parameter 'username' is set - if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.ErrorMessage, response.ErrorMessage); - - return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers); - } - - /// - /// Logs user into the system - /// - /// The user name for login - /// The password for login in clear text - /// string - public string LoginUser (string username, string password) - { - - // verify the required parameter 'username' is set - if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling LoginUser"); - - // verify the required parameter 'password' is set - if (password == null) throw new ApiException(400, "Missing required parameter 'password' when calling LoginUser"); - - - var path = "/user/login"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter - if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.ErrorMessage, response.ErrorMessage); - - return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers); - } - - /// - /// Logs out current logged in user session - /// - /// - public void LogoutUser () - { - - - var path = "/user/logout"; - path = path.Replace("{format}", "json"); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - /// - /// Updated user This can only be done by the logged in user. - /// - /// name that need to be deleted - /// Updated user object - /// - public void UpdateUser (string username, User user) - { - - // verify the required parameter 'username' is set - if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser"); - - // verify the required parameter 'user' is set - if (user == null) throw new ApiException(400, "Missing required parameter 'user' when calling UpdateUser"); - - - var path = "/user/{username}"; - path = path.Replace("{format}", "json"); - path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username)); - - var queryParams = new Dictionary(); - var headerParams = new Dictionary(); - var formParams = new Dictionary(); - var fileParams = new Dictionary(); - String postBody = null; - - postBody = ApiClient.Serialize(user); // http body (model) parameter - - // authentication setting, if any - String[] authSettings = new String[] { }; - - // make the HTTP request - IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings); - - if (((int)response.StatusCode) >= 400) - throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content); - else if (((int)response.StatusCode) == 0) - throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.ErrorMessage, response.ErrorMessage); - - return; - } - - } -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs deleted file mode 100644 index 5903fde02ad..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs +++ /dev/null @@ -1,297 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Text.RegularExpressions; -using System.IO; -using System.Web; -using System.Linq; -using System.Net; -using System.Text; -using Newtonsoft.Json; -using RestSharp; -using RestSharp.Extensions; - -namespace Org.OpenAPITools.Client -{ - /// - /// API client is mainly responsible for making the HTTP call to the API backend. - /// - public class ApiClient - { - private readonly Dictionary _defaultHeaderMap = new Dictionary(); - - /// - /// Initializes a new instance of the class. - /// - /// The base path. - public ApiClient(String basePath="http://petstore.swagger.io/v2") - { - BasePath = basePath; - RestClient = new RestClient(BasePath); - } - - /// - /// Gets or sets the base path. - /// - /// The base path - public string BasePath { get; set; } - - /// - /// Gets or sets the RestClient. - /// - /// An instance of the RestClient - public RestClient RestClient { get; set; } - - /// - /// Gets the default header. - /// - public Dictionary DefaultHeader - { - get { return _defaultHeaderMap; } - } - - /// - /// Makes the HTTP request (Sync). - /// - /// URL path. - /// HTTP method. - /// Query parameters. - /// HTTP body (POST request). - /// Header parameters. - /// Form parameters. - /// File parameters. - /// Authentication settings. - /// Object - public Object CallApi(String path, RestSharp.Method method, Dictionary queryParams, String postBody, - Dictionary headerParams, Dictionary formParams, - Dictionary fileParams, String[] authSettings) - { - - var request = new RestRequest(path, method); - - UpdateParamsForAuth(queryParams, headerParams, authSettings); - - // add default header, if any - foreach(var defaultHeader in _defaultHeaderMap) - request.AddHeader(defaultHeader.Key, defaultHeader.Value); - - // add header parameter, if any - foreach(var param in headerParams) - request.AddHeader(param.Key, param.Value); - - // add query parameter, if any - foreach(var param in queryParams) - request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost); - - // add form parameter, if any - foreach(var param in formParams) - request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost); - - // add file parameter, if any - foreach(var param in fileParams) - request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType); - - if (postBody != null) // http body (model) parameter - request.AddParameter("application/json", postBody, ParameterType.RequestBody); - - return (Object)RestClient.Execute(request); - - } - - /// - /// Add default header. - /// - /// Header field name. - /// Header field value. - /// - public void AddDefaultHeader(string key, string value) - { - _defaultHeaderMap.Add(key, value); - } - - /// - /// Escape string (url-encoded). - /// - /// String to be escaped. - /// Escaped string. - public string EscapeString(string str) - { - return RestSharp.Contrib.HttpUtility.UrlEncode(str); - } - - /// - /// Create FileParameter based on Stream. - /// - /// Parameter name. - /// Input stream. - /// FileParameter. - public FileParameter ParameterToFile(string name, Stream stream) - { - if (stream is FileStream) - return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name)); - else - return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided"); - } - - /// - /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime. - /// If parameter is a list of string, join the list with ",". - /// Otherwise just return the string. - /// - /// The parameter (header, path, query, form). - /// Formatted string. - public string ParameterToString(object obj) - { - if (obj is DateTime) - // Return a formatted date string - Can be customized with Configuration.DateTimeFormat - // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") - // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 - // For example: 2009-06-15T13:45:30.0000000 - return ((DateTime)obj).ToString (Configuration.DateTimeFormat); - else if (obj is List) - return String.Join(",", (obj as List).ToArray()); - else - return Convert.ToString (obj); - } - - /// - /// Deserialize the JSON string into a proper object. - /// - /// HTTP body (e.g. string, JSON). - /// Object type. - /// HTTP headers. - /// Object representation of the JSON string. - public object Deserialize(string content, Type type, IList headers=null) - { - if (type == typeof(Object)) // return an object - { - return content; - } - - if (type == typeof(Stream)) - { - var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath) - ? Path.GetTempPath() - : Configuration.TempFolderPath; - - var fileName = filePath + Guid.NewGuid(); - if (headers != null) - { - var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$"); - var match = regex.Match(headers.ToString()); - if (match.Success) - fileName = filePath + match.Value.Replace("\"", "").Replace("'", ""); - } - File.WriteAllText(fileName, content); - return new FileStream(fileName, FileMode.Open); - - } - - if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object - { - return DateTime.Parse(content, null, System.Globalization.DateTimeStyles.RoundtripKind); - } - - if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type - { - return ConvertType(content, type); - } - - // at this point, it must be a model (json) - try - { - return JsonConvert.DeserializeObject(content, type); - } - catch (IOException e) - { - throw new ApiException(500, e.Message); - } - } - - /// - /// Serialize an object into JSON string. - /// - /// Object. - /// JSON string. - public string Serialize(object obj) - { - try - { - return obj != null ? JsonConvert.SerializeObject(obj) : null; - } - catch (Exception e) - { - throw new ApiException(500, e.Message); - } - } - - /// - /// Get the API key with prefix. - /// - /// API key identifier (authentication scheme). - /// API key with prefix. - public string GetApiKeyWithPrefix (string apiKeyIdentifier) - { - var apiKeyValue = ""; - Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue); - var apiKeyPrefix = ""; - if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix)) - return apiKeyPrefix + " " + apiKeyValue; - else - return apiKeyValue; - } - - /// - /// Update parameters based on authentication. - /// - /// Query parameters. - /// Header parameters. - /// Authentication settings. - public void UpdateParamsForAuth(Dictionary queryParams, Dictionary headerParams, string[] authSettings) - { - if (authSettings == null || authSettings.Length == 0) - return; - - foreach (string auth in authSettings) - { - // determine which one to use - switch(auth) - { - case "api_key": - headerParams["api_key"] = GetApiKeyWithPrefix("api_key"); - - break; - case "petstore_auth": - - //TODO support oauth - break; - default: - //TODO show warning about security definition not found - break; - } - } - } - - /// - /// Encode string in base64 format. - /// - /// String to be encoded. - /// Encoded string. - public static string Base64Encode(string text) - { - var textByte = System.Text.Encoding.UTF8.GetBytes(text); - return System.Convert.ToBase64String(textByte); - } - - /// - /// Dynamically cast the object into target type. - /// - /// Object to be casted - /// Target type - /// Casted object - public static Object ConvertType(Object fromObject, Type toObject) { - return Convert.ChangeType(fromObject, toObject); - } - - } -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs deleted file mode 100644 index 7985897b93e..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiException.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; - -namespace Org.OpenAPITools.Client { - /// - /// API Exception - /// - public class ApiException : Exception { - /// - /// Gets or sets the error code (HTTP status code) - /// - /// The error code (HTTP status code). - public int ErrorCode { get; set; } - - /// - /// Gets or sets the error content (body json object) - /// - /// The error content (Http response body). - public Object ErrorContent { get; private set; } - - /// - /// Initializes a new instance of the class. - /// - public ApiException() {} - - /// - /// Initializes a new instance of the class. - /// - /// HTTP status code. - /// Error message. - public ApiException(int errorCode, string message) : base(message) { - this.ErrorCode = errorCode; - } - - /// - /// Initializes a new instance of the class. - /// - /// HTTP status code. - /// Error message. - /// Error content. - public ApiException(int errorCode, string message, Object errorContent = null) : base(message) { - this.ErrorCode = errorCode; - this.ErrorContent = errorContent; - } - - } - -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs deleted file mode 100644 index 7546607fa99..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.Reflection; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; - -namespace Org.OpenAPITools.Client -{ - /// - /// Represents a set of configuration settings - /// - public class Configuration - { - - /// - /// Version of the package. - /// - /// Version of the package. - public const string Version = "1.0.0"; - - /// - /// Gets or sets the default API client for making HTTP calls. - /// - /// The API client. - public static ApiClient DefaultApiClient = new ApiClient(); - - /// - /// Gets or sets the username (HTTP basic authentication). - /// - /// The username. - public static String Username { get; set; } - - /// - /// Gets or sets the password (HTTP basic authentication). - /// - /// The password. - public static String Password { get; set; } - - /// - /// Gets or sets the API key based on the authentication name. - /// - /// The API key. - public static Dictionary ApiKey = new Dictionary(); - - /// - /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name. - /// - /// The prefix of the API key. - public static Dictionary ApiKeyPrefix = new Dictionary(); - - private static string _tempFolderPath = Path.GetTempPath(); - - /// - /// Gets or sets the temporary folder path to store the files downloaded from the server. - /// - /// Folder path. - public static String TempFolderPath - { - get { return _tempFolderPath; } - - set - { - if (String.IsNullOrEmpty(value)) - { - _tempFolderPath = value; - return; - } - - // create the directory if it does not exist - if (!Directory.Exists(value)) - Directory.CreateDirectory(value); - - // check if the path contains directory separator at the end - if (value[value.Length - 1] == Path.DirectorySeparatorChar) - _tempFolderPath = value; - else - _tempFolderPath = value + Path.DirectorySeparatorChar; - } - } - - private const string ISO8601_DATETIME_FORMAT = "o"; - - private static string _dateTimeFormat = ISO8601_DATETIME_FORMAT; - - /// - /// Gets or sets the date time format used when serializing in the ApiClient - /// By default, it's set to ISO 8601 - "o", for others see: - /// https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx - /// and https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx - /// No validation is done to ensure that the string you're providing is valid - /// - /// The DateTimeFormat string - public static String DateTimeFormat - { - get - { - return _dateTimeFormat; - } - set - { - if (string.IsNullOrEmpty(value)) - { - // Never allow a blank or null string, go back to the default - _dateTimeFormat = ISO8601_DATETIME_FORMAT; - return; - } - - // Caution, no validation when you choose date time format other than ISO 8601 - // Take a look at the above links - _dateTimeFormat = value; - } - } - - /// - /// Returns a string with essential information for debugging. - /// - public static String ToDebugReport() - { - String report = "C# SDK (Org.OpenAPITools) Debug Report:\n"; - report += " OS: " + Environment.OSVersion + "\n"; - report += " .NET Framework Version: " + Assembly - .GetExecutingAssembly() - .GetReferencedAssemblies() - .Where(x => x.Name == "System.Core").First().Version.ToString() + "\n"; - report += " Version of the API: 1.0.0\n"; - report += " SDK Package Version: 1.0.0\n"; - - return report; - } - } -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs deleted file mode 100644 index 648aaeba5b1..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/ApiResponse.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// Describes the result of uploading an image resource - /// - [DataContract] - public class ApiResponse { - /// - /// Gets or Sets Code - /// - [DataMember(Name="code", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "code")] - public int? Code { get; set; } - - /// - /// Gets or Sets Type - /// - [DataMember(Name="type", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "type")] - public string Type { get; set; } - - /// - /// Gets or Sets Message - /// - [DataMember(Name="message", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "message")] - public string Message { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class ApiResponse {\n"); - sb.Append(" Code: ").Append(Code).Append("\n"); - sb.Append(" Type: ").Append(Type).Append("\n"); - sb.Append(" Message: ").Append(Message).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs deleted file mode 100644 index 847279502e2..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Category.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// A category for a pet - /// - [DataContract] - public class Category { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets Name - /// - [DataMember(Name="name", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "name")] - public string Name { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class Category {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs deleted file mode 100644 index c19511ca3f8..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Order.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// An order for a pets from the pet store - /// - [DataContract] - public class Order { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets PetId - /// - [DataMember(Name="petId", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "petId")] - public long? PetId { get; set; } - - /// - /// Gets or Sets Quantity - /// - [DataMember(Name="quantity", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "quantity")] - public int? Quantity { get; set; } - - /// - /// Gets or Sets ShipDate - /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "shipDate")] - public DateTime? ShipDate { get; set; } - - /// - /// Order Status - /// - /// Order Status - [DataMember(Name="status", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "status")] - public string Status { get; set; } - - /// - /// Gets or Sets Complete - /// - [DataMember(Name="complete", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "complete")] - public bool? Complete { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class Order {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" PetId: ").Append(PetId).Append("\n"); - sb.Append(" Quantity: ").Append(Quantity).Append("\n"); - sb.Append(" ShipDate: ").Append(ShipDate).Append("\n"); - sb.Append(" Status: ").Append(Status).Append("\n"); - sb.Append(" Complete: ").Append(Complete).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs deleted file mode 100644 index 71ec62aa9c8..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Pet.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// A pet for sale in the pet store - /// - [DataContract] - public class Pet { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets Category - /// - [DataMember(Name="category", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "category")] - public Category Category { get; set; } - - /// - /// Gets or Sets Name - /// - [DataMember(Name="name", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "name")] - public string Name { get; set; } - - /// - /// Gets or Sets PhotoUrls - /// - [DataMember(Name="photoUrls", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "photoUrls")] - public List PhotoUrls { get; set; } - - /// - /// Gets or Sets Tags - /// - [DataMember(Name="tags", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "tags")] - public List Tags { get; set; } - - /// - /// pet status in the store - /// - /// pet status in the store - [DataMember(Name="status", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "status")] - public string Status { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class Pet {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Category: ").Append(Category).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" PhotoUrls: ").Append(PhotoUrls).Append("\n"); - sb.Append(" Tags: ").Append(Tags).Append("\n"); - sb.Append(" Status: ").Append(Status).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs deleted file mode 100644 index 6399695a50a..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/Tag.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// A tag for a pet - /// - [DataContract] - public class Tag { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets Name - /// - [DataMember(Name="name", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "name")] - public string Name { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class Tag {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs deleted file mode 100644 index c6af059dcdc..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Model/User.cs +++ /dev/null @@ -1,101 +0,0 @@ -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Model { - - /// - /// A User who is purchasing from the pet store - /// - [DataContract] - public class User { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "id")] - public long? Id { get; set; } - - /// - /// Gets or Sets Username - /// - [DataMember(Name="username", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "username")] - public string Username { get; set; } - - /// - /// Gets or Sets FirstName - /// - [DataMember(Name="firstName", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "firstName")] - public string FirstName { get; set; } - - /// - /// Gets or Sets LastName - /// - [DataMember(Name="lastName", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "lastName")] - public string LastName { get; set; } - - /// - /// Gets or Sets Email - /// - [DataMember(Name="email", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "email")] - public string Email { get; set; } - - /// - /// Gets or Sets Password - /// - [DataMember(Name="password", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "password")] - public string Password { get; set; } - - /// - /// Gets or Sets Phone - /// - [DataMember(Name="phone", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "phone")] - public string Phone { get; set; } - - /// - /// User Status - /// - /// User Status - [DataMember(Name="userStatus", EmitDefaultValue=false)] - [JsonProperty(PropertyName = "userStatus")] - public int? UserStatus { get; set; } - - - /// - /// Get the string presentation of the object - /// - /// String presentation of the object - public override string ToString() { - var sb = new StringBuilder(); - sb.Append("class User {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Username: ").Append(Username).Append("\n"); - sb.Append(" FirstName: ").Append(FirstName).Append("\n"); - sb.Append(" LastName: ").Append(LastName).Append("\n"); - sb.Append(" Email: ").Append(Email).Append("\n"); - sb.Append(" Password: ").Append(Password).Append("\n"); - sb.Append(" Phone: ").Append(Phone).Append("\n"); - sb.Append(" UserStatus: ").Append(UserStatus).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Get the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() { - return JsonConvert.SerializeObject(this, Formatting.Indented); - } - -} -} diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config deleted file mode 100644 index 7b9cf186303..00000000000 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From 140d941da2e48268624cd83dde95492f9294d5a1 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 10 Mar 2023 15:18:41 +0800 Subject: [PATCH 016/131] [csharp-netcore] Add unsigned integer/long support (#14885) * add unsigned integer/long support to c# netcore client * undo change in test spec, samples * new test spec * update doc --- docs/generators/aspnetcore.md | 4 + docs/generators/csharp-netcore-functions.md | 4 + docs/generators/csharp-netcore.md | 4 + docs/generators/csharp.md | 4 + .../openapitools/codegen/DefaultCodegen.java | 12 +- .../languages/AbstractCSharpCodegen.java | 17 +- .../languages/CSharpClientCodegen.java | 7 +- .../languages/CSharpNetCoreClientCodegen.java | 7 +- .../codegen/utils/ModelUtils.java | 18 ++ .../CSharpNetCoreClientCodegenTest.java | 38 ++++ .../src/test/resources/3_0/unsigned-test.yaml | 176 ++++++++++++++++++ 11 files changed, 281 insertions(+), 10 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/unsigned-test.yaml diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md index ed22b580275..a5792b6757c 100644 --- a/docs/generators/aspnetcore.md +++ b/docs/generators/aspnetcore.md @@ -105,6 +105,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
      1. long
      2. long?
      3. string
      4. +
      5. uint
      6. +
      7. uint?
      8. +
      9. ulong
      10. +
      11. ulong?
      12. ## RESERVED WORDS diff --git a/docs/generators/csharp-netcore-functions.md b/docs/generators/csharp-netcore-functions.md index a5b638c5127..49b53ed219d 100644 --- a/docs/generators/csharp-netcore-functions.md +++ b/docs/generators/csharp-netcore-functions.md @@ -98,6 +98,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
      13. long
      14. long?
      15. string
      16. +
      17. uint
      18. +
      19. uint?
      20. +
      21. ulong
      22. +
      23. ulong?
      24. ## RESERVED WORDS diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md index 803611ed316..4f972b041c6 100644 --- a/docs/generators/csharp-netcore.md +++ b/docs/generators/csharp-netcore.md @@ -99,6 +99,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
      25. long
      26. long?
      27. string
      28. +
      29. uint
      30. +
      31. uint?
      32. +
      33. ulong
      34. +
      35. ulong?
      36. ## RESERVED WORDS diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md index 59b874beb44..2dff47951a6 100644 --- a/docs/generators/csharp.md +++ b/docs/generators/csharp.md @@ -93,6 +93,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
      37. long
      38. long?
      39. string
      40. +
      41. uint
      42. +
      43. uint?
      44. +
      45. ulong
      46. +
      47. ulong?
      48. ## RESERVED WORDS 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 aad7d5946d5..42d80759838 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 @@ -1728,9 +1728,11 @@ public class DefaultCodegen implements CodegenConfig { typeMapping.put("DateTime", "Date"); typeMapping.put("long", "Long"); typeMapping.put("short", "Short"); + typeMapping.put("integer", "Integer"); + typeMapping.put("UnsignedInteger", "Integer"); + typeMapping.put("UnsignedLong", "Long"); typeMapping.put("char", "String"); typeMapping.put("object", "Object"); - typeMapping.put("integer", "Integer"); // FIXME: java specific type should be in Java Based Abstract Impl's typeMapping.put("ByteArray", "byte[]"); typeMapping.put("binary", "File"); @@ -2394,8 +2396,14 @@ public class DefaultCodegen implements CodegenConfig { return "number"; } } else if (ModelUtils.isIntegerSchema(schema)) { - if (ModelUtils.isLongSchema(schema)) { + if (ModelUtils.isUnsignedLongSchema(schema)) { + return "UnsignedLong"; + } else if (ModelUtils.isUnsignedIntegerSchema(schema)) { + return "UnsignedInteger"; + } else if (ModelUtils.isLongSchema(schema)) { return "long"; + } else if (ModelUtils.isShortSchema(schema)) {// int32 + return "integer"; } else { return schema.getType(); // integer } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index 33a13db3351..badc5e62e82 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -160,8 +160,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co "decimal", "int?", "int", + "uint", + "uint?", "long?", "long", + "ulong", + "ulong?", "float?", "float", "byte[]", @@ -197,8 +201,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co typeMapping.put("ByteArray", "byte[]"); typeMapping.put("boolean", "bool?"); typeMapping.put("integer", "int?"); - typeMapping.put("float", "float?"); + typeMapping.put("UnsignedInteger", "uint?"); + typeMapping.put("UnsignedLong", "ulong?"); typeMapping.put("long", "long?"); + typeMapping.put("float", "float?"); typeMapping.put("double", "double?"); typeMapping.put("number", "decimal?"); typeMapping.put("BigDecimal", "decimal?"); @@ -215,11 +221,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co // nullable type nullableType = new HashSet<>( - Arrays.asList("decimal", "bool", "int", "float", "long", "double", "DateTime", "DateTimeOffset", "Guid") + Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double", + "DateTime", "DateTimeOffset", "Guid") ); // value Types valueTypes = new HashSet<>( - Arrays.asList("decimal", "bool", "int", "float", "long", "double") + Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double") ); this.setSortParamsByRequiredFlag(true); @@ -1334,7 +1341,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co // Per: https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/enum // The approved types for an enum are byte, sbyte, short, ushort, int, uint, long, or ulong. // but we're not supporting unsigned integral types or shorts. - if (datatype.startsWith("int") || datatype.startsWith("long") || datatype.startsWith("byte")) { + if (datatype.startsWith("int") || datatype.startsWith("uint") || + datatype.startsWith("long") || datatype.startsWith("ulong") || + datatype.startsWith("byte")) { return value; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index 153d9b4b471..4960f7b9219 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -123,8 +123,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { typeMapping.put("boolean", "bool"); typeMapping.put("integer", "int"); - typeMapping.put("float", "float"); typeMapping.put("long", "long"); + typeMapping.put("UnsignedInteger", "uint"); + typeMapping.put("UnsignedLong", "ulong"); + typeMapping.put("float", "float"); typeMapping.put("double", "double"); typeMapping.put("number", "decimal"); typeMapping.put("decimal", "decimal"); @@ -789,7 +791,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { } // number - if (datatype.startsWith("int") || datatype.startsWith("long") || + if (datatype.startsWith("int") || datatype.startsWith("uint") || + datatype.startsWith("ulong") || datatype.startsWith("long") || datatype.startsWith("double") || datatype.startsWith("float")) { String varName = "NUMBER_" + value; varName = varName.replaceAll("-", "MINUS_"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index ae7def89f95..757bcae3f1d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -153,8 +153,10 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { typeMapping.put("ByteArray", "byte[]"); typeMapping.put("boolean", "bool"); typeMapping.put("integer", "int"); - typeMapping.put("float", "float"); typeMapping.put("long", "long"); + typeMapping.put("UnsignedInteger", "uint"); + typeMapping.put("UnsignedLong", "ulong"); + typeMapping.put("float", "float"); typeMapping.put("double", "double"); typeMapping.put("number", "decimal"); typeMapping.put("decimal", "decimal"); @@ -1176,7 +1178,8 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { } // number - if (datatype.startsWith("int") || datatype.startsWith("long") || + if (datatype.startsWith("int") || datatype.startsWith("uint") || + datatype.startsWith("long") || datatype.startsWith("ulong") || datatype.startsWith("double") || datatype.startsWith("float")) { String varName = "NUMBER_" + value; varName = varName.replaceAll("-", "MINUS_"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index a392325eb81..974cd2228a5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -606,6 +606,15 @@ public class ModelUtils { return false; } + public static boolean isUnsignedIntegerSchema(Schema schema) { + if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) && // type: integer + ("int32".equals(schema.getFormat()) || schema.getFormat() == null) && // format: int32 + (schema.getExtensions() != null && (Boolean) schema.getExtensions().getOrDefault("x-unsigned", Boolean.FALSE))) { // x-unsigned: true + return true; + } + return false; + } + public static boolean isLongSchema(Schema schema) { if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer && SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat())) { // format: long (int64) @@ -614,6 +623,15 @@ public class ModelUtils { return false; } + public static boolean isUnsignedLongSchema(Schema schema) { + if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) && // type: integer + "int64".equals(schema.getFormat()) && // format: int64 + (schema.getExtensions() != null && (Boolean) schema.getExtensions().getOrDefault("x-unsigned", Boolean.FALSE))) { // x-unsigned: true + return true; + } + return false; + } + public static boolean isBooleanSchema(Schema schema) { if (schema instanceof BooleanSchema) { return true; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientCodegenTest.java index 3a6ce1df371..2f865064b7f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientCodegenTest.java @@ -16,7 +16,13 @@ package org.openapitools.codegen.csharpnetcore; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.media.Schema; +import org.openapitools.codegen.CodegenModel; +import org.openapitools.codegen.CodegenProperty; +import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen; +import org.openapitools.codegen.languages.JavaClientCodegen; import org.testng.Assert; import org.testng.annotations.Test; @@ -37,4 +43,36 @@ public class CSharpNetCoreClientCodegenTest { // Assert.assertEquals(codegen.toEnumVarName("FOO-BAR", "string"), "FooBar"); // Assert.assertEquals(codegen.toEnumVarName("FOO_BAR", "string"), "FooBar"); } + + @Test + public void testUnsigned() { + // test unsigned integer/long + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/unsigned-test.yaml"); + CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen(); + + Schema test1 = openAPI.getComponents().getSchemas().get("format_test"); + codegen.setOpenAPI(openAPI); + CodegenModel cm1 = codegen.fromModel("format_test", test1); + Assert.assertEquals(cm1.getClassname(), "FormatTest"); + + final CodegenProperty property1 = cm1.allVars.get(2); + Assert.assertEquals(property1.baseName, "unsigned_integer"); + Assert.assertEquals(property1.dataType, "uint"); + Assert.assertEquals(property1.vendorExtensions.get("x-unsigned"), Boolean.TRUE); + Assert.assertTrue(property1.isPrimitiveType); + Assert.assertTrue(property1.isInteger); + Assert.assertFalse(property1.isContainer); + Assert.assertFalse(property1.isFreeFormObject); + Assert.assertFalse(property1.isAnyType); + + final CodegenProperty property2 = cm1.allVars.get(4); + Assert.assertEquals(property2.baseName, "unsigned_long"); + Assert.assertEquals(property2.dataType, "ulong"); + Assert.assertEquals(property2.vendorExtensions.get("x-unsigned"), Boolean.TRUE); + Assert.assertTrue(property2.isPrimitiveType); + Assert.assertTrue(property2.isLong); + Assert.assertFalse(property2.isContainer); + Assert.assertFalse(property2.isFreeFormObject); + Assert.assertFalse(property2.isAnyType); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/unsigned-test.yaml b/modules/openapi-generator/src/test/resources/3_0/unsigned-test.yaml new file mode 100644 index 00000000000..2c7073528db --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/unsigned-test.yaml @@ -0,0 +1,176 @@ +openapi: 3.0.0 +info: + description: >- + This spec is mainly for testing Petstore server and contains fake endpoints, + models. Please do not use this for any other purpose. Special characters: " + \ + version: 1.0.0 + title: OpenAPI Petstore + license: + name: Apache-2.0 + url: 'https://www.apache.org/licenses/LICENSE-2.0.html' +tags: + - name: pet + description: Everything about your Pets + - name: store + description: Access to Petstore orders + - name: user + description: Operations about user +paths: + /foo: + get: + responses: + default: + description: response + content: + application/json: + schema: + type: object + properties: + string: + $ref: '#/components/schemas/Foo' +servers: + - url: 'http://{server}.swagger.io:{port}/v2' + description: petstore server + variables: + server: + enum: + - 'petstore' + - 'qa-petstore' + - 'dev-petstore' + default: 'petstore' + port: + enum: + - 80 + - 8080 + default: 80 + - url: https://localhost:8080/{version} + description: The local server + variables: + version: + enum: + - 'v1' + - 'v2' + default: 'v2' + - url: https://127.0.0.1/no_variable + description: The local server without variables +components: + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog' + scopes: + 'write:pets': modify pets in your account + 'read:pets': read your pets + api_key: + type: apiKey + name: api_key + in: header + api_key_query: + type: apiKey + name: api_key_query + in: query + http_basic_test: + type: http + scheme: basic + bearer_test: + type: http + scheme: bearer + bearerFormat: JWT + http_signature_test: + # Test the 'HTTP signature' security scheme. + # Each HTTP request is cryptographically signed as specified + # in https://datatracker.ietf.org/doc/draft-cavage-http-signatures/ + type: http + scheme: signature + schemas: + Foo: + type: object + properties: + bar: + $ref: '#/components/schemas/Bar' + format_test: + type: object + required: + - number + - byte + - date + - password + properties: + integer: + type: integer + maximum: 100 + minimum: 10 + multipleOf: 2 + int32: + type: integer + format: int32 + maximum: 200 + minimum: 20 + unsigned_integer: + type: integer + format: int32 + maximum: 200 + minimum: 20 + x-unsigned: true + int64: + type: integer + format: int64 + unsigned_long: + type: integer + format: int64 + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + type: number + multipleOf: 32.5 + float: + type: number + format: float + maximum: 987.6 + minimum: 54.3 + double: + type: number + format: double + maximum: 123.4 + minimum: 67.8 + decimal: + type: string + format: number + string: + type: string + pattern: '/[a-z]/i' + byte: + type: string + format: byte + binary: + type: string + format: binary + date: + type: string + format: date + example: '2020-02-02' + dateTime: + type: string + format: date-time + example: '2007-12-03T10:15:30+01:00' + uuid: + type: string + format: uuid + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + password: + type: string + format: password + maxLength: 64 + minLength: 10 + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + type: string + pattern: '^\d{10}$' + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. + type: string + pattern: '/^image_\d{1,3}$/i' From 2b7007b653bdc0bab12104d6cac2db6ec56941a0 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sun, 12 Mar 2023 03:05:35 -0400 Subject: [PATCH 017/131] [csharp-netcore] Moved formats to separate file (#14894) * add unsigned integer/long support to c# netcore client * moved formats to separate file * moved formats to cli options * moved formats to cli options * reverted unintended changes * reverted unintended changes --------- Co-authored-by: William Cheng --- docs/generators/csharp-netcore.md | 2 ++ .../languages/AbstractCSharpCodegen.java | 26 +++++++++++++++++++ .../languages/CSharpNetCoreClientCodegen.java | 8 ++++++ .../generichost/JsonConverter.mustache | 4 +-- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../Org.OpenAPITools/Model/NullableClass.cs | 2 +- 13 files changed, 47 insertions(+), 11 deletions(-) diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md index 4f972b041c6..1514d9686da 100644 --- a/docs/generators/csharp-netcore.md +++ b/docs/generators/csharp-netcore.md @@ -22,6 +22,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |apiName|Must be a valid C# class name. Only used in Generic Host library. Default: Api| |Api| |caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false| |conditionalSerialization|Serialize only those properties which are initialized by user, accepted values are true or false, default value is false.| |false| +|dateFormat|The default DateTime format.| |yyyy'-'MM'-'dd| +|dateTimeFormat|The default DateTime format.| |yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
        **false**
        The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
        **true**
        Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
        |true| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| |interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index badc5e62e82..f5329c992c8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -70,6 +70,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co protected String packageCompany = "OpenAPI"; protected String packageCopyright = "No Copyright"; protected String packageAuthors = "OpenAPI"; + public static final String DATE_FORMAT = "dateFormat"; + protected String dateFormat = "yyyy'-'MM'-'dd"; + public static final String DATETIME_FORMAT = "dateTimeFormat"; + protected String dateTimeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK"; protected String interfacePrefix = "I"; protected String enumNameSuffix = "Enum"; @@ -333,6 +337,20 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co additionalProperties.put(CodegenConstants.PACKAGE_PRODUCTNAME, packageProductName); } + // {{dateFormat}} + if (additionalProperties.containsKey(DATE_FORMAT)) { + setDateFormat((String) additionalProperties.get(DATE_FORMAT)); + } else { + additionalProperties.put(DATE_FORMAT, this.dateFormat); + } + + // {{dateTimeFormat}} + if (additionalProperties.containsKey(DATETIME_FORMAT)) { + setDateTimeFormat((String) additionalProperties.get(DATETIME_FORMAT)); + } else { + additionalProperties.put(DATETIME_FORMAT, this.dateTimeFormat); + } + // {{packageDescription}} if (additionalProperties.containsKey(CodegenConstants.PACKAGE_DESCRIPTION)) { setPackageDescription((String) additionalProperties.get(CodegenConstants.PACKAGE_DESCRIPTION)); @@ -1269,6 +1287,14 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co this.packageProductName = packageProductName; } + public void setDateFormat(String dateFormat) { + this.dateFormat = dateFormat; + } + + public void setDateTimeFormat(String dateTimeFormat) { + this.dateTimeFormat = dateTimeFormat; + } + public void setPackageDescription(String packageDescription) { this.packageDescription = packageDescription; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index 757bcae3f1d..297740310f8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -219,6 +219,14 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { CodegenConstants.PACKAGE_TAGS_DESC, this.packageTags); + addOption(DATE_FORMAT, + "The default DateTime format.", + this.dateFormat); + + addOption(DATETIME_FORMAT, + "The default DateTime format.", + this.dateTimeFormat); + CliOption framework = new CliOption( CodegenConstants.DOTNET_FRAMEWORK, CodegenConstants.DOTNET_FRAMEWORK_DESC diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache index 33d337de59e..c23c90ac9a0 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache @@ -8,14 +8,14 @@ /// /// The format to use to serialize {{name}} /// - public static string {{name}}Format { get; set; } = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK"; + public static string {{name}}Format { get; set; } = "{{{dateTimeFormat}}}"; {{/isDateTime}} {{#isDate}} /// /// The format to use to serialize {{name}} /// - public static string {{name}}Format { get; set; } = "yyyy-MM-dd"; + public static string {{name}}Format { get; set; } = "{{{dateFormat}}}"; {{/isDate}} {{/allVars}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 4ed685bcfd4..8066fb36e45 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -93,7 +93,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize DateOnlyProperty /// - public static string DateOnlyPropertyFormat { get; set; } = "yyyy-MM-dd"; + public static string DateOnlyPropertyFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// A Json reader. diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index 81c3bb07625..ff233300582 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -368,7 +368,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize Date /// - public static string DateFormat { get; set; } = "yyyy-MM-dd"; + public static string DateFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// The format to use to serialize DateTime diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs index 90755599f3a..c6f757d9bc3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs @@ -189,7 +189,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize DateProp /// - public static string DatePropFormat { get; set; } = "yyyy-MM-dd"; + public static string DatePropFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// The format to use to serialize DatetimeProp diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index eaf1ee5431b..bfd5d66a51b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -91,7 +91,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize DateOnlyProperty /// - public static string DateOnlyPropertyFormat { get; set; } = "yyyy-MM-dd"; + public static string DateOnlyPropertyFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// A Json reader. diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index 795e741d1a1..2151eb6e51c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -366,7 +366,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize Date /// - public static string DateFormat { get; set; } = "yyyy-MM-dd"; + public static string DateFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// The format to use to serialize DateTime diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs index fe0f847dc9d..4736c82a1d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -187,7 +187,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize DateProp /// - public static string DatePropFormat { get; set; } = "yyyy-MM-dd"; + public static string DatePropFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// The format to use to serialize DatetimeProp diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index eaf1ee5431b..bfd5d66a51b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -91,7 +91,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize DateOnlyProperty /// - public static string DateOnlyPropertyFormat { get; set; } = "yyyy-MM-dd"; + public static string DateOnlyPropertyFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// A Json reader. diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index 795e741d1a1..2151eb6e51c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -366,7 +366,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize Date /// - public static string DateFormat { get; set; } = "yyyy-MM-dd"; + public static string DateFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// The format to use to serialize DateTime diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs index fe0f847dc9d..4736c82a1d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -187,7 +187,7 @@ namespace Org.OpenAPITools.Model /// /// The format to use to serialize DateProp /// - public static string DatePropFormat { get; set; } = "yyyy-MM-dd"; + public static string DatePropFormat { get; set; } = "yyyy'-'MM'-'dd"; /// /// The format to use to serialize DatetimeProp From 3a940c93cc224108ce1d7ce8abb41a73991b87d8 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sun, 12 Mar 2023 03:07:54 -0400 Subject: [PATCH 018/131] [csharp-netcore][aspnetcore] Added examples (#14927) * added examples * added examples to aspnet --- .../resources/aspnetcore/2.0/model.mustache | 3 +++ .../resources/aspnetcore/2.1/model.mustache | 3 ++- .../resources/aspnetcore/3.0/model.mustache | 3 ++- .../modelGeneric.mustache | 8 +++++++- .../generichost/modelGeneric.mustache | 18 ++++++++++++++++++ .../csharp-netcore/modelGeneric.mustache | 6 ++++++ .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../Org.OpenAPITools/Model/DateOnlyClass.cs | 1 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 +++ .../Model/NullableGuidClass.cs | 1 + .../src/Org.OpenAPITools/Model/Order.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../src/Org.OpenAPITools/Model/Pet.cs | 1 + .../src/Org.OpenAPITools/Models/Pet.cs | 1 + .../src/Org.OpenAPITools/Models/Pet.cs | 1 + .../src/Org.OpenAPITools/Models/Pet.cs | 1 + .../src/Org.OpenAPITools/Models/Pet.cs | 1 + .../src/Org.OpenAPITools.Models/Pet.cs | 1 + .../src/Org.OpenAPITools/Models/Pet.cs | 1 + .../src/Org.OpenAPITools/Models/Pet.cs | 1 + 69 files changed, 123 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache index 4e8fa2022b2..c2d31c5370c 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache @@ -36,6 +36,9 @@ namespace {{packageName}}.Models {{#description}} /// {{.}} {{/description}} + {{#example}} + /// {{.}} + {{/example}} {{#required}} [Required] {{/required}} diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache index 362708e149e..30ee6f18d35 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache @@ -35,7 +35,8 @@ namespace {{modelPackage}} /// /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} /// {{#description}} - /// {{.}}{{/description}}{{#required}} + /// {{.}}{{/description}}{{#example}} + /// {{.}}{{/example}}{{#required}} [Required]{{/required}}{{#pattern}} [RegularExpression("{{{.}}}")]{{/pattern}}{{#minLength}}{{#maxLength}} [StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache index e96ce19cf52..6f8f976f231 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache @@ -51,7 +51,8 @@ namespace {{modelPackage}} /// /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} /// {{#description}} - /// {{.}}{{/description}}{{#required}} + /// {{.}}{{/description}}{{#example}} + /// {{.}}{{/example}}{{#required}} [Required]{{/required}}{{#pattern}} [RegularExpression("{{{.}}}")]{{/pattern}}{{#minLength}}{{#maxLength}} [StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache index b9707924166..80122db2164 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache @@ -31,6 +31,9 @@ {{#description}} /// {{description}} {{/description}} + {{#example}} + /// {{.}} + {{/example}} {{^conditionalSerialization}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#required}}true{{/required}}{{^required}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/required}}{{/vendorExtensions.x-emit-default-value}})] public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}} {{name}} { get; set; } @@ -50,7 +53,7 @@ {{#isReadOnly}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#required}}true{{/required}}{{^required}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/required}}{{/vendorExtensions.x-emit-default-value}})] public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}} {{name}} { get; set; } - + /// /// Returns false as {{name}} should not be serialized given that it's read-only. @@ -179,6 +182,9 @@ /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} /// {{#description}} /// {{description}}{{/description}} + {{#example}} + /// {{.}} + {{/example}} {{^conditionalSerialization}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#required}}true{{/required}}{{^required}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/required}}{{/vendorExtensions.x-emit-default-value}})] {{#isDate}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache index 04ec3e8581c..c4e7b03b31e 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache @@ -121,6 +121,9 @@ {{#description}} /// {{.}} {{/description}} + {{#example}} + /// {{.}} + {{/example}} [JsonPropertyName("{{baseName}}")] {{#deprecated}} [Obsolete] @@ -134,6 +137,9 @@ /// {{description}}{{^description}}Gets or Sets {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}{{/description}} /// {{#description}} /// {{.}}{{/description}} + {{#example}} + /// {{.}} + {{/example}} {{#deprecated}} [Obsolete] {{/deprecated}} @@ -145,6 +151,9 @@ /// {{description}}{{^description}}Gets or Sets {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}{{/description}} /// {{#description}} /// {{.}}{{/description}} + {{#example}} + /// {{.}} + {{/example}} {{#deprecated}} [Obsolete] {{/deprecated}} @@ -157,6 +166,9 @@ /// {{description}}{{^description}}Gets or Sets {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}}{{/description}} /// {{#description}} /// {{.}}{{/description}} + {{#example}} + /// {{.}} + {{/example}} {{#deprecated}} [Obsolete] {{/deprecated}} @@ -172,6 +184,9 @@ /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} /// {{#description}} /// {{.}}{{/description}} + {{#example}} + /// {{.}} + {{/example}} [JsonPropertyName("{{baseName}}")] {{#deprecated}} [Obsolete] @@ -185,6 +200,9 @@ /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} /// {{#description}} /// {{.}}{{/description}} + {{#example}} + /// {{.}} + {{/example}} [JsonPropertyName("{{baseName}}")] {{#deprecated}} [Obsolete] diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache index f8925f76e28..15a41f6a2e0 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache @@ -39,6 +39,9 @@ {{#description}} /// {{.}} {{/description}} + {{#example}} + /// {{.}} + {{/example}} {{^conditionalSerialization}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#required}}true{{/required}}{{^required}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/required}}{{/vendorExtensions.x-emit-default-value}})] {{#deprecated}} @@ -210,6 +213,9 @@ /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} /// {{#description}} /// {{.}}{{/description}} + {{#example}} + /// {{.}} + {{/example}} {{^conditionalSerialization}} [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#required}}true{{/required}}{{^required}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/required}}{{/vendorExtensions.x-emit-default-value}})] {{#isDate}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 0b464c99403..19c7f906b9c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -49,6 +49,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [JsonConverter(typeof(OpenAPIDateConverter))] [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] public DateTime DateOnlyProperty diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs index 4787323d3a9..5ecb2a7ae7e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs @@ -381,6 +381,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [JsonConverter(typeof(OpenAPIDateConverter))] [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] public DateTime Date @@ -406,6 +407,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [DataMember(Name = "dateTime", EmitDefaultValue = false)] public DateTime DateTime { @@ -430,6 +432,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = false)] public Guid Uuid { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs index a0b744f5a67..c37ee6768e5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -49,6 +49,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = true)] public Guid? Uuid { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs index 4dcea3ebe1d..a4f277b3431 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs @@ -200,6 +200,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [DataMember(Name = "shipDate", EmitDefaultValue = false)] public DateTime ShipDate { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs index 9fea569bb1e..b8efe609ab8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs @@ -191,6 +191,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 8066fb36e45..6ab28150ceb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -52,6 +52,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [JsonPropertyName("dateOnlyProperty")] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index ff233300582..6a122d9b261 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -139,12 +139,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [JsonPropertyName("date")] public DateTime Date { get; set; } /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [JsonPropertyName("dateTime")] public DateTime DateTime { get; set; } @@ -219,6 +221,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [JsonPropertyName("uuid")] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs index ec245d25b3c..1b46f198ea7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -43,6 +43,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [JsonPropertyName("uuid")] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs index a6661816f69..b85615474d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs @@ -164,6 +164,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [JsonPropertyName("shipDate")] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs index 1710cb27b0d..a0e0d27b08a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs @@ -158,6 +158,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [JsonPropertyName("name")] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index bfd5d66a51b..254822262fc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -50,6 +50,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [JsonPropertyName("dateOnlyProperty")] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index 2151eb6e51c..2b2379e59d1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -137,12 +137,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [JsonPropertyName("date")] public DateTime Date { get; set; } /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [JsonPropertyName("dateTime")] public DateTime DateTime { get; set; } @@ -217,6 +219,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [JsonPropertyName("uuid")] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 233e907c97e..d1826f727a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [JsonPropertyName("uuid")] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs index 00738d9c335..7f1a141dc2e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs @@ -162,6 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [JsonPropertyName("shipDate")] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs index 9158b93f5f5..5cf45b423c2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs @@ -156,6 +156,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [JsonPropertyName("name")] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index bfd5d66a51b..254822262fc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -50,6 +50,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [JsonPropertyName("dateOnlyProperty")] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index 2151eb6e51c..2b2379e59d1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -137,12 +137,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [JsonPropertyName("date")] public DateTime Date { get; set; } /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [JsonPropertyName("dateTime")] public DateTime DateTime { get; set; } @@ -217,6 +219,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [JsonPropertyName("uuid")] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 233e907c97e..d1826f727a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [JsonPropertyName("uuid")] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs index 00738d9c335..7f1a141dc2e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs @@ -162,6 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [JsonPropertyName("shipDate")] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs index 9158b93f5f5..5cf45b423c2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs @@ -156,6 +156,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [JsonPropertyName("name")] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs index fb83bbebf29..30acdf43d8f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -46,6 +46,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs index 5603e75631c..213604b9895 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -154,6 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime Date { get; set; } @@ -161,12 +162,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [DataMember(Name = "dateTime", EmitDefaultValue = false)] public DateTime DateTime { get; set; } /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = false)] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs index b3f48fcc200..f93cdd00748 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -46,6 +46,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = true)] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs index 5dbf90d5ef3..37791e8867a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs @@ -108,6 +108,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [DataMember(Name = "shipDate", EmitDefaultValue = false)] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs index 7b574d48283..94e63c364b8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs @@ -120,6 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 977c8ed7863..83e889c49ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -45,6 +45,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs index 9d0979b6f71..9d3f21d71eb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs @@ -153,6 +153,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime Date { get; set; } @@ -160,12 +161,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [DataMember(Name = "dateTime", EmitDefaultValue = false)] public DateTime DateTime { get; set; } /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = false)] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 9184756cb73..aaac7b6665a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -45,6 +45,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = true)] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs index 5c52482e79b..5b8c83a181d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs @@ -107,6 +107,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [DataMember(Name = "shipDate", EmitDefaultValue = false)] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs index 0e6f950d7f9..f70048fff04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs @@ -119,6 +119,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 977c8ed7863..83e889c49ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -45,6 +45,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs index 9d0979b6f71..9d3f21d71eb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs @@ -153,6 +153,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime Date { get; set; } @@ -160,12 +161,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [DataMember(Name = "dateTime", EmitDefaultValue = false)] public DateTime DateTime { get; set; } /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = false)] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 9184756cb73..aaac7b6665a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -45,6 +45,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = true)] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs index 5c52482e79b..5b8c83a181d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs @@ -107,6 +107,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [DataMember(Name = "shipDate", EmitDefaultValue = false)] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs index 0e6f950d7f9..f70048fff04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs @@ -119,6 +119,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 977c8ed7863..83e889c49ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -45,6 +45,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs index 9d0979b6f71..9d3f21d71eb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -153,6 +153,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime Date { get; set; } @@ -160,12 +161,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [DataMember(Name = "dateTime", EmitDefaultValue = false)] public DateTime DateTime { get; set; } /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = false)] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 9184756cb73..aaac7b6665a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -45,6 +45,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = true)] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs index 5c52482e79b..5b8c83a181d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs @@ -107,6 +107,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [DataMember(Name = "shipDate", EmitDefaultValue = false)] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs index 0e6f950d7f9..f70048fff04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs @@ -119,6 +119,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs index cc90a935d39..e3376af94fd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -42,6 +42,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs index 4abe50c8af3..f0819ea89a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs @@ -147,6 +147,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime Date { get; set; } @@ -154,12 +155,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [DataMember(Name = "dateTime", EmitDefaultValue = false)] public DateTime DateTime { get; set; } /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = false)] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs index d1296b9d5ee..2c66ada9a4f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -42,6 +42,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = true)] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs index 2dd1f1dd706..d7c71132724 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs @@ -104,6 +104,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [DataMember(Name = "shipDate", EmitDefaultValue = false)] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs index ea9ccc856c7..ad73736202c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs @@ -113,6 +113,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 977c8ed7863..83e889c49ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -45,6 +45,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs index 9d0979b6f71..9d3f21d71eb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -153,6 +153,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime Date { get; set; } @@ -160,12 +161,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [DataMember(Name = "dateTime", EmitDefaultValue = false)] public DateTime DateTime { get; set; } /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = false)] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 9184756cb73..aaac7b6665a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -45,6 +45,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = true)] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs index 5c52482e79b..5b8c83a181d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs @@ -107,6 +107,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [DataMember(Name = "shipDate", EmitDefaultValue = false)] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs index 0e6f950d7f9..f70048fff04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs @@ -119,6 +119,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 3ffbc9c2cf4..2a7ee6cb7b3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -44,6 +44,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateOnlyProperty /// + /// "Fri Jul 21 00:00:00 UTC 2017" [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime DateOnlyProperty { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs index 62203c68273..e468b57f8a4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs @@ -149,6 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Date /// + /// "Sun Feb 02 00:00:00 UTC 2020" [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)] [JsonConverter(typeof(OpenAPIDateConverter))] public DateTime Date { get; set; } @@ -156,12 +157,14 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets DateTime /// + /// "2007-12-03T10:15:30+01:00" [DataMember(Name = "dateTime", EmitDefaultValue = false)] public DateTime DateTime { get; set; } /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = false)] public Guid Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 2c14b4eb0aa..966a05464d1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -44,6 +44,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Uuid /// + /// "72f98069-206d-4f12-9f12-3d1e525a8e84" [DataMember(Name = "uuid", EmitDefaultValue = true)] public Guid? Uuid { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs index 306417b4a86..6076f0dc9a1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs @@ -106,6 +106,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets ShipDate /// + /// "2020-02-02T20:20:20.000222Z" [DataMember(Name = "shipDate", EmitDefaultValue = false)] public DateTime ShipDate { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs index a469a7bcc9f..7265694c21d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs @@ -115,6 +115,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { get; set; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs index feaf8650e28..cc48e919cb1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs @@ -116,6 +116,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets Name /// + /// "doggie" [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] public string Name { get; set; } diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Pet.cs index 762279e4d6d..c54bbe4fd64 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Pet.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Pet.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets Name /// + /// "doggie" [Required] [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Pet.cs index 762279e4d6d..c54bbe4fd64 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Pet.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Pet.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets Name /// + /// "doggie" [Required] [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Pet.cs index 762279e4d6d..c54bbe4fd64 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Pet.cs +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Pet.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets Name /// + /// "doggie" [Required] [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Pet.cs index b573ef0eea0..f2efc4915a8 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Pet.cs +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Pet.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets Name /// + /// "doggie" [Required] [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Pet.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Pet.cs index 762279e4d6d..c54bbe4fd64 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Pet.cs +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Pet.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets Name /// + /// "doggie" [Required] [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Pet.cs index 762279e4d6d..c54bbe4fd64 100644 --- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Pet.cs +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Pet.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets Name /// + /// "doggie" [Required] [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs index d5a816cd5ee..13b7ce44e8e 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs @@ -41,6 +41,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets Name /// + /// "doggie" [Required] [DataMember(Name="name", EmitDefaultValue=false)] public string Name { get; set; } From 0c41a7c1b4c7f3288b1205b0e9fb9e6c9fd350b4 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 12 Mar 2023 15:28:16 +0800 Subject: [PATCH 019/131] Minor bug fix in openapi normalizer (#14924) * minor bug fix in openapi normalizer * add test * better code format * fix hasCommonAttributesDefined --- .../codegen/OpenAPINormalizer.java | 18 ++++--- .../codegen/utils/ModelUtils.java | 5 +- .../codegen/OpenAPINormalizerTest.java | 47 ++++++++++++++----- .../3_0/simplifyBooleanEnum_test.yaml | 18 +++++++ 4 files changed, 67 insertions(+), 21 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index 49d1d714a04..d801f89e609 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -342,6 +342,12 @@ public class OpenAPINormalizer { normalizeSchema(schema.getItems(), visitedSchemas); } else if (schema.getAdditionalProperties() instanceof Schema) { // map normalizeSchema((Schema) schema.getAdditionalProperties(), visitedSchemas); + } else if (ModelUtils.isOneOf(schema)) { // oneOf + return normalizeOneOf(schema, visitedSchemas); + } else if (ModelUtils.isAnyOf(schema)) { // anyOf + return normalizeAnyOf(schema, visitedSchemas); + } else if (ModelUtils.isAllOf(schema)) { // allOf + return normalizeAllOf(schema, visitedSchemas); } else if (ModelUtils.isComposedSchema(schema)) { // composed schema ComposedSchema cs = (ComposedSchema) schema; @@ -370,8 +376,6 @@ public class OpenAPINormalizer { } return cs; - } else if (schema.getNot() != null) {// not schema - normalizeSchema(schema.getNot(), visitedSchemas); } else if (schema.getProperties() != null && !schema.getProperties().isEmpty()) { normalizeProperties(schema.getProperties(), visitedSchemas); } else if (schema instanceof BooleanSchema) { @@ -461,6 +465,10 @@ public class OpenAPINormalizer { } private Schema normalizeComplexComposedSchema(Schema schema, Set visitedSchemas) { + // loop through properties, if any + if (schema.getProperties() != null && !schema.getProperties().isEmpty()) { + normalizeProperties(schema.getProperties(), visitedSchemas); + } processRemoveAnyOfOneOfAndKeepPropertiesOnly(schema); @@ -736,24 +744,20 @@ public class OpenAPINormalizer { return; } - LOGGER.info("processAddUnsignedToIntegerWithInvalidMaxValue"); if (schema instanceof IntegerSchema) { if (ModelUtils.isLongSchema(schema)) { if ("18446744073709551615".equals(String.valueOf(schema.getMaximum())) && "0".equals(String.valueOf(schema.getMinimum()))) { schema.addExtension("x-unsigned", true); - LOGGER.info("fix long"); } } else { if ("4294967295".equals(String.valueOf(schema.getMaximum())) && "0".equals(String.valueOf(schema.getMinimum()))) { schema.addExtension("x-unsigned", true); - LOGGER.info("fix integer"); - } } } } // ===================== end of rules ===================== -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 974cd2228a5..150bdc6a04e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -1975,11 +1975,12 @@ public class ModelUtils { */ public static boolean hasCommonAttributesDefined(Schema schema) { if (schema.getNullable() != null || schema.getDefault() != null || - schema.getMinimum() != null || schema.getMinimum() != null || + schema.getMinimum() != null || schema.getMaximum() != null || schema.getExclusiveMaximum() != null || schema.getExclusiveMinimum() != null || schema.getMinLength() != null || schema.getMaxLength() != null || schema.getMinItems() != null || schema.getMaxItems() != null || - schema.getReadOnly() != null || schema.getWriteOnly() != null) { + schema.getReadOnly() != null || schema.getWriteOnly() != null || + schema.getPattern() != null) { return true; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java index a5b80494f62..f953e5a148e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java @@ -193,6 +193,29 @@ public class OpenAPINormalizerTest { assertNull(bs2.getEnum()); //ensure the enum has been erased } + @Test + public void testOpenAPINormalizerSimplifyBooleanEnumWithComposedSchema() { + // to test the rule SIMPLIFY_BOOLEAN_ENUM + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/simplifyBooleanEnum_test.yaml"); + + Schema schema = openAPI.getComponents().getSchemas().get("ComposedSchemaBooleanEnumTest"); + assertEquals(schema.getProperties().size(), 3); + assertTrue(schema.getProperties().get("boolean_enum") instanceof BooleanSchema); + BooleanSchema bs = (BooleanSchema) schema.getProperties().get("boolean_enum"); + assertEquals(bs.getEnum().size(), 2); + + Map options = new HashMap<>(); + options.put("SIMPLIFY_BOOLEAN_ENUM", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema schema3 = openAPI.getComponents().getSchemas().get("ComposedSchemaBooleanEnumTest"); + assertEquals(schema.getProperties().size(), 3); + assertTrue(schema.getProperties().get("boolean_enum") instanceof BooleanSchema); + BooleanSchema bs2 = (BooleanSchema) schema.getProperties().get("boolean_enum"); + assertNull(bs2.getEnum()); //ensure the enum has been erased + } + @Test public void testOpenAPINormalizerSetTagsInAllOperations() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml"); @@ -216,12 +239,12 @@ public class OpenAPINormalizerTest { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml"); Schema person = openAPI.getComponents().getSchemas().get("Person"); - assertNull(((Schema)person.getProperties().get("integer")).getExtensions()); - assertNull(((Schema)person.getProperties().get("int32")).getExtensions()); - assertNull(((Schema)person.getProperties().get("int64")).getExtensions()); - assertNull(((Schema)person.getProperties().get("integer_max")).getExtensions()); - assertNull(((Schema)person.getProperties().get("int32_max")).getExtensions()); - assertNull(((Schema)person.getProperties().get("int64_max")).getExtensions()); + assertNull(((Schema) person.getProperties().get("integer")).getExtensions()); + assertNull(((Schema) person.getProperties().get("int32")).getExtensions()); + assertNull(((Schema) person.getProperties().get("int64")).getExtensions()); + assertNull(((Schema) person.getProperties().get("integer_max")).getExtensions()); + assertNull(((Schema) person.getProperties().get("int32_max")).getExtensions()); + assertNull(((Schema) person.getProperties().get("int64_max")).getExtensions()); Map options = new HashMap<>(); options.put("ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE", "true"); @@ -229,12 +252,12 @@ public class OpenAPINormalizerTest { openAPINormalizer.normalize(); Schema person2 = openAPI.getComponents().getSchemas().get("Person"); - assertNull(((Schema)person2.getProperties().get("integer")).getExtensions()); - assertNull(((Schema)person2.getProperties().get("int32")).getExtensions()); - assertNull(((Schema)person2.getProperties().get("int64")).getExtensions()); - assertTrue((Boolean)((Schema)person2.getProperties().get("integer_max")).getExtensions().get("x-unsigned")); - assertTrue((Boolean)((Schema)person2.getProperties().get("int32_max")).getExtensions().get("x-unsigned")); - assertTrue((Boolean)((Schema)person2.getProperties().get("int64_max")).getExtensions().get("x-unsigned")); + assertNull(((Schema) person2.getProperties().get("integer")).getExtensions()); + assertNull(((Schema) person2.getProperties().get("int32")).getExtensions()); + assertNull(((Schema) person2.getProperties().get("int64")).getExtensions()); + assertTrue((Boolean) ((Schema) person2.getProperties().get("integer_max")).getExtensions().get("x-unsigned")); + assertTrue((Boolean) ((Schema) person2.getProperties().get("int32_max")).getExtensions().get("x-unsigned")); + assertTrue((Boolean) ((Schema) person2.getProperties().get("int64_max")).getExtensions().get("x-unsigned")); } @Test diff --git a/modules/openapi-generator/src/test/resources/3_0/simplifyBooleanEnum_test.yaml b/modules/openapi-generator/src/test/resources/3_0/simplifyBooleanEnum_test.yaml index 270dfcea641..3d1fc9b379c 100644 --- a/modules/openapi-generator/src/test/resources/3_0/simplifyBooleanEnum_test.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/simplifyBooleanEnum_test.yaml @@ -41,3 +41,21 @@ components: enum: - true - false + ComposedSchemaBooleanEnumTest: + description: a model to with boolean enum property + type: object + oneOf: + - type: string + - type: integer + properties: + id: + type: integer + format: int64 + name: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + boolean_enum: + type: boolean + enum: + - true + - false From 790b0be9640bdccd424abf9df1419825f934bf07 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 12 Mar 2023 16:47:32 +0800 Subject: [PATCH 020/131] update option description (#14932) --- docs/generators/csharp-netcore.md | 4 ++-- .../codegen/languages/CSharpNetCoreClientCodegen.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md index 1514d9686da..cd7bd66b849 100644 --- a/docs/generators/csharp-netcore.md +++ b/docs/generators/csharp-netcore.md @@ -22,8 +22,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |apiName|Must be a valid C# class name. Only used in Generic Host library. Default: Api| |Api| |caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false| |conditionalSerialization|Serialize only those properties which are initialized by user, accepted values are true or false, default value is false.| |false| -|dateFormat|The default DateTime format.| |yyyy'-'MM'-'dd| -|dateTimeFormat|The default DateTime format.| |yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK| +|dateFormat|The default Date format (only `generichost` library supports this option).| |yyyy'-'MM'-'dd| +|dateTimeFormat|The default DateTime format (only `generichost` library supports this option).| |yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
        **false**
        The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
        **true**
        Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
        |true| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| |interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index 297740310f8..c877c63a0ca 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -220,11 +220,11 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { this.packageTags); addOption(DATE_FORMAT, - "The default DateTime format.", + "The default Date format (only `generichost` library supports this option).", this.dateFormat); addOption(DATETIME_FORMAT, - "The default DateTime format.", + "The default DateTime format (only `generichost` library supports this option).", this.dateTimeFormat); CliOption framework = new CliOption( From 72871cf93098f4b72cb182d81c5b58ab86ae46b0 Mon Sep 17 00:00:00 2001 From: Antoine Reilles Date: Sun, 12 Mar 2023 16:24:30 +0100 Subject: [PATCH 021/131] [cxf-cdi] use InputStream for binary body (#14439) Use a single InputStream instead of "File". This allows the generated code to build in case of a definition like: requestBody: content: text/plain: schema: type: string format: binary This fixes #9372 --- .../codegen/languages/JavaJAXRSCXFCDIServerCodegen.java | 2 ++ .../src/main/resources/JavaJaxRS/cxf-cdi/api.mustache | 2 +- .../jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java | 1 - .../src/gen/java/org/openapitools/api/PetApiService.java | 1 - .../main/java/org/openapitools/api/impl/PetApiServiceImpl.java | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java index 4bb58c88e50..b6dd22cbfd3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java @@ -50,6 +50,8 @@ public class JavaJAXRSCXFCDIServerCodegen extends JavaJAXRSSpecServerCodegen imp // Use standard types typeMapping.put("DateTime", "java.util.Date"); + typeMapping.put("binary", "java.io.InputStream"); + typeMapping.put("file", "java.io.InputStream"); // Updated template directory embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf-cdi"; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache index b9d34d678d6..f00d72939a7 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache @@ -61,7 +61,7 @@ public class {{classname}} { @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}} }) public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}) { - return delegate.{{nickname}}({{#allParams}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}, {{/allParams}}securityContext); + return delegate.{{nickname}}({{#allParams}}{{#isFile}}{{#isMultipart}}{{paramName}}InputStream, {{paramName}}Detail{{/isMultipart}}{{^isMultipart}}{{paramName}}{{/isMultipart}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}, {{/allParams}}securityContext); } {{/operation}} } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java index 57c63b56395..e368bc861a0 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java @@ -1,6 +1,5 @@ package org.openapitools.api; -import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.openapitools.api.PetApiService; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java index cd8754bc876..74c874a64a7 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,7 +6,6 @@ import org.openapitools.model.*; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index ad4a6518971..b9005914f6e 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,7 +5,6 @@ import org.openapitools.model.*; import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; From 0f2156191f3b0232e36fad86d768a81c712d2ab0 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 12 Mar 2023 23:43:39 +0800 Subject: [PATCH 022/131] add tests to jaxrs-cxf-cdi generator (#14937) --- bin/configs/jaxrs-cxf-cdi.yaml | 2 +- .../test/resources/3_0/jaxrs/petstore.yaml | 756 ++++++++++++++++++ .../jaxrs-cxf-cdi/.openapi-generator/FILES | 3 + .../gen/java/org/openapitools/api/PetApi.java | 20 +- .../org/openapitools/api/PetApiService.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 6 +- .../org/openapitools/api/StoreApiService.java | 2 +- .../java/org/openapitools/api/TestApi.java | 47 ++ .../org/openapitools/api/TestApiService.java | 20 + .../java/org/openapitools/api/UserApi.java | 56 +- .../org/openapitools/api/UserApiService.java | 8 +- .../java/org/openapitools/model/Category.java | 2 +- .../api/impl/PetApiServiceImpl.java | 4 +- .../api/impl/StoreApiServiceImpl.java | 2 +- .../api/impl/TestApiServiceImpl.java | 25 + .../api/impl/UserApiServiceImpl.java | 8 +- 16 files changed, 917 insertions(+), 48 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml create mode 100644 samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApi.java create mode 100644 samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApiService.java create mode 100644 samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java diff --git a/bin/configs/jaxrs-cxf-cdi.yaml b/bin/configs/jaxrs-cxf-cdi.yaml index 63299c1d4e9..83b548e0e25 100644 --- a/bin/configs/jaxrs-cxf-cdi.yaml +++ b/bin/configs/jaxrs-cxf-cdi.yaml @@ -1,6 +1,6 @@ generatorName: jaxrs-cxf-cdi outputDir: samples/server/petstore/jaxrs-cxf-cdi -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi additionalProperties: hideGenerationTimestamp: "true" diff --git a/modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml new file mode 100644 index 00000000000..43da2edac40 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/jaxrs/petstore.yaml @@ -0,0 +1,756 @@ +openapi: 3.0.0 +servers: + - url: 'http://petstore.swagger.io/v2' +info: + description: >- + This is a sample server Petstore server. For this sample, you can use the api key + `special-key` to test the authorization filters. + version: 1.0.0 + title: OpenAPI Petstore + license: + name: Apache-2.0 + url: 'https://www.apache.org/licenses/LICENSE-2.0.html' +tags: + - name: pet + description: Everything about your Pets + - name: store + description: Access to Petstore orders + - name: user + description: Operations about user +paths: + /pet: + post: + tags: + - pet + summary: Add a new pet to the store + description: '' + operationId: addPet + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + $ref: '#/components/requestBodies/Pet' + put: + tags: + - pet + summary: Update an existing pet + description: '' + operationId: updatePet + externalDocs: + url: "http://petstore.swagger.io/v2/doc/updatePet" + description: "API documentation for the updatePet operation" + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + '405': + description: Validation exception + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + $ref: '#/components/requestBodies/Pet' + /pet/findByStatus: + get: + tags: + - pet + summary: Finds Pets by status + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - name: status + in: query + description: Status values that need to be considered for filter + required: true + style: form + explode: false + deprecated: true + schema: + type: array + items: + type: string + enum: + - available + - pending + - sold + default: available + responses: + '200': + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid status value + security: + - petstore_auth: + - 'read:pets' + /pet/findByTags: + get: + tags: + - pet + summary: Finds Pets by tags + description: >- + Multiple tags can be provided with comma separated strings. Use tag1, + tag2, tag3 for testing. + operationId: findPetsByTags + parameters: + - name: tags + in: query + description: Tags to filter by + required: true + style: form + explode: false + schema: + type: array + items: + type: string + responses: + '200': + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid tag value + security: + - petstore_auth: + - 'read:pets' + deprecated: true + '/pet/{petId}': + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: petId + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + security: + - api_key: [] + post: + tags: + - pet + summary: Updates a pet in the store with form data + description: '' + operationId: updatePetWithForm + parameters: + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + schema: + type: integer + format: int64 + responses: + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + content: + application/x-www-form-urlencoded: + schema: + type: object + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + delete: + tags: + - pet + summary: Deletes a pet + description: '' + operationId: deletePet + parameters: + - name: api_key + in: header + required: false + schema: + type: string + - name: petId + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + '400': + description: Invalid pet value + security: + - 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: + - store + summary: Returns pet inventories by status + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + '200': + description: successful operation + content: + application/json: + schema: + type: object + additionalProperties: + type: integer + format: int32 + security: + - api_key: [] + /store/order: + post: + tags: + - store + summary: Place an order for a pet + description: '' + operationId: placeOrder + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + '400': + description: Invalid Order + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + '/store/order/{orderId}': + get: + tags: + - store + summary: Find purchase order by ID + description: >- + For valid response try integer IDs with value <= 5 or > 10. Other values + will generate exceptions + operationId: getOrderById + parameters: + - name: orderId + in: path + description: ID of pet that needs to be fetched + required: true + schema: + type: integer + format: int64 + minimum: 1 + maximum: 5 + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + '400': + description: Invalid ID supplied + '404': + description: Order not found + delete: + tags: + - store + summary: Delete purchase order by ID + description: >- + For valid response try integer IDs with value < 1000. Anything above + 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - name: orderId + in: path + description: ID of the order that needs to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid ID supplied + '404': + description: Order not found + /user: + post: + tags: + - user + summary: Create user + description: This can only be done by the logged in user. + operationId: createUser + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + /user/createWithArray: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithArrayInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: '#/components/requestBodies/UserArray' + /user/createWithList: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithListInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: '#/components/requestBodies/UserArray' + /user/login: + get: + tags: + - user + summary: Logs user into the system + description: '' + operationId: loginUser + parameters: + - name: username + in: query + description: The user name for login + required: true + schema: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + - name: password + in: query + description: The password for login in clear text + required: true + schema: + type: string + responses: + '200': + description: successful operation + headers: + Set-Cookie: + description: >- + Cookie authentication key for use with the `api_key` + apiKey authentication. + schema: + type: string + example: AUTH_KEY=abcde12345; Path=/; HttpOnly + X-Rate-Limit: + description: calls per hour allowed by the user + schema: + type: integer + format: int32 + X-Expires-After: + description: date in UTC when token expires + schema: + type: string + format: date-time + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + '400': + description: Invalid username/password supplied + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + description: '' + operationId: logoutUser + responses: + default: + description: successful operation + security: + - api_key: [] + '/user/{username}': + get: + tags: + - user + summary: Get user by user name + description: '' + operationId: getUserByName + parameters: + - name: username + in: path + description: The name that needs to be fetched. Use user1 for testing. + required: true + schema: + type: string + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + '400': + description: Invalid username supplied + '404': + description: User not found + put: + tags: + - user + summary: Updated user + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - name: username + in: path + description: name that need to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid user supplied + '404': + description: User not found + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + delete: + tags: + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid username supplied + '404': + description: User not found + security: + - api_key: [] + /test/upload: + post: + summary: test upload + description: upload test + operationId: testUpload + requestBody: + required: false + content: + application/octet-stream: + schema: + type: string + format: binary + responses: + default: + description: whatever +externalDocs: + description: Find out more about Swagger + url: 'http://swagger.io' +components: + requestBodies: + UserArray: + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/User' + description: List of user object + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog' + scopes: + 'write:pets': modify pets in your account + 'read:pets': read your pets + api_key: + type: apiKey + name: api_key + in: header + schemas: + Order: + title: Pet Order + description: An order for a pets from the pet store + type: object + properties: + id: + type: integer + format: int64 + petId: + type: integer + format: int64 + quantity: + type: integer + format: int32 + shipDate: + type: string + format: date-time + status: + type: string + description: Order Status + enum: + - placed + - approved + - delivered + complete: + type: boolean + default: false + xml: + name: Order + Category: + title: Pet category + description: A category for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + xml: + name: Category + User: + title: a User + description: A User who is purchasing from the pet store + type: object + properties: + id: + type: integer + format: int64 + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + type: integer + format: int32 + description: User Status + xml: + name: User + Tag: + title: Pet Tag + description: A tag for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + xml: + name: Tag + Pet: + title: a Pet + description: A pet for sale in the pet store + type: object + required: + - name + - photoUrls + properties: + id: + type: integer + format: int64 + category: + $ref: '#/components/schemas/Category' + name: + type: string + example: doggie + photoUrls: + type: array + xml: + name: photoUrl + wrapped: true + items: + type: string + tags: + type: array + xml: + name: tag + wrapped: true + items: + $ref: '#/components/schemas/Tag' + status: + type: string + description: pet status in the store + deprecated: true + enum: + - available + - pending + - sold + xml: + name: Pet + ApiResponse: + title: An uploaded response + description: Describes the result of uploading an image resource + type: object + properties: + code: + type: integer + format: int32 + type: + type: string + message: + type: string diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/FILES b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/FILES index c5c0a5f4ba9..27729fb0331 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/FILES +++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/FILES @@ -3,6 +3,8 @@ src/gen/java/org/openapitools/api/PetApi.java src/gen/java/org/openapitools/api/PetApiService.java src/gen/java/org/openapitools/api/StoreApi.java src/gen/java/org/openapitools/api/StoreApiService.java +src/gen/java/org/openapitools/api/TestApi.java +src/gen/java/org/openapitools/api/TestApiService.java src/gen/java/org/openapitools/api/UserApi.java src/gen/java/org/openapitools/api/UserApiService.java src/gen/java/org/openapitools/model/Category.java @@ -14,5 +16,6 @@ src/gen/java/org/openapitools/model/User.java src/main/java/org/openapitools/api/RestApplication.java src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java src/main/webapp/WEB-INF/beans.xml diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java index e368bc861a0..879c2f79431 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java @@ -39,16 +39,17 @@ public class PetApi { @POST @Consumes({ "application/json", "application/xml" }) - - @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = { + @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Add a new pet to the store", notes = "", response = Pet.class, authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet" }) @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) - public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body) { - return delegate.addPet(body, securityContext); + public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet) { + return delegate.addPet(pet, securityContext); } @DELETE @@ -75,7 +76,6 @@ public class PetApi { @Produces({ "application/xml", "application/json" }) @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = { @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet" }) @ApiResponses(value = { @@ -92,7 +92,6 @@ public class PetApi { @SuppressWarnings("deprecation") @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet" }) @ApiResponses(value = { @@ -121,18 +120,19 @@ public class PetApi { @PUT @Consumes({ "application/json", "application/xml" }) - - @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = { + @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Update an existing pet", notes = "", response = Pet.class, authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet" }) @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Pet.class), @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), @ApiResponse(code = 404, message = "Pet not found", response = Void.class), @ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) - public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body) { - return delegate.updatePet(body, securityContext); + public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet) { + return delegate.updatePet(pet, securityContext); } @POST diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java index 74c874a64a7..4767577be24 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java @@ -18,12 +18,12 @@ import javax.ws.rs.core.SecurityContext; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen") public interface PetApiService { - public Response addPet(Pet body, SecurityContext securityContext); + public Response addPet(Pet pet, SecurityContext securityContext); public Response deletePet(Long petId, SecurityContext securityContext); public Response findPetsByStatus(List status, SecurityContext securityContext); @Deprecated public Response findPetsByTags(List tags, SecurityContext securityContext); public Response getPetById(Long petId, SecurityContext securityContext); - public Response updatePet(Pet body, SecurityContext securityContext); + public Response updatePet(Pet pet, SecurityContext securityContext); public Response updatePetWithForm(Long petId, String name, String status, SecurityContext securityContext); public Response uploadFile(Long petId, String additionalMetadata, InputStream _fileInputStream, Attachment _fileDetail, SecurityContext securityContext); } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java index 40870e41c75..ea889006e69 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java @@ -77,13 +77,13 @@ public class StoreApi { @POST @Path("/order") - + @Consumes({ "application/json" }) @Produces({ "application/xml", "application/json" }) @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) - public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body) { - return delegate.placeOrder(body, securityContext); + public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order order) { + return delegate.placeOrder(order, securityContext); } } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java index 3135d74bb98..e8c6f2e2ad0 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java @@ -21,5 +21,5 @@ public interface StoreApiService { public Response deleteOrder(String orderId, SecurityContext securityContext); public Response getInventory(SecurityContext securityContext); public Response getOrderById(Long orderId, SecurityContext securityContext); - public Response placeOrder(Order body, SecurityContext securityContext); + public Response placeOrder(Order order, SecurityContext securityContext); } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApi.java new file mode 100644 index 00000000000..be772166c1c --- /dev/null +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApi.java @@ -0,0 +1,47 @@ +package org.openapitools.api; + +import org.openapitools.api.TestApiService; + +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; + +import io.swagger.annotations.*; +import java.io.InputStream; + +import org.apache.cxf.jaxrs.ext.PATCH; +import org.apache.cxf.jaxrs.ext.multipart.Attachment; +import org.apache.cxf.jaxrs.ext.multipart.Multipart; + +import java.util.Map; +import java.util.List; +import javax.validation.constraints.*; +@Path("/test/upload") +@RequestScoped + +@Api(description = "the test API") + + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen") + +public class TestApi { + + @Context SecurityContext securityContext; + + @Inject TestApiService delegate; + + + @POST + + @Consumes({ "application/octet-stream" }) + + @ApiOperation(value = "test upload", notes = "upload test", response = Void.class, tags={ }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "whatever", response = Void.class) }) + public Response testUpload(@ApiParam(value = "" ) java.io.InputStream body) { + return delegate.testUpload(body, securityContext); + } +} diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApiService.java new file mode 100644 index 00000000000..a350d5be4bf --- /dev/null +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApiService.java @@ -0,0 +1,20 @@ +package org.openapitools.api; + +import org.openapitools.api.*; +import org.openapitools.model.*; + +import org.apache.cxf.jaxrs.ext.multipart.Attachment; +import org.apache.cxf.jaxrs.ext.multipart.Multipart; + + +import java.util.List; + +import java.io.InputStream; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen") +public interface TestApiService { + public Response testUpload(java.io.InputStream body, SecurityContext securityContext); +} diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java index 285f6835da5..63b3497ab1b 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java @@ -38,42 +38,54 @@ public class UserApi { @POST + @Consumes({ "application/json" }) - - @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, authorizations = { + + @Authorization(value = "api_key") + }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body) { - return delegate.createUser(body, securityContext); + public Response createUser(@ApiParam(value = "Created user object" ,required=true) User user) { + return delegate.createUser(user, securityContext); } @POST @Path("/createWithArray") + @Consumes({ "application/json" }) - - @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) + @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, authorizations = { + + @Authorization(value = "api_key") + }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List body) { - return delegate.createUsersWithArrayInput(body, securityContext); + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List user) { + return delegate.createUsersWithArrayInput(user, securityContext); } @POST @Path("/createWithList") + @Consumes({ "application/json" }) - - @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) + @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, authorizations = { + + @Authorization(value = "api_key") + }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List body) { - return delegate.createUsersWithListInput(body, securityContext); + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List user) { + return delegate.createUsersWithListInput(user, securityContext); } @DELETE @Path("/{username}") - @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, authorizations = { + + @Authorization(value = "api_key") + }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) @@ -102,7 +114,7 @@ public class UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) }) - public Response loginUser( @NotNull @ApiParam(value = "The user name for login",required=true) @QueryParam("username") String username, @NotNull @ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password) { + public Response loginUser( @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")@ApiParam(value = "The user name for login",required=true) @QueryParam("username") String username, @NotNull @ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password) { return delegate.loginUser(username, password, securityContext); } @@ -110,7 +122,10 @@ public class UserApi { @Path("/logout") - @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user" }) + @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, authorizations = { + + @Authorization(value = "api_key") + }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response logoutUser() { @@ -119,13 +134,16 @@ public class UserApi { @PUT @Path("/{username}") + @Consumes({ "application/json" }) - - @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, authorizations = { + + @Authorization(value = "api_key") + }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username, @ApiParam(value = "Updated user object" ,required=true) User body) { - return delegate.updateUser(username, body, securityContext); + public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username, @ApiParam(value = "Updated user object" ,required=true) User user) { + return delegate.updateUser(username, user, securityContext); } } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java index b9f3090de81..f8eba8accd7 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java @@ -18,12 +18,12 @@ import javax.ws.rs.core.SecurityContext; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen") public interface UserApiService { - public Response createUser(User body, SecurityContext securityContext); - public Response createUsersWithArrayInput(List body, SecurityContext securityContext); - public Response createUsersWithListInput(List body, SecurityContext securityContext); + public Response createUser(User user, SecurityContext securityContext); + public Response createUsersWithArrayInput(List user, SecurityContext securityContext); + public Response createUsersWithListInput(List user, SecurityContext securityContext); public Response deleteUser(String username, SecurityContext securityContext); public Response getUserByName(String username, SecurityContext securityContext); public Response loginUser(String username, String password, SecurityContext securityContext); public Response logoutUser(SecurityContext securityContext); - public Response updateUser(String username, User body, SecurityContext securityContext); + public Response updateUser(String username, User user, SecurityContext securityContext); } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java index 8dc256b2c0e..752df95b657 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java @@ -49,7 +49,7 @@ public class Category { @ApiModelProperty(value = "") @JsonProperty("name") - public String getName() { + @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") public String getName() { return name; } public void setName(String name) { diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index b9005914f6e..687f684ffb7 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -20,7 +20,7 @@ import javax.ws.rs.core.SecurityContext; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen") public class PetApiServiceImpl implements PetApiService { @Override - public Response addPet(Pet body, SecurityContext securityContext) { + public Response addPet(Pet pet, SecurityContext securityContext) { // do some magic! return Response.ok().entity("magic!").build(); } @@ -45,7 +45,7 @@ public class PetApiServiceImpl implements PetApiService { return Response.ok().entity("magic!").build(); } @Override - public Response updatePet(Pet body, SecurityContext securityContext) { + public Response updatePet(Pet pet, SecurityContext securityContext) { // do some magic! return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 50ea94a966c..3fd4ebe823e 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -35,7 +35,7 @@ public class StoreApiServiceImpl implements StoreApiService { return Response.ok().entity("magic!").build(); } @Override - public Response placeOrder(Order body, SecurityContext securityContext) { + public Response placeOrder(Order order, SecurityContext securityContext) { // do some magic! return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java new file mode 100644 index 00000000000..5b8432c4717 --- /dev/null +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java @@ -0,0 +1,25 @@ +package org.openapitools.api.impl; + +import org.openapitools.api.*; +import org.openapitools.model.*; + +import org.apache.cxf.jaxrs.ext.multipart.Attachment; + + +import java.util.List; + +import java.io.InputStream; + +import javax.enterprise.context.RequestScoped; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; + +@RequestScoped +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen") +public class TestApiServiceImpl implements TestApiService { + @Override + public Response testUpload(java.io.InputStream body, SecurityContext securityContext) { + // do some magic! + return Response.ok().entity("magic!").build(); + } +} diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java index 3f534768c3e..eeb96d4cf30 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java @@ -20,17 +20,17 @@ import javax.ws.rs.core.SecurityContext; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSCXFCDIServerCodegen") public class UserApiServiceImpl implements UserApiService { @Override - public Response createUser(User body, SecurityContext securityContext) { + public Response createUser(User user, SecurityContext securityContext) { // do some magic! return Response.ok().entity("magic!").build(); } @Override - public Response createUsersWithArrayInput(List body, SecurityContext securityContext) { + public Response createUsersWithArrayInput(List user, SecurityContext securityContext) { // do some magic! return Response.ok().entity("magic!").build(); } @Override - public Response createUsersWithListInput(List body, SecurityContext securityContext) { + public Response createUsersWithListInput(List user, SecurityContext securityContext) { // do some magic! return Response.ok().entity("magic!").build(); } @@ -55,7 +55,7 @@ public class UserApiServiceImpl implements UserApiService { return Response.ok().entity("magic!").build(); } @Override - public Response updateUser(String username, User body, SecurityContext securityContext) { + public Response updateUser(String username, User user, SecurityContext securityContext) { // do some magic! return Response.ok().entity("magic!").build(); } From 8785acea7c9684380b3f664af26d6829d8f6adbb Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Mon, 13 Mar 2023 03:24:45 -0400 Subject: [PATCH 023/131] added samples for unsigned (#14938) --- .../generichost/JsonConverter.mustache | 8 +- ...odels-for-testing-with-http-signature.yaml | 10 +++ .../docs/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 78 ++++++++++++++++++- .../docs/models/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 50 +++++++++++- .../docs/models/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 50 +++++++++++- .../docs/models/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 50 +++++++++++- .../docs/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 34 +++++++- .../OpenAPIClient-net47/docs/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 34 +++++++- .../OpenAPIClient-net48/docs/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 34 +++++++- .../OpenAPIClient-net5.0/docs/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 34 +++++++- .../docs/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 30 ++++++- .../OpenAPIClient/docs/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 34 +++++++- .../OpenAPIClientCore/docs/FormatTest.md | 2 + .../src/Org.OpenAPITools/Model/FormatTest.cs | 34 +++++++- 24 files changed, 484 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache index c23c90ac9a0..30f898e5481 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache @@ -98,7 +98,7 @@ {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = (float)utf8JsonReader.GetDouble(); {{/isFloat}} {{#isLong}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetInt64(); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int64(); {{/isLong}} {{^isLong}} {{^isFloat}} @@ -106,10 +106,10 @@ {{^isDouble}} {{#isNullable}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetInt32(); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(); {{/isNullable}} {{^isNullable}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetInt32(); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(); {{/isNullable}} {{/isDouble}} {{/isDecimal}} @@ -126,7 +126,7 @@ {{#isEnum}} {{^isMap}} {{#isNumeric}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = ({{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}) utf8JsonReader.GetInt32(); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = ({{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}) utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(); {{/isNumeric}} {{^isNumeric}} string {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue = utf8JsonReader.GetString(); diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 2e6be05a4b0..bfb50150a6f 100644 --- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -1491,9 +1491,19 @@ components: format: int32 maximum: 200 minimum: 20 + unsigned_integer: + type: integer + format: int32 + maximum: 200 + minimum: 20 + x-unsigned: true int64: type: integer format: int64 + unsigned_long: + type: integer + format: int64 + x-unsigned: true number: maximum: 543.2 minimum: 32.1 diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md index 39a70be7ad4..1664a9d7c72 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md @@ -6,7 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Integer** | **int** | | [optional] **Int32** | **int** | | [optional] +**UnsignedInteger** | **uint** | | [optional] **Int64** | **long** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | **Float** | **float** | | [optional] **Double** | **double** | | [optional] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs index 5ecb2a7ae7e..6878c32a1cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs @@ -45,7 +45,9 @@ namespace Org.OpenAPITools.Model ///
        /// integer. /// int32. + /// unsignedInteger. /// int64. + /// unsignedLong. /// number (required). /// _float. /// _double. @@ -59,7 +61,7 @@ namespace Org.OpenAPITools.Model /// password (required). /// A string that is a 10 digit number. Can have leading zeros.. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. - public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) { this._Number = number; // to ensure "_byte" is required (not null) @@ -85,11 +87,21 @@ namespace Org.OpenAPITools.Model { this._flagInt32 = true; } + this._UnsignedInteger = unsignedInteger; + if (this.UnsignedInteger != null) + { + this._flagUnsignedInteger = true; + } this._Int64 = int64; if (this.Int64 != null) { this._flagInt64 = true; } + this._UnsignedLong = unsignedLong; + if (this.UnsignedLong != null) + { + this._flagUnsignedLong = true; + } this._Float = _float; if (this.Float != null) { @@ -187,6 +199,30 @@ namespace Org.OpenAPITools.Model return _flagInt32; } /// + /// Gets or Sets UnsignedInteger + /// + [DataMember(Name = "unsigned_integer", EmitDefaultValue = false)] + public uint UnsignedInteger + { + get{ return _UnsignedInteger;} + set + { + _UnsignedInteger = value; + _flagUnsignedInteger = true; + } + } + private uint _UnsignedInteger; + private bool _flagUnsignedInteger; + + /// + /// Returns false as UnsignedInteger should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeUnsignedInteger() + { + return _flagUnsignedInteger; + } + /// /// Gets or Sets Int64 /// [DataMember(Name = "int64", EmitDefaultValue = false)] @@ -211,6 +247,30 @@ namespace Org.OpenAPITools.Model return _flagInt64; } /// + /// Gets or Sets UnsignedLong + /// + [DataMember(Name = "unsigned_long", EmitDefaultValue = false)] + public ulong UnsignedLong + { + get{ return _UnsignedLong;} + set + { + _UnsignedLong = value; + _flagUnsignedLong = true; + } + } + private ulong _UnsignedLong; + private bool _flagUnsignedLong; + + /// + /// Returns false as UnsignedLong should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeUnsignedLong() + { + return _flagUnsignedLong; + } + /// /// Gets or Sets Number /// [DataMember(Name = "number", IsRequired = true, EmitDefaultValue = true)] @@ -544,7 +604,9 @@ namespace Org.OpenAPITools.Model sb.Append("class FormatTest {\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Double: ").Append(Double).Append("\n"); @@ -603,7 +665,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; hashCode = (hashCode * 59) + this.Integer.GetHashCode(); hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedInteger.GetHashCode(); hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); hashCode = (hashCode * 59) + this.Float.GetHashCode(); hashCode = (hashCode * 59) + this.Double.GetHashCode(); @@ -683,6 +747,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + // Number (decimal) maximum if (this.Number > (decimal)543.2) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md index 4e34a6d18b3..b176ed40f3d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md @@ -19,6 +19,8 @@ Name | Type | Description | Notes **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] **PatternWithDigitsAndDelimiter** | **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] **StringProperty** | **string** | | [optional] +**UnsignedInteger** | **uint** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Uuid** | **Guid** | | [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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index 6a122d9b261..fbc9ea8d776 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -48,9 +48,11 @@ namespace Org.OpenAPITools.Model /// A string that is a 10 digit number. Can have leading zeros. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. /// stringProperty + /// unsignedInteger + /// unsignedLong /// uuid [JsonConstructor] - public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid) + public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, uint unsignedInteger, ulong unsignedLong, Guid uuid) { #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' @@ -61,9 +63,15 @@ namespace Org.OpenAPITools.Model if (int32 == null) throw new ArgumentNullException("int32 is a required property for FormatTest and cannot be null."); + if (unsignedInteger == null) + throw new ArgumentNullException("unsignedInteger is a required property for FormatTest and cannot be null."); + if (int64 == null) throw new ArgumentNullException("int64 is a required property for FormatTest and cannot be null."); + if (unsignedLong == null) + throw new ArgumentNullException("unsignedLong is a required property for FormatTest and cannot be null."); + if (number == null) throw new ArgumentNullException("number is a required property for FormatTest and cannot be null."); @@ -121,6 +129,8 @@ namespace Org.OpenAPITools.Model PatternWithDigits = patternWithDigits; PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; StringProperty = stringProperty; + UnsignedInteger = unsignedInteger; + UnsignedLong = unsignedLong; Uuid = uuid; } @@ -218,6 +228,18 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("string")] public string StringProperty { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [JsonPropertyName("unsigned_integer")] + public uint UnsignedInteger { get; set; } + + /// + /// Gets or Sets UnsignedLong + /// + [JsonPropertyName("unsigned_long")] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Uuid /// @@ -254,6 +276,8 @@ namespace Org.OpenAPITools.Model sb.Append(" PatternWithDigits: ").Append(PatternWithDigits).Append("\n"); sb.Append(" PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n"); sb.Append(" StringProperty: ").Append(StringProperty).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Uuid: ").Append(Uuid).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -359,6 +383,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + yield break; } } @@ -410,6 +446,8 @@ namespace Org.OpenAPITools.Model string patternWithDigits = default; string patternWithDigitsAndDelimiter = default; string stringProperty = default; + uint unsignedInteger = default; + ulong unsignedLong = default; Guid uuid = default; while (utf8JsonReader.Read()) @@ -472,6 +510,12 @@ namespace Org.OpenAPITools.Model case "string": stringProperty = utf8JsonReader.GetString(); break; + case "unsigned_integer": + unsignedInteger = utf8JsonReader.GetUInt32(); + break; + case "unsigned_long": + unsignedLong = utf8JsonReader.GetUInt64(); + break; case "uuid": uuid = utf8JsonReader.GetGuid(); break; @@ -481,7 +525,7 @@ namespace Org.OpenAPITools.Model } } - return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid); + return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, unsignedInteger, unsignedLong, uuid); } /// @@ -513,6 +557,8 @@ namespace Org.OpenAPITools.Model writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits); writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter); writer.WriteString("string", formatTest.StringProperty); + writer.WriteNumber("unsigned_integer", formatTest.UnsignedInteger); + writer.WriteNumber("unsigned_long", formatTest.UnsignedLong); writer.WriteString("uuid", formatTest.Uuid); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md index 4e34a6d18b3..b176ed40f3d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md @@ -19,6 +19,8 @@ Name | Type | Description | Notes **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] **PatternWithDigitsAndDelimiter** | **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] **StringProperty** | **string** | | [optional] +**UnsignedInteger** | **uint** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Uuid** | **Guid** | | [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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index 2b2379e59d1..6165ffc9fe8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -46,9 +46,11 @@ namespace Org.OpenAPITools.Model /// A string that is a 10 digit number. Can have leading zeros. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. /// stringProperty + /// unsignedInteger + /// unsignedLong /// uuid [JsonConstructor] - public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid) + public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, uint unsignedInteger, ulong unsignedLong, Guid uuid) { #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' @@ -59,9 +61,15 @@ namespace Org.OpenAPITools.Model if (int32 == null) throw new ArgumentNullException("int32 is a required property for FormatTest and cannot be null."); + if (unsignedInteger == null) + throw new ArgumentNullException("unsignedInteger is a required property for FormatTest and cannot be null."); + if (int64 == null) throw new ArgumentNullException("int64 is a required property for FormatTest and cannot be null."); + if (unsignedLong == null) + throw new ArgumentNullException("unsignedLong is a required property for FormatTest and cannot be null."); + if (number == null) throw new ArgumentNullException("number is a required property for FormatTest and cannot be null."); @@ -119,6 +127,8 @@ namespace Org.OpenAPITools.Model PatternWithDigits = patternWithDigits; PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; StringProperty = stringProperty; + UnsignedInteger = unsignedInteger; + UnsignedLong = unsignedLong; Uuid = uuid; } @@ -216,6 +226,18 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("string")] public string StringProperty { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [JsonPropertyName("unsigned_integer")] + public uint UnsignedInteger { get; set; } + + /// + /// Gets or Sets UnsignedLong + /// + [JsonPropertyName("unsigned_long")] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Uuid /// @@ -252,6 +274,8 @@ namespace Org.OpenAPITools.Model sb.Append(" PatternWithDigits: ").Append(PatternWithDigits).Append("\n"); sb.Append(" PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n"); sb.Append(" StringProperty: ").Append(StringProperty).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Uuid: ").Append(Uuid).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -357,6 +381,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + yield break; } } @@ -408,6 +444,8 @@ namespace Org.OpenAPITools.Model string patternWithDigits = default; string patternWithDigitsAndDelimiter = default; string stringProperty = default; + uint unsignedInteger = default; + ulong unsignedLong = default; Guid uuid = default; while (utf8JsonReader.Read()) @@ -470,6 +508,12 @@ namespace Org.OpenAPITools.Model case "string": stringProperty = utf8JsonReader.GetString(); break; + case "unsigned_integer": + unsignedInteger = utf8JsonReader.GetUInt32(); + break; + case "unsigned_long": + unsignedLong = utf8JsonReader.GetUInt64(); + break; case "uuid": uuid = utf8JsonReader.GetGuid(); break; @@ -479,7 +523,7 @@ namespace Org.OpenAPITools.Model } } - return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid); + return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, unsignedInteger, unsignedLong, uuid); } /// @@ -511,6 +555,8 @@ namespace Org.OpenAPITools.Model writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits); writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter); writer.WriteString("string", formatTest.StringProperty); + writer.WriteNumber("unsigned_integer", formatTest.UnsignedInteger); + writer.WriteNumber("unsigned_long", formatTest.UnsignedLong); writer.WriteString("uuid", formatTest.Uuid); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md index 4e34a6d18b3..b176ed40f3d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md @@ -19,6 +19,8 @@ Name | Type | Description | Notes **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] **PatternWithDigitsAndDelimiter** | **string** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] **StringProperty** | **string** | | [optional] +**UnsignedInteger** | **uint** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Uuid** | **Guid** | | [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/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index 2b2379e59d1..6165ffc9fe8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -46,9 +46,11 @@ namespace Org.OpenAPITools.Model /// A string that is a 10 digit number. Can have leading zeros. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. /// stringProperty + /// unsignedInteger + /// unsignedLong /// uuid [JsonConstructor] - public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid) + public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, uint unsignedInteger, ulong unsignedLong, Guid uuid) { #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' @@ -59,9 +61,15 @@ namespace Org.OpenAPITools.Model if (int32 == null) throw new ArgumentNullException("int32 is a required property for FormatTest and cannot be null."); + if (unsignedInteger == null) + throw new ArgumentNullException("unsignedInteger is a required property for FormatTest and cannot be null."); + if (int64 == null) throw new ArgumentNullException("int64 is a required property for FormatTest and cannot be null."); + if (unsignedLong == null) + throw new ArgumentNullException("unsignedLong is a required property for FormatTest and cannot be null."); + if (number == null) throw new ArgumentNullException("number is a required property for FormatTest and cannot be null."); @@ -119,6 +127,8 @@ namespace Org.OpenAPITools.Model PatternWithDigits = patternWithDigits; PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; StringProperty = stringProperty; + UnsignedInteger = unsignedInteger; + UnsignedLong = unsignedLong; Uuid = uuid; } @@ -216,6 +226,18 @@ namespace Org.OpenAPITools.Model [JsonPropertyName("string")] public string StringProperty { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [JsonPropertyName("unsigned_integer")] + public uint UnsignedInteger { get; set; } + + /// + /// Gets or Sets UnsignedLong + /// + [JsonPropertyName("unsigned_long")] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Uuid /// @@ -252,6 +274,8 @@ namespace Org.OpenAPITools.Model sb.Append(" PatternWithDigits: ").Append(PatternWithDigits).Append("\n"); sb.Append(" PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n"); sb.Append(" StringProperty: ").Append(StringProperty).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Uuid: ").Append(Uuid).Append("\n"); sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); sb.Append("}\n"); @@ -357,6 +381,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + yield break; } } @@ -408,6 +444,8 @@ namespace Org.OpenAPITools.Model string patternWithDigits = default; string patternWithDigitsAndDelimiter = default; string stringProperty = default; + uint unsignedInteger = default; + ulong unsignedLong = default; Guid uuid = default; while (utf8JsonReader.Read()) @@ -470,6 +508,12 @@ namespace Org.OpenAPITools.Model case "string": stringProperty = utf8JsonReader.GetString(); break; + case "unsigned_integer": + unsignedInteger = utf8JsonReader.GetUInt32(); + break; + case "unsigned_long": + unsignedLong = utf8JsonReader.GetUInt64(); + break; case "uuid": uuid = utf8JsonReader.GetGuid(); break; @@ -479,7 +523,7 @@ namespace Org.OpenAPITools.Model } } - return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid); + return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, unsignedInteger, unsignedLong, uuid); } /// @@ -511,6 +555,8 @@ namespace Org.OpenAPITools.Model writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits); writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter); writer.WriteString("string", formatTest.StringProperty); + writer.WriteNumber("unsigned_integer", formatTest.UnsignedInteger); + writer.WriteNumber("unsigned_long", formatTest.UnsignedLong); writer.WriteString("uuid", formatTest.Uuid); writer.WriteEndObject(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md index 505dbad52df..bd9e50f80af 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md @@ -6,7 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Integer** | **int** | | [optional] **Int32** | **int** | | [optional] +**UnsignedInteger** | **uint** | | [optional] **Int64** | **long** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | **Float** | **float** | | [optional] **Double** | **double** | | [optional] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs index 213604b9895..518a272be5a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -46,7 +46,9 @@ namespace Org.OpenAPITools.Model /// /// integer. /// int32. + /// unsignedInteger. /// int64. + /// unsignedLong. /// number (required). /// _float. /// _double. @@ -60,7 +62,7 @@ namespace Org.OpenAPITools.Model /// password (required). /// A string that is a 10 digit number. Can have leading zeros.. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. - public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), FileParameter binary = default(FileParameter), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), FileParameter binary = default(FileParameter), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) { this.Number = number; // to ensure "_byte" is required (not null) @@ -78,7 +80,9 @@ namespace Org.OpenAPITools.Model this.Password = password; this.Integer = integer; this.Int32 = int32; + this.UnsignedInteger = unsignedInteger; this.Int64 = int64; + this.UnsignedLong = unsignedLong; this.Float = _float; this.Double = _double; this.Decimal = _decimal; @@ -103,12 +107,24 @@ namespace Org.OpenAPITools.Model [DataMember(Name = "int32", EmitDefaultValue = false)] public int Int32 { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [DataMember(Name = "unsigned_integer", EmitDefaultValue = false)] + public uint UnsignedInteger { get; set; } + /// /// Gets or Sets Int64 /// [DataMember(Name = "int64", EmitDefaultValue = false)] public long Int64 { get; set; } + /// + /// Gets or Sets UnsignedLong + /// + [DataMember(Name = "unsigned_long", EmitDefaultValue = false)] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Number /// @@ -209,7 +225,9 @@ namespace Org.OpenAPITools.Model sb.Append("class FormatTest {\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Double: ").Append(Double).Append("\n"); @@ -268,7 +286,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; hashCode = (hashCode * 59) + this.Integer.GetHashCode(); hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedInteger.GetHashCode(); hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); hashCode = (hashCode * 59) + this.Float.GetHashCode(); hashCode = (hashCode * 59) + this.Double.GetHashCode(); @@ -348,6 +368,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + // Number (decimal) maximum if (this.Number > (decimal)543.2) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md index 39a70be7ad4..1664a9d7c72 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md @@ -6,7 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Integer** | **int** | | [optional] **Int32** | **int** | | [optional] +**UnsignedInteger** | **uint** | | [optional] **Int64** | **long** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | **Float** | **float** | | [optional] **Double** | **double** | | [optional] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs index 9d3f21d71eb..743b84f13a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs @@ -45,7 +45,9 @@ namespace Org.OpenAPITools.Model /// /// integer. /// int32. + /// unsignedInteger. /// int64. + /// unsignedLong. /// number (required). /// _float. /// _double. @@ -59,7 +61,7 @@ namespace Org.OpenAPITools.Model /// password (required). /// A string that is a 10 digit number. Can have leading zeros.. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. - public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) { this.Number = number; // to ensure "_byte" is required (not null) @@ -77,7 +79,9 @@ namespace Org.OpenAPITools.Model this.Password = password; this.Integer = integer; this.Int32 = int32; + this.UnsignedInteger = unsignedInteger; this.Int64 = int64; + this.UnsignedLong = unsignedLong; this.Float = _float; this.Double = _double; this.Decimal = _decimal; @@ -102,12 +106,24 @@ namespace Org.OpenAPITools.Model [DataMember(Name = "int32", EmitDefaultValue = false)] public int Int32 { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [DataMember(Name = "unsigned_integer", EmitDefaultValue = false)] + public uint UnsignedInteger { get; set; } + /// /// Gets or Sets Int64 /// [DataMember(Name = "int64", EmitDefaultValue = false)] public long Int64 { get; set; } + /// + /// Gets or Sets UnsignedLong + /// + [DataMember(Name = "unsigned_long", EmitDefaultValue = false)] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Number /// @@ -208,7 +224,9 @@ namespace Org.OpenAPITools.Model sb.Append("class FormatTest {\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Double: ").Append(Double).Append("\n"); @@ -267,7 +285,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; hashCode = (hashCode * 59) + this.Integer.GetHashCode(); hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedInteger.GetHashCode(); hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); hashCode = (hashCode * 59) + this.Float.GetHashCode(); hashCode = (hashCode * 59) + this.Double.GetHashCode(); @@ -347,6 +367,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + // Number (decimal) maximum if (this.Number > (decimal)543.2) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FormatTest.md index 39a70be7ad4..1664a9d7c72 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FormatTest.md @@ -6,7 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Integer** | **int** | | [optional] **Int32** | **int** | | [optional] +**UnsignedInteger** | **uint** | | [optional] **Int64** | **long** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | **Float** | **float** | | [optional] **Double** | **double** | | [optional] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs index 9d3f21d71eb..743b84f13a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs @@ -45,7 +45,9 @@ namespace Org.OpenAPITools.Model /// /// integer. /// int32. + /// unsignedInteger. /// int64. + /// unsignedLong. /// number (required). /// _float. /// _double. @@ -59,7 +61,7 @@ namespace Org.OpenAPITools.Model /// password (required). /// A string that is a 10 digit number. Can have leading zeros.. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. - public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) { this.Number = number; // to ensure "_byte" is required (not null) @@ -77,7 +79,9 @@ namespace Org.OpenAPITools.Model this.Password = password; this.Integer = integer; this.Int32 = int32; + this.UnsignedInteger = unsignedInteger; this.Int64 = int64; + this.UnsignedLong = unsignedLong; this.Float = _float; this.Double = _double; this.Decimal = _decimal; @@ -102,12 +106,24 @@ namespace Org.OpenAPITools.Model [DataMember(Name = "int32", EmitDefaultValue = false)] public int Int32 { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [DataMember(Name = "unsigned_integer", EmitDefaultValue = false)] + public uint UnsignedInteger { get; set; } + /// /// Gets or Sets Int64 /// [DataMember(Name = "int64", EmitDefaultValue = false)] public long Int64 { get; set; } + /// + /// Gets or Sets UnsignedLong + /// + [DataMember(Name = "unsigned_long", EmitDefaultValue = false)] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Number /// @@ -208,7 +224,9 @@ namespace Org.OpenAPITools.Model sb.Append("class FormatTest {\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Double: ").Append(Double).Append("\n"); @@ -267,7 +285,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; hashCode = (hashCode * 59) + this.Integer.GetHashCode(); hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedInteger.GetHashCode(); hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); hashCode = (hashCode * 59) + this.Float.GetHashCode(); hashCode = (hashCode * 59) + this.Double.GetHashCode(); @@ -347,6 +367,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + // Number (decimal) maximum if (this.Number > (decimal)543.2) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md index 39a70be7ad4..1664a9d7c72 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md @@ -6,7 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Integer** | **int** | | [optional] **Int32** | **int** | | [optional] +**UnsignedInteger** | **uint** | | [optional] **Int64** | **long** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | **Float** | **float** | | [optional] **Double** | **double** | | [optional] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs index 9d3f21d71eb..743b84f13a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -45,7 +45,9 @@ namespace Org.OpenAPITools.Model ///
        /// integer. /// int32. + /// unsignedInteger. /// int64. + /// unsignedLong. /// number (required). /// _float. /// _double. @@ -59,7 +61,7 @@ namespace Org.OpenAPITools.Model /// password (required). /// A string that is a 10 digit number. Can have leading zeros.. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. - public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) { this.Number = number; // to ensure "_byte" is required (not null) @@ -77,7 +79,9 @@ namespace Org.OpenAPITools.Model this.Password = password; this.Integer = integer; this.Int32 = int32; + this.UnsignedInteger = unsignedInteger; this.Int64 = int64; + this.UnsignedLong = unsignedLong; this.Float = _float; this.Double = _double; this.Decimal = _decimal; @@ -102,12 +106,24 @@ namespace Org.OpenAPITools.Model [DataMember(Name = "int32", EmitDefaultValue = false)] public int Int32 { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [DataMember(Name = "unsigned_integer", EmitDefaultValue = false)] + public uint UnsignedInteger { get; set; } + /// /// Gets or Sets Int64 /// [DataMember(Name = "int64", EmitDefaultValue = false)] public long Int64 { get; set; } + /// + /// Gets or Sets UnsignedLong + /// + [DataMember(Name = "unsigned_long", EmitDefaultValue = false)] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Number /// @@ -208,7 +224,9 @@ namespace Org.OpenAPITools.Model sb.Append("class FormatTest {\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Double: ").Append(Double).Append("\n"); @@ -267,7 +285,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; hashCode = (hashCode * 59) + this.Integer.GetHashCode(); hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedInteger.GetHashCode(); hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); hashCode = (hashCode * 59) + this.Float.GetHashCode(); hashCode = (hashCode * 59) + this.Double.GetHashCode(); @@ -347,6 +367,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + // Number (decimal) maximum if (this.Number > (decimal)543.2) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md index 39a70be7ad4..1664a9d7c72 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md @@ -6,7 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Integer** | **int** | | [optional] **Int32** | **int** | | [optional] +**UnsignedInteger** | **uint** | | [optional] **Int64** | **long** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | **Float** | **float** | | [optional] **Double** | **double** | | [optional] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs index f0819ea89a3..2883d3eb966 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs @@ -40,7 +40,9 @@ namespace Org.OpenAPITools.Model ///
        /// integer. /// int32. + /// unsignedInteger. /// int64. + /// unsignedLong. /// number (required). /// _float. /// _double. @@ -54,7 +56,7 @@ namespace Org.OpenAPITools.Model /// password (required). /// A string that is a 10 digit number. Can have leading zeros.. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. - public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) { this.Number = number; // to ensure "_byte" is required (not null) @@ -72,7 +74,9 @@ namespace Org.OpenAPITools.Model this.Password = password; this.Integer = integer; this.Int32 = int32; + this.UnsignedInteger = unsignedInteger; this.Int64 = int64; + this.UnsignedLong = unsignedLong; this.Float = _float; this.Double = _double; this.Decimal = _decimal; @@ -96,12 +100,24 @@ namespace Org.OpenAPITools.Model [DataMember(Name = "int32", EmitDefaultValue = false)] public int Int32 { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [DataMember(Name = "unsigned_integer", EmitDefaultValue = false)] + public uint UnsignedInteger { get; set; } + /// /// Gets or Sets Int64 /// [DataMember(Name = "int64", EmitDefaultValue = false)] public long Int64 { get; set; } + /// + /// Gets or Sets UnsignedLong + /// + [DataMember(Name = "unsigned_long", EmitDefaultValue = false)] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Number /// @@ -196,7 +212,9 @@ namespace Org.OpenAPITools.Model sb.Append("class FormatTest {\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Double: ").Append(Double).Append("\n"); @@ -253,10 +271,18 @@ namespace Org.OpenAPITools.Model this.Int32 == input.Int32 || this.Int32.Equals(input.Int32) ) && + ( + this.UnsignedInteger == input.UnsignedInteger || + this.UnsignedInteger.Equals(input.UnsignedInteger) + ) && ( this.Int64 == input.Int64 || this.Int64.Equals(input.Int64) ) && + ( + this.UnsignedLong == input.UnsignedLong || + this.UnsignedLong.Equals(input.UnsignedLong) + ) && ( this.Number == input.Number || this.Number.Equals(input.Number) @@ -331,7 +357,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; hashCode = (hashCode * 59) + this.Integer.GetHashCode(); hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedInteger.GetHashCode(); hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); hashCode = (hashCode * 59) + this.Float.GetHashCode(); hashCode = (hashCode * 59) + this.Double.GetHashCode(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md index 39a70be7ad4..1664a9d7c72 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md @@ -6,7 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Integer** | **int** | | [optional] **Int32** | **int** | | [optional] +**UnsignedInteger** | **uint** | | [optional] **Int64** | **long** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | **Float** | **float** | | [optional] **Double** | **double** | | [optional] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs index 9d3f21d71eb..743b84f13a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -45,7 +45,9 @@ namespace Org.OpenAPITools.Model /// /// integer. /// int32. + /// unsignedInteger. /// int64. + /// unsignedLong. /// number (required). /// _float. /// _double. @@ -59,7 +61,7 @@ namespace Org.OpenAPITools.Model /// password (required). /// A string that is a 10 digit number. Can have leading zeros.. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. - public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) { this.Number = number; // to ensure "_byte" is required (not null) @@ -77,7 +79,9 @@ namespace Org.OpenAPITools.Model this.Password = password; this.Integer = integer; this.Int32 = int32; + this.UnsignedInteger = unsignedInteger; this.Int64 = int64; + this.UnsignedLong = unsignedLong; this.Float = _float; this.Double = _double; this.Decimal = _decimal; @@ -102,12 +106,24 @@ namespace Org.OpenAPITools.Model [DataMember(Name = "int32", EmitDefaultValue = false)] public int Int32 { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [DataMember(Name = "unsigned_integer", EmitDefaultValue = false)] + public uint UnsignedInteger { get; set; } + /// /// Gets or Sets Int64 /// [DataMember(Name = "int64", EmitDefaultValue = false)] public long Int64 { get; set; } + /// + /// Gets or Sets UnsignedLong + /// + [DataMember(Name = "unsigned_long", EmitDefaultValue = false)] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Number /// @@ -208,7 +224,9 @@ namespace Org.OpenAPITools.Model sb.Append("class FormatTest {\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Double: ").Append(Double).Append("\n"); @@ -267,7 +285,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; hashCode = (hashCode * 59) + this.Integer.GetHashCode(); hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedInteger.GetHashCode(); hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); hashCode = (hashCode * 59) + this.Float.GetHashCode(); hashCode = (hashCode * 59) + this.Double.GetHashCode(); @@ -347,6 +367,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + // Number (decimal) maximum if (this.Number > (decimal)543.2) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md index 39a70be7ad4..1664a9d7c72 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md @@ -6,7 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Integer** | **int** | | [optional] **Int32** | **int** | | [optional] +**UnsignedInteger** | **uint** | | [optional] **Int64** | **long** | | [optional] +**UnsignedLong** | **ulong** | | [optional] **Number** | **decimal** | | **Float** | **float** | | [optional] **Double** | **double** | | [optional] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs index e468b57f8a4..9829a5b138b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs @@ -42,7 +42,9 @@ namespace Org.OpenAPITools.Model /// /// integer. /// int32. + /// unsignedInteger. /// int64. + /// unsignedLong. /// number (required). /// _float. /// _double. @@ -56,7 +58,7 @@ namespace Org.OpenAPITools.Model /// password (required). /// A string that is a 10 digit number. Can have leading zeros.. /// A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.. - public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) + public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float _float = default(float), double _double = default(double), decimal _decimal = default(decimal), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string)) { this.Number = number; // to ensure "_byte" is required (not null) @@ -74,7 +76,9 @@ namespace Org.OpenAPITools.Model this.Password = password; this.Integer = integer; this.Int32 = int32; + this.UnsignedInteger = unsignedInteger; this.Int64 = int64; + this.UnsignedLong = unsignedLong; this.Float = _float; this.Double = _double; this.Decimal = _decimal; @@ -98,12 +102,24 @@ namespace Org.OpenAPITools.Model [DataMember(Name = "int32", EmitDefaultValue = false)] public int Int32 { get; set; } + /// + /// Gets or Sets UnsignedInteger + /// + [DataMember(Name = "unsigned_integer", EmitDefaultValue = false)] + public uint UnsignedInteger { get; set; } + /// /// Gets or Sets Int64 /// [DataMember(Name = "int64", EmitDefaultValue = false)] public long Int64 { get; set; } + /// + /// Gets or Sets UnsignedLong + /// + [DataMember(Name = "unsigned_long", EmitDefaultValue = false)] + public ulong UnsignedLong { get; set; } + /// /// Gets or Sets Number /// @@ -198,7 +214,9 @@ namespace Org.OpenAPITools.Model sb.Append("class FormatTest {\n"); sb.Append(" Integer: ").Append(Integer).Append("\n"); sb.Append(" Int32: ").Append(Int32).Append("\n"); + sb.Append(" UnsignedInteger: ").Append(UnsignedInteger).Append("\n"); sb.Append(" Int64: ").Append(Int64).Append("\n"); + sb.Append(" UnsignedLong: ").Append(UnsignedLong).Append("\n"); sb.Append(" Number: ").Append(Number).Append("\n"); sb.Append(" Float: ").Append(Float).Append("\n"); sb.Append(" Double: ").Append(Double).Append("\n"); @@ -256,7 +274,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; hashCode = (hashCode * 59) + this.Integer.GetHashCode(); hashCode = (hashCode * 59) + this.Int32.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedInteger.GetHashCode(); hashCode = (hashCode * 59) + this.Int64.GetHashCode(); + hashCode = (hashCode * 59) + this.UnsignedLong.GetHashCode(); hashCode = (hashCode * 59) + this.Number.GetHashCode(); hashCode = (hashCode * 59) + this.Float.GetHashCode(); hashCode = (hashCode * 59) + this.Double.GetHashCode(); @@ -332,6 +352,18 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + // UnsignedInteger (uint) maximum + if (this.UnsignedInteger > (uint)200) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value less than or equal to 200.", new [] { "UnsignedInteger" }); + } + + // UnsignedInteger (uint) minimum + if (this.UnsignedInteger < (uint)20) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UnsignedInteger, must be a value greater than or equal to 20.", new [] { "UnsignedInteger" }); + } + // Number (decimal) maximum if (this.Number > (decimal)543.2) { From e9fed506b379f12e82b7ec2ebd136ca3eaadec92 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Mon, 13 Mar 2023 03:25:29 -0400 Subject: [PATCH 024/131] used the date format (#14936) --- .../libraries/generichost/DateTimeJsonConverter.mustache | 2 +- .../generichost/DateTimeNullableJsonConverter.mustache | 2 +- .../src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs | 2 +- .../Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs | 2 +- .../src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs | 2 +- .../Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs | 2 +- .../src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs | 2 +- .../Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs | 2 +- .../src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs | 2 +- .../Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs | 2 +- .../src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs | 2 +- .../Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs | 2 +- .../src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs | 2 +- .../Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeJsonConverter.mustache index 55ecf4a1660..21d35ec2302 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeJsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeJsonConverter.mustache @@ -46,6 +46,6 @@ namespace {{packageName}}.{{clientPackage}} /// /// public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) => - writer.WriteStringValue(dateTimeValue.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.ToString("{{{dateTimeFormat}}}", CultureInfo.InvariantCulture)); } } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeNullableJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeNullableJsonConverter.mustache index f052afa1491..52e2afa0b7a 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeNullableJsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeNullableJsonConverter.mustache @@ -50,7 +50,7 @@ namespace {{packageName}}.{{clientPackage}} if (dateTimeValue == null) writer.WriteNullValue(); else - writer.WriteStringValue(dateTimeValue.Value.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.Value.ToString("{{{dateTimeFormat}}}", CultureInfo.InvariantCulture)); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs index bb0457c6e9d..71992dc8d86 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs @@ -71,6 +71,6 @@ namespace Org.OpenAPITools.Client /// /// public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) => - writer.WriteStringValue(dateTimeValue.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs index d3a7b947bc7..90d2174e4a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs @@ -75,7 +75,7 @@ namespace Org.OpenAPITools.Client if (dateTimeValue == null) writer.WriteNullValue(); else - writer.WriteStringValue(dateTimeValue.Value.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.Value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs index 6222464831d..e8291cb2e1e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs @@ -71,6 +71,6 @@ namespace Org.OpenAPITools.Client /// /// public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) => - writer.WriteStringValue(dateTimeValue.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs index 4e53bbe9557..e26c40071cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs @@ -75,7 +75,7 @@ namespace Org.OpenAPITools.Client if (dateTimeValue == null) writer.WriteNullValue(); else - writer.WriteStringValue(dateTimeValue.Value.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.Value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs index 0083ee7169a..245aaa03ef2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs @@ -71,6 +71,6 @@ namespace Org.OpenAPITools.Client /// /// public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) => - writer.WriteStringValue(dateTimeValue.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs index 95546974e1e..8f3c26a5869 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs @@ -75,7 +75,7 @@ namespace Org.OpenAPITools.Client if (dateTimeValue == null) writer.WriteNullValue(); else - writer.WriteStringValue(dateTimeValue.Value.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.Value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs index ba2d0c137ba..c53e443828d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs @@ -71,6 +71,6 @@ namespace Org.OpenAPITools.Client /// /// public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) => - writer.WriteStringValue(dateTimeValue.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs index 1bc64cb2496..fd867d948f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs @@ -75,7 +75,7 @@ namespace Org.OpenAPITools.Client if (dateTimeValue == null) writer.WriteNullValue(); else - writer.WriteStringValue(dateTimeValue.Value.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.Value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs index ba2d0c137ba..c53e443828d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs @@ -71,6 +71,6 @@ namespace Org.OpenAPITools.Client /// /// public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) => - writer.WriteStringValue(dateTimeValue.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs index 1bc64cb2496..fd867d948f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs @@ -75,7 +75,7 @@ namespace Org.OpenAPITools.Client if (dateTimeValue == null) writer.WriteNullValue(); else - writer.WriteStringValue(dateTimeValue.Value.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.Value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs index 6222464831d..e8291cb2e1e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs @@ -71,6 +71,6 @@ namespace Org.OpenAPITools.Client /// /// public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) => - writer.WriteStringValue(dateTimeValue.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs index 4e53bbe9557..e26c40071cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs @@ -75,7 +75,7 @@ namespace Org.OpenAPITools.Client if (dateTimeValue == null) writer.WriteNullValue(); else - writer.WriteStringValue(dateTimeValue.Value.ToString(Formats[0], CultureInfo.InvariantCulture)); + writer.WriteStringValue(dateTimeValue.Value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture)); } } } From 43697d2cfb04f575cf69a198391b08fa9a96c89c Mon Sep 17 00:00:00 2001 From: David Weinstein Date: Mon, 13 Mar 2023 03:40:43 -0400 Subject: [PATCH 025/131] [erlang-client] Fix Path (#14821) --- .../src/main/resources/erlang-client/api.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/erlang-client/api.mustache b/modules/openapi-generator/src/main/resources/erlang-client/api.mustache index 65cac6a8677..04019e4439d 100644 --- a/modules/openapi-generator/src/main/resources/erlang-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/erlang-client/api.mustache @@ -21,7 +21,7 @@ Cfg = maps:get(cfg, Optional, application:get_env({{packageName}}_api, config, #{})), Method = {{httpMethod}}, - Path = [<<"{{{replacedPathName}}}">>], + Path = ["{{{replacedPathName}}}"], QS = {{#queryParams.isEmpty}}[]{{/queryParams.isEmpty}}{{^queryParams.isEmpty}}lists:flatten([{{#joinWithComma}}{{#queryParams}}{{#required}}{{#qsEncode}}{{this}}{{/qsEncode}} {{/required}}{{/queryParams}}{{/joinWithComma}}])++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#queryParams}}{{^required}} '{{baseName}}'{{/required}}{{/queryParams}}{{/joinWithComma}}], _OptionalParams){{/queryParams.isEmpty}}, Headers = {{#headerParams.isEmpty}}[]{{/headerParams.isEmpty}}{{^headerParams.isEmpty}}[{{#headerParams}}{{#required}} {<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/headerParams}}]++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#headerParams}}{{^required}} '{{baseName}}'{{/required}}{{/headerParams}}{{/joinWithComma}}], _OptionalParams){{/headerParams.isEmpty}}, Body1 = {{^formParams.isEmpty}}{form, [{{#joinWithComma}}{{#formParams}}{{#required}} {<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/formParams}}{{/joinWithComma}}]++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#formParams}}{{^required}} '{{baseName}}'{{/required}}{{/formParams}}{{/joinWithComma}}], _OptionalParams)}{{/formParams.isEmpty}}{{#formParams.isEmpty}}{{#bodyParams.isEmpty}}[]{{/bodyParams.isEmpty}}{{^bodyParams.isEmpty}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/bodyParams.isEmpty}}{{/formParams.isEmpty}}, From 6d71db3d6dbcd730b23fbb4c88f15c08a5e12a0e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 13 Mar 2023 15:46:31 +0800 Subject: [PATCH 026/131] update samples --- .../{unmaintained => }/erlang-client.yaml | 0 .../{unmaintained => }/erlang-proper.yaml | 0 .../erlang-client/.openapi-generator/VERSION | 2 +- .../erlang-client/src/petstore_pet_api.erl | 21 +++++++------------ .../erlang-client/src/petstore_store_api.erl | 9 ++++---- .../erlang-client/src/petstore_user_api.erl | 21 +++++++------------ .../erlang-client/src/petstore_utils.erl | 8 +++---- 7 files changed, 25 insertions(+), 36 deletions(-) rename bin/configs/{unmaintained => }/erlang-client.yaml (100%) rename bin/configs/{unmaintained => }/erlang-proper.yaml (100%) diff --git a/bin/configs/unmaintained/erlang-client.yaml b/bin/configs/erlang-client.yaml similarity index 100% rename from bin/configs/unmaintained/erlang-client.yaml rename to bin/configs/erlang-client.yaml diff --git a/bin/configs/unmaintained/erlang-proper.yaml b/bin/configs/erlang-proper.yaml similarity index 100% rename from bin/configs/unmaintained/erlang-proper.yaml rename to bin/configs/erlang-proper.yaml diff --git a/samples/client/petstore/erlang-client/.openapi-generator/VERSION b/samples/client/petstore/erlang-client/.openapi-generator/VERSION index 4b448de535c..7f4d792ec2c 100644 --- a/samples/client/petstore/erlang-client/.openapi-generator/VERSION +++ b/samples/client/petstore/erlang-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/erlang-client/src/petstore_pet_api.erl b/samples/client/petstore/erlang-client/src/petstore_pet_api.erl index 0c40195e7f6..c4df7b91ac6 100644 --- a/samples/client/petstore/erlang-client/src/petstore_pet_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_pet_api.erl @@ -12,7 +12,6 @@ -define(BASE_URL, <<"/v2">>). %% @doc Add a new pet to the store -%% -spec add_pet(ctx:ctx(), petstore_pet:petstore_pet()) -> {ok, petstore_pet:petstore_pet(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. add_pet(Ctx, PetstorePet) -> add_pet(Ctx, PetstorePet, #{}). @@ -23,7 +22,7 @@ add_pet(Ctx, PetstorePet, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = [<<"/pet">>], + Path = ["/pet"], QS = [], Headers = [], Body1 = PetstorePet, @@ -33,7 +32,6 @@ add_pet(Ctx, PetstorePet, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Deletes a pet -%% -spec delete_pet(ctx:ctx(), integer()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. delete_pet(Ctx, PetId) -> delete_pet(Ctx, PetId, #{}). @@ -44,7 +42,7 @@ delete_pet(Ctx, PetId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = delete, - Path = [<<"/pet/", PetId, "">>], + Path = ["/pet/", PetId, ""], QS = [], Headers = []++petstore_utils:optional_params(['api_key'], _OptionalParams), Body1 = [], @@ -65,7 +63,7 @@ find_pets_by_status(Ctx, Status, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = [<<"/pet/findByStatus">>], + Path = ["/pet/findByStatus"], QS = lists:flatten([[{<<"status">>, X} || X <- Status]])++petstore_utils:optional_params([], _OptionalParams), Headers = [], Body1 = [], @@ -86,7 +84,7 @@ find_pets_by_tags(Ctx, Tags, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = [<<"/pet/findByTags">>], + Path = ["/pet/findByTags"], QS = lists:flatten([[{<<"tags">>, X} || X <- Tags]])++petstore_utils:optional_params([], _OptionalParams), Headers = [], Body1 = [], @@ -107,7 +105,7 @@ get_pet_by_id(Ctx, PetId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = [<<"/pet/", PetId, "">>], + Path = ["/pet/", PetId, ""], QS = [], Headers = [], Body1 = [], @@ -117,7 +115,6 @@ get_pet_by_id(Ctx, PetId, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Update an existing pet -%% -spec update_pet(ctx:ctx(), petstore_pet:petstore_pet()) -> {ok, petstore_pet:petstore_pet(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. update_pet(Ctx, PetstorePet) -> update_pet(Ctx, PetstorePet, #{}). @@ -128,7 +125,7 @@ update_pet(Ctx, PetstorePet, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = put, - Path = [<<"/pet">>], + Path = ["/pet"], QS = [], Headers = [], Body1 = PetstorePet, @@ -138,7 +135,6 @@ update_pet(Ctx, PetstorePet, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Updates a pet in the store with form data -%% -spec update_pet_with_form(ctx:ctx(), integer()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. update_pet_with_form(Ctx, PetId) -> update_pet_with_form(Ctx, PetId, #{}). @@ -149,7 +145,7 @@ update_pet_with_form(Ctx, PetId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = [<<"/pet/", PetId, "">>], + Path = ["/pet/", PetId, ""], QS = [], Headers = [], Body1 = {form, []++petstore_utils:optional_params(['name', 'status'], _OptionalParams)}, @@ -159,7 +155,6 @@ update_pet_with_form(Ctx, PetId, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc uploads an image -%% -spec upload_file(ctx:ctx(), integer()) -> {ok, petstore_api_response:petstore_api_response(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. upload_file(Ctx, PetId) -> upload_file(Ctx, PetId, #{}). @@ -170,7 +165,7 @@ upload_file(Ctx, PetId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = [<<"/pet/", PetId, "/uploadImage">>], + Path = ["/pet/", PetId, "/uploadImage"], QS = [], Headers = [], Body1 = {form, []++petstore_utils:optional_params(['additionalMetadata', 'file'], _OptionalParams)}, diff --git a/samples/client/petstore/erlang-client/src/petstore_store_api.erl b/samples/client/petstore/erlang-client/src/petstore_store_api.erl index d9ae2c153a8..5bebc5574ad 100644 --- a/samples/client/petstore/erlang-client/src/petstore_store_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_store_api.erl @@ -19,7 +19,7 @@ delete_order(Ctx, OrderId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = delete, - Path = [<<"/store/order/", OrderId, "">>], + Path = ["/store/order/", OrderId, ""], QS = [], Headers = [], Body1 = [], @@ -40,7 +40,7 @@ get_inventory(Ctx, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = [<<"/store/inventory">>], + Path = ["/store/inventory"], QS = [], Headers = [], Body1 = [], @@ -61,7 +61,7 @@ get_order_by_id(Ctx, OrderId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = [<<"/store/order/", OrderId, "">>], + Path = ["/store/order/", OrderId, ""], QS = [], Headers = [], Body1 = [], @@ -71,7 +71,6 @@ get_order_by_id(Ctx, OrderId, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Place an order for a pet -%% -spec place_order(ctx:ctx(), petstore_order:petstore_order()) -> {ok, petstore_order:petstore_order(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. place_order(Ctx, PetstoreOrder) -> place_order(Ctx, PetstoreOrder, #{}). @@ -82,7 +81,7 @@ place_order(Ctx, PetstoreOrder, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = [<<"/store/order">>], + Path = ["/store/order"], QS = [], Headers = [], Body1 = PetstoreOrder, diff --git a/samples/client/petstore/erlang-client/src/petstore_user_api.erl b/samples/client/petstore/erlang-client/src/petstore_user_api.erl index 7a0da8b56b2..6f6a5b13593 100644 --- a/samples/client/petstore/erlang-client/src/petstore_user_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_user_api.erl @@ -23,7 +23,7 @@ create_user(Ctx, PetstoreUser, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = [<<"/user">>], + Path = ["/user"], QS = [], Headers = [], Body1 = PetstoreUser, @@ -33,7 +33,6 @@ create_user(Ctx, PetstoreUser, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Creates list of users with given input array -%% -spec create_users_with_array_input(ctx:ctx(), list()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. create_users_with_array_input(Ctx, PetstoreUserArray) -> create_users_with_array_input(Ctx, PetstoreUserArray, #{}). @@ -44,7 +43,7 @@ create_users_with_array_input(Ctx, PetstoreUserArray, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = [<<"/user/createWithArray">>], + Path = ["/user/createWithArray"], QS = [], Headers = [], Body1 = PetstoreUserArray, @@ -54,7 +53,6 @@ create_users_with_array_input(Ctx, PetstoreUserArray, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Creates list of users with given input array -%% -spec create_users_with_list_input(ctx:ctx(), list()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. create_users_with_list_input(Ctx, PetstoreUserArray) -> create_users_with_list_input(Ctx, PetstoreUserArray, #{}). @@ -65,7 +63,7 @@ create_users_with_list_input(Ctx, PetstoreUserArray, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = [<<"/user/createWithList">>], + Path = ["/user/createWithList"], QS = [], Headers = [], Body1 = PetstoreUserArray, @@ -86,7 +84,7 @@ delete_user(Ctx, Username, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = delete, - Path = [<<"/user/", Username, "">>], + Path = ["/user/", Username, ""], QS = [], Headers = [], Body1 = [], @@ -96,7 +94,6 @@ delete_user(Ctx, Username, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Get user by user name -%% -spec get_user_by_name(ctx:ctx(), binary()) -> {ok, petstore_user:petstore_user(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. get_user_by_name(Ctx, Username) -> get_user_by_name(Ctx, Username, #{}). @@ -107,7 +104,7 @@ get_user_by_name(Ctx, Username, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = [<<"/user/", Username, "">>], + Path = ["/user/", Username, ""], QS = [], Headers = [], Body1 = [], @@ -117,7 +114,6 @@ get_user_by_name(Ctx, Username, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Logs user into the system -%% -spec login_user(ctx:ctx(), binary(), binary()) -> {ok, binary(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. login_user(Ctx, Username, Password) -> login_user(Ctx, Username, Password, #{}). @@ -128,7 +124,7 @@ login_user(Ctx, Username, Password, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = [<<"/user/login">>], + Path = ["/user/login"], QS = lists:flatten([{<<"username">>, Username}, {<<"password">>, Password}])++petstore_utils:optional_params([], _OptionalParams), Headers = [], Body1 = [], @@ -138,7 +134,6 @@ login_user(Ctx, Username, Password, Optional) -> petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Logs out current logged in user session -%% -spec logout_user(ctx:ctx()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. logout_user(Ctx) -> logout_user(Ctx, #{}). @@ -149,7 +144,7 @@ logout_user(Ctx, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = [<<"/user/logout">>], + Path = ["/user/logout"], QS = [], Headers = [], Body1 = [], @@ -170,7 +165,7 @@ update_user(Ctx, Username, PetstoreUser, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = put, - Path = [<<"/user/", Username, "">>], + Path = ["/user/", Username, ""], QS = [], Headers = [], Body1 = PetstoreUser, diff --git a/samples/client/petstore/erlang-client/src/petstore_utils.erl b/samples/client/petstore/erlang-client/src/petstore_utils.erl index b96ec3da5ad..24598b36764 100644 --- a/samples/client/petstore/erlang-client/src/petstore_utils.erl +++ b/samples/client/petstore/erlang-client/src/petstore_utils.erl @@ -72,12 +72,12 @@ auth_with_prefix(Cfg, Key, Token) -> update_params_with_auth(Cfg, Headers, QS) -> AuthSettings = maps:get(auth, Cfg, #{}), - Auths = #{ 'api_key' => - #{type => 'apiKey', - key => <<"api_key">>, - in => header}, 'petstore_auth' => + Auths = #{ 'petstore_auth' => #{type => 'oauth2', key => <<"Authorization">>, + in => header}, 'api_key' => + #{type => 'apiKey', + key => <<"api_key">>, in => header}}, maps:fold(fun(AuthName, #{type := _Type, From 9a53625fccfb6b23e0597d81fea1948db9ebf0a4 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 13 Mar 2023 16:07:14 +0800 Subject: [PATCH 027/131] update erlang proper samples --- .../client/petstore/erlang-proper/.openapi-generator/VERSION | 2 +- samples/client/petstore/erlang-proper/src/petstore_api.erl | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/samples/client/petstore/erlang-proper/.openapi-generator/VERSION b/samples/client/petstore/erlang-proper/.openapi-generator/VERSION index 6555596f931..7f4d792ec2c 100644 --- a/samples/client/petstore/erlang-proper/.openapi-generator/VERSION +++ b/samples/client/petstore/erlang-proper/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.0-SNAPSHOT \ No newline at end of file +6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/erlang-proper/src/petstore_api.erl b/samples/client/petstore/erlang-proper/src/petstore_api.erl index b45cf6a1607..c7f847e86cc 100644 --- a/samples/client/petstore/erlang-proper/src/petstore_api.erl +++ b/samples/client/petstore/erlang-proper/src/petstore_api.erl @@ -26,7 +26,6 @@ create_user(PetstoreUser) -> petstore_utils:request(Method, [Host, ?BASE_URL, Path], jsx:encode(Body), ContentType). %% @doc Creates list of users with given input array -%% -spec create_users_with_array_input(list(petstore_user:petstore_user())) -> petstore_utils:response(). create_users_with_array_input(PetstoreUserArray) -> @@ -39,7 +38,6 @@ create_users_with_array_input(PetstoreUserArray) -> petstore_utils:request(Method, [Host, ?BASE_URL, Path], jsx:encode(Body), ContentType). %% @doc Creates list of users with given input array -%% -spec create_users_with_list_input(list(petstore_user:petstore_user())) -> petstore_utils:response(). create_users_with_list_input(PetstoreUserArray) -> @@ -63,7 +61,6 @@ delete_user(Username) -> petstore_utils:request(Method, [Host, ?BASE_URL, Path]). %% @doc Get user by user name -%% -spec get_user_by_name(binary()) -> petstore_utils:response(). get_user_by_name(Username) -> @@ -74,7 +71,6 @@ get_user_by_name(Username) -> petstore_utils:request(Method, [Host, ?BASE_URL, Path]). %% @doc Logs user into the system -%% -spec login_user(binary(), binary()) -> petstore_utils:response(). login_user(Username, Password) -> @@ -86,7 +82,6 @@ login_user(Username, Password) -> petstore_utils:request(Method, [Host, ?BASE_URL, Path, <<"?">>, QueryString]). %% @doc Logs out current logged in user session -%% -spec logout_user() -> petstore_utils:response(). logout_user() -> From 564939a4a8eb73f26a5878445c058875e2a1f2a9 Mon Sep 17 00:00:00 2001 From: Robin Karlsson Date: Mon, 13 Mar 2023 09:42:37 +0100 Subject: [PATCH 028/131] [java][jersey] Remove double brace initialization and some more jersey cleanup (#14783) * Remove double brace initialization * Use diamond operator * Less clutter in generated api classes * Optimize isJsonMime * Revert change in escapeString Skip toString() on string parameters. * Fix edge-cases A ServerVariable without enumValues and/or operationServers with any ServerVariables would lead to invalid code. --- .../codegen/DefaultGenerator.java | 5 + .../Java/libraries/jersey2/ApiClient.mustache | 180 ++--- .../Java/libraries/jersey2/JSON.mustache | 8 +- .../jersey2/additional_properties.mustache | 2 +- .../libraries/jersey2/anyof_model.mustache | 6 +- .../Java/libraries/jersey2/api.mustache | 97 ++- .../libraries/jersey2/oneof_model.mustache | 8 +- .../Java/libraries/jersey2/pojo.mustache | 20 +- .../Java/libraries/jersey3/ApiClient.mustache | 180 ++--- .../Java/libraries/jersey3/JSON.mustache | 8 +- .../jersey3/additional_properties.mustache | 2 +- .../libraries/jersey3/anyof_model.mustache | 6 +- .../Java/libraries/jersey3/api.mustache | 97 ++- .../libraries/jersey3/oneof_model.mustache | 6 +- .../Java/libraries/jersey3/pojo.mustache | 20 +- .../org/openapitools/client/ApiClient.java | 76 +- .../java/org/openapitools/client/JSON.java | 8 +- .../client/api/AnotherFakeApi.java | 39 +- .../org/openapitools/client/api/FakeApi.java | 622 ++++------------- .../client/api/FakeClassnameTags123Api.java | 38 +- .../org/openapitools/client/api/PetApi.java | 380 +++------- .../org/openapitools/client/api/StoreApi.java | 155 +---- .../org/openapitools/client/api/UserApi.java | 314 ++------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../org/openapitools/client/model/Animal.java | 18 +- .../org/openapitools/client/model/BigCat.java | 12 +- .../org/openapitools/client/model/Cat.java | 14 +- .../org/openapitools/client/model/Dog.java | 12 +- .../org/openapitools/client/ApiClient.java | 76 +- .../java/org/openapitools/client/JSON.java | 8 +- .../client/api/AnotherFakeApi.java | 39 +- .../org/openapitools/client/api/FakeApi.java | 622 ++++------------- .../client/api/FakeClassnameTags123Api.java | 38 +- .../org/openapitools/client/api/PetApi.java | 380 +++------- .../org/openapitools/client/api/StoreApi.java | 155 +---- .../org/openapitools/client/api/UserApi.java | 314 ++------- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../org/openapitools/client/model/Animal.java | 18 +- .../org/openapitools/client/model/BigCat.java | 12 +- .../org/openapitools/client/model/Cat.java | 14 +- .../org/openapitools/client/model/Dog.java | 12 +- .../org/openapitools/client/ApiClient.java | 204 +++--- .../java/org/openapitools/client/JSON.java | 8 +- .../client/api/AnotherFakeApi.java | 39 +- .../openapitools/client/api/DefaultApi.java | 37 +- .../org/openapitools/client/api/FakeApi.java | 656 ++++-------------- .../client/api/FakeClassnameTags123Api.java | 38 +- .../org/openapitools/client/api/PetApi.java | 380 +++------- .../org/openapitools/client/api/StoreApi.java | 155 +---- .../org/openapitools/client/api/UserApi.java | 314 ++------- .../org/openapitools/client/model/Animal.java | 16 +- .../org/openapitools/client/model/Cat.java | 14 +- .../openapitools/client/model/ChildCat.java | 14 +- .../client/model/ComplexQuadrilateral.java | 2 +- .../org/openapitools/client/model/Dog.java | 14 +- .../openapitools/client/model/Drawing.java | 2 +- .../client/model/EquilateralTriangle.java | 2 +- .../org/openapitools/client/model/Fruit.java | 6 +- .../openapitools/client/model/FruitReq.java | 6 +- .../openapitools/client/model/GmFruit.java | 6 +- .../client/model/GrandparentAnimal.java | 16 +- .../org/openapitools/client/model/Mammal.java | 12 +- .../client/model/NullableClass.java | 2 +- .../client/model/NullableShape.java | 10 +- .../openapitools/client/model/ParentPet.java | 16 +- .../org/openapitools/client/model/Pig.java | 10 +- .../client/model/Quadrilateral.java | 10 +- .../client/model/ScaleneTriangle.java | 2 +- .../org/openapitools/client/model/Shape.java | 10 +- .../client/model/ShapeOrNull.java | 10 +- .../client/model/SimpleQuadrilateral.java | 2 +- .../openapitools/client/model/Triangle.java | 12 +- .../org/openapitools/client/model/Zebra.java | 2 +- .../org/openapitools/client/ApiClient.java | 142 ++-- .../java/org/openapitools/client/JSON.java | 8 +- .../org/openapitools/client/api/UsageApi.java | 141 +--- .../org/openapitools/client/ApiClient.java | 74 +- .../java/org/openapitools/client/JSON.java | 8 +- .../openapitools/client/api/DefaultApi.java | 37 +- .../client/model/ChildSchema.java | 14 +- .../client/model/MySchemaNameCharacters.java | 14 +- .../org/openapitools/client/model/Parent.java | 16 +- .../org/openapitools/client/ApiClient.java | 76 +- .../java/org/openapitools/client/JSON.java | 8 +- .../org/openapitools/client/api/PetApi.java | 333 +++------ .../org/openapitools/client/api/StoreApi.java | 155 +---- .../org/openapitools/client/api/UserApi.java | 308 ++------ .../org/openapitools/client/ApiClient.java | 204 +++--- .../java/org/openapitools/client/JSON.java | 8 +- .../client/api/AnotherFakeApi.java | 39 +- .../openapitools/client/api/DefaultApi.java | 37 +- .../org/openapitools/client/api/FakeApi.java | 656 ++++-------------- .../client/api/FakeClassnameTags123Api.java | 38 +- .../org/openapitools/client/api/PetApi.java | 380 +++------- .../org/openapitools/client/api/StoreApi.java | 155 +---- .../org/openapitools/client/api/UserApi.java | 314 ++------- .../org/openapitools/client/model/Animal.java | 16 +- .../org/openapitools/client/model/Cat.java | 14 +- .../openapitools/client/model/ChildCat.java | 14 +- .../client/model/ComplexQuadrilateral.java | 2 +- .../org/openapitools/client/model/Dog.java | 14 +- .../openapitools/client/model/Drawing.java | 2 +- .../client/model/EquilateralTriangle.java | 2 +- .../org/openapitools/client/model/Fruit.java | 6 +- .../openapitools/client/model/FruitReq.java | 6 +- .../openapitools/client/model/GmFruit.java | 6 +- .../client/model/GrandparentAnimal.java | 16 +- .../org/openapitools/client/model/Mammal.java | 14 +- .../client/model/NullableClass.java | 2 +- .../client/model/NullableShape.java | 12 +- .../openapitools/client/model/ParentPet.java | 16 +- .../org/openapitools/client/model/Pig.java | 12 +- .../client/model/Quadrilateral.java | 12 +- .../client/model/ScaleneTriangle.java | 2 +- .../org/openapitools/client/model/Shape.java | 12 +- .../client/model/ShapeOrNull.java | 12 +- .../client/model/SimpleQuadrilateral.java | 2 +- .../openapitools/client/model/Triangle.java | 14 +- .../org/openapitools/client/model/Zebra.java | 2 +- 131 files changed, 2746 insertions(+), 6705 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 9646e555663..78d3ac40920 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -820,6 +820,11 @@ public class DefaultGenerator implements Generator { bundle.put("hasServers", true); } + boolean hasOperationServers = allOperations != null && allOperations.stream() + .flatMap(om -> om.getOperations().getOperation().stream()) + .anyMatch(o -> o.servers != null && !o.servers.isEmpty()); + bundle.put("hasOperationServers", hasOperationServers); + if (openAPI.getExternalDocs() != null) { bundle.put("externalDocs", openAPI.getExternalDocs()); } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache index 962f41cc6fc..a8ef032386f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache @@ -38,6 +38,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -45,11 +46,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; {{#jsr310}} import java.time.OffsetDateTime; {{/jsr310}} @@ -79,80 +83,93 @@ import {{invokerPackage}}.auth.OAuth; */ {{>generatedAnnotation}} public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "{{{basePath}}}"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList({{#servers}}{{#-first}}Arrays.asList( -{{/-first}} new ServerConfiguration( - "{{{url}}}", - "{{{description}}}{{^description}}No description provided{{/description}}", - new HashMap(){{#variables}}{{#-first}} {{ -{{/-first}} put("{{{name}}}", new ServerVariable( - "{{{description}}}{{^description}}No description provided{{/description}}", - "{{{defaultValue}}}", - new HashSet( - {{#enumValues}} - {{#-first}} - Arrays.asList( - {{/-first}} - "{{{.}}}"{{^-last}},{{/-last}} - {{#-last}} - ) - {{/-last}} - {{/enumValues}} - ) - )); - {{#-last}} - }}{{/-last}}{{/variables}} - ){{^-last}},{{/-last}} + protected List servers = new ArrayList<>({{#servers}}{{#-first}}Arrays.asList( +{{/-first}} new ServerConfiguration( + "{{{url}}}", + "{{{description}}}{{^description}}No description provided{{/description}}", + {{^variables}} + new LinkedHashMap<>() + {{/variables}} + {{#variables}} + {{#-first}} + Stream.>of( + {{/-first}} + new SimpleEntry<>("{{{name}}}", new ServerVariable( + "{{{description}}}{{^description}}No description provided{{/description}}", + "{{{defaultValue}}}", + new LinkedHashSet<>({{#enumValues}}{{#-first}}Arrays.asList({{/-first}} + "{{{.}}}"{{^-last}},{{/-last}}{{#-last}} + ){{/-last}}{{/enumValues}}) + )){{^-last}},{{/-last}} + {{#-last}} + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + {{/-last}} + {{/variables}} + ){{^-last}},{{/-last}} {{#-last}} ){{/-last}}{{/servers}}); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ + {{^hasOperationServers}} + protected Map> operationServers = new HashMap<>(); + {{/hasOperationServers}} + {{#hasOperationServers}} + protected Map> operationServers; + + { + Map> operationServers = new HashMap<>(); {{#apiInfo}} {{#apis}} {{#operations}} {{#operation}} {{#servers}} {{#-first}} - put("{{{classname}}}.{{{operationId}}}", new ArrayList(Arrays.asList( + operationServers.put("{{{classname}}}.{{{operationId}}}", new ArrayList<>(Arrays.asList( {{/-first}} - new ServerConfiguration( - "{{{url}}}", - "{{{description}}}{{^description}}No description provided{{/description}}", - new HashMap(){{#variables}}{{#-first}} {{ -{{/-first}} put("{{{name}}}", new ServerVariable( - "{{{description}}}{{^description}}No description provided{{/description}}", - "{{{defaultValue}}}", - new HashSet( - {{#enumValues}} - {{#-first}} - Arrays.asList( - {{/-first}} - "{{{.}}}"{{^-last}},{{/-last}} - {{#-last}} - ) - {{/-last}} - {{/enumValues}} - ) - )); - {{#-last}} - }}{{/-last}}{{/variables}} - ){{^-last}},{{/-last}} + new ServerConfiguration( + "{{{url}}}", + "{{{description}}}{{^description}}No description provided{{/description}}", + {{^variables}} + new LinkedHashMap<>() + {{/variables}} + {{#variables}} + {{#-first}} + Stream.>of( + {{/-first}} + new SimpleEntry<>("{{{name}}}", new ServerVariable( + "{{{description}}}{{^description}}No description provided{{/description}}", + "{{{defaultValue}}}", + new LinkedHashSet<>({{#enumValues}}{{#-first}}Arrays.asList({{/-first}} + "{{{.}}}"{{^-last}},{{/-last}}{{#-last}} + ){{/-last}}{{/enumValues}}) + )){{^-last}},{{/-last}} + {{#-last}} + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + {{/-last}} + {{/variables}} + ){{^-last}},{{/-last}} {{#-last}} - )));{{/-last}} + ))); + {{/-last}} {{/servers}} {{/operation}} {{/operations}} {{/apis}} {{/apiInfo}} - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + this.operationServers = operationServers; + } + + {{/hasOperationServers}} + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -189,7 +206,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { setUserAgent("{{{httpUserAgent}}}{{^httpUserAgent}}OpenAPI-Generator/{{{artifactVersion}}}/java{{/httpUserAgent}}"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; {{#authMethods}} if (authMap != null) { @@ -235,7 +252,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap();{{#authMethods}}{{#vendorExtensions.x-auth-id-alias}} + authenticationLookup = new HashMap<>();{{#authMethods}}{{#vendorExtensions.x-auth-id-alias}} authenticationLookup.put("{{name}}", "{{.}}");{{/vendorExtensions.x-auth-id-alias}}{{/authMethods}} } @@ -830,7 +847,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -889,14 +906,13 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -908,8 +924,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -929,8 +945,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1222,20 +1238,22 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - {{#hasHttpSignatureMethods}} - serializeToString(body, formParams, contentType, isBodyNullable), - {{/hasHttpSignatureMethods}} - {{^hasHttpSignatureMethods}} - null, - {{/hasHttpSignatureMethods}} - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + {{#hasHttpSignatureMethods}} + serializeToString(body, formParams, contentType, isBodyNullable), + {{/hasHttpSignatureMethods}} + {{^hasHttpSignatureMethods}} + null, + {{/hasHttpSignatureMethods}} + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1253,7 +1271,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { {{#hasOAuthMethods}} // If OAuth is used and a status 401 is received, renew the access token and retry the request - if (statusCode == Status.UNAUTHORIZED.getStatusCode()) { + if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) { for (String authName : authNames) { Authentication authentication = authentications.get(authName); if (authentication instanceof OAuth) { @@ -1425,10 +1443,10 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache index 873a39ab33a..25287dcf7f1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache @@ -76,7 +76,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -96,7 +96,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -205,12 +205,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache index 61973dc24fa..2955e93922d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache @@ -13,7 +13,7 @@ @JsonAnySetter public {{classname}} putAdditionalProperty(String key, {{{.}}} value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache index 1d20bad1a66..8239a303ffb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache @@ -99,7 +99,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im } // store a list of schema names defined in anyOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public {{classname}}() { super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}}); @@ -134,7 +134,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im JSON.registerDescendants({{classname}}.class, Collections.unmodifiableMap(schemas)); {{#discriminator}} // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); {{#mappedModels}} mappings.put("{{mappingName}}", {{modelName}}.class); {{/mappedModels}} @@ -166,7 +166,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isNullable}} {{#anyOf}} - if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet>())) { + if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache index ac16f6e0598..0048d3c97d8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache @@ -14,6 +14,7 @@ import {{javaxPackage}}.ws.rs.core.GenericType; {{^fullJavaUtil}} import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -116,58 +117,84 @@ public class {{classname}} { @Deprecated {{/isDeprecated}} public{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}private{{/vendorExtensions.x-group-parameters}} ApiResponse<{{{returnType}}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException { - Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set + {{#hasRequiredParams}} + // Check required parameters + {{#allParams}} + {{#required}} if ({{paramName}} == null) { throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}"); } - {{/required}}{{/allParams}} - // create path and map variables + {{/required}} + {{/allParams}} + + {{/hasRequiredParams}} + {{#hasPathParams}} + // Path parameters String localVarPath = "{{{path}}}"{{#pathParams}} - .replaceAll("\\{" + "{{baseName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; - - // query params - {{javaUtilPrefix}}List localVarQueryParams = new {{javaUtilPrefix}}ArrayList(); - {{javaUtilPrefix}}Map localVarHeaderParams = new {{javaUtilPrefix}}HashMap(); - {{javaUtilPrefix}}Map localVarCookieParams = new {{javaUtilPrefix}}HashMap(); - {{javaUtilPrefix}}Map localVarFormParams = new {{javaUtilPrefix}}HashMap(); + .replaceAll({{=% %=}}"\\{%baseName%}"%={{ }}=%, apiClient.escapeString({{{paramName}}}{{^isString}}.toString(){{/isString}})){{/pathParams}}; + {{/hasPathParams}} {{#queryParams}} + {{#-first}} + // Query parameters + {{javaUtilPrefix}}List localVarQueryParams = new {{javaUtilPrefix}}ArrayList<>( + apiClient.parameterToPairs("{{{collectionFormat}}}", "{{baseName}}", {{paramName}}) + ); + {{/-first}} + {{^-first}} localVarQueryParams.addAll(apiClient.parameterToPairs("{{{collectionFormat}}}", "{{baseName}}", {{paramName}})); + {{/-first}} + {{#-last}} + + {{/-last}} {{/queryParams}} + {{#headerParams}} + {{#-first}} + // Header parameters + {{javaUtilPrefix}}Map localVarHeaderParams = new {{javaUtilPrefix}}LinkedHashMap<>(); + {{/-first}} + {{^required}}if ({{paramName}} != null) { + {{/required}}localVarHeaderParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));{{^required}} + }{{/required}} + {{#-last}} - {{#headerParams}}if ({{paramName}} != null) - localVarHeaderParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{/-last}} {{/headerParams}} + {{#cookieParams}} + {{#-first}} + // Cookie parameters + {{javaUtilPrefix}}Map localVarCookieParams = new {{javaUtilPrefix}}LinkedHashMap<>(); + {{/-first}} + {{^required}}if ({{paramName}} != null) { + {{/required}}localVarCookieParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));{{^required}} + }{{/required}} + {{#-last}} - {{#cookieParams}}if ({{paramName}} != null) - localVarCookieParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{/-last}} {{/cookieParams}} + {{#formParams}} + {{#-first}} + // Form parameters + {{javaUtilPrefix}}Map localVarFormParams = new {{javaUtilPrefix}}LinkedHashMap<>(); + {{/-first}} + {{^required}}if ({{paramName}} != null) { + {{/required}}localVarFormParams.put("{{baseName}}", {{paramName}});{{^required}} + }{{/required}} + {{#-last}} - {{#formParams}}if ({{paramName}} != null) - localVarFormParams.put("{{baseName}}", {{paramName}}); + {{/-last}} {{/formParams}} - - final String[] localVarAccepts = { - {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}} }; - + String localVarAccept = apiClient.selectHeaderAccept({{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}); + String localVarContentType = apiClient.selectHeaderContentType({{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}); + {{#hasAuthMethods}} + String[] localVarAuthNames = {{=% %=}}new String[] {%#authMethods%"%name%"%^-last%, %/-last%%/authMethods%};%={{ }}=% + {{/hasAuthMethods}} {{#returnType}} GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {}; - {{/returnType}} - return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}}, {{#bodyParam}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/bodyParam}}{{^bodyParam}}false{{/bodyParam}}); + return apiClient.invokeAPI("{{classname}}.{{operationId}}", {{#hasPathParams}}localVarPath{{/hasPathParams}}{{^hasPathParams}}"{{path}}"{{/hasPathParams}}, "{{httpMethod}}", {{#queryParams}}{{#-first}}localVarQueryParams{{/-first}}{{/queryParams}}{{^queryParams}}new ArrayList<>(){{/queryParams}}, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, + {{#headerParams}}{{#-first}}localVarHeaderParams{{/-first}}{{/headerParams}}{{^headerParams}}new LinkedHashMap<>(){{/headerParams}}, {{#cookieParams}}{{#-first}}localVarCookieParams{{/-first}}{{/cookieParams}}{{^cookieParams}}new LinkedHashMap<>(){{/cookieParams}}, {{#formParams}}{{#-first}}localVarFormParams{{/-first}}{{/formParams}}{{^formParams}}new LinkedHashMap<>(){{/formParams}}, localVarAccept, localVarContentType, + {{#hasAuthMethods}}localVarAuthNames{{/hasAuthMethods}}{{^hasAuthMethods}}null{{/hasAuthMethods}}, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}}, {{#bodyParam}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/bodyParam}}{{^bodyParam}}false{{/bodyParam}}); } {{#vendorExtensions.x-group-parameters}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache index 74ad0aa8258..50c1c60efc5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache @@ -60,7 +60,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{#useOneOfDiscriminatorLookup}} {{#discriminator}} {{classname}} new{{classname}} = new {{classname}}(); - Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); + Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String)result2.get("{{{propertyBaseName}}}"); switch (discriminatorValue) { {{#mappedModels}} @@ -132,7 +132,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public {{classname}}() { super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}}); @@ -167,7 +167,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im JSON.registerDescendants({{classname}}.class, Collections.unmodifiableMap(schemas)); {{#discriminator}} // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); {{#mappedModels}} mappings.put("{{mappingName}}", {{modelName}}.class); {{/mappedModels}} @@ -199,7 +199,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isNullable}} {{#oneOf}} - if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet>())) { + if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index 255be1f0991..f05b3f64ab3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -389,7 +389,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return 0; } - public static final Parcelable.Creator<{{classname}}> CREATOR = new Parcelable.Creator<{{classname}}>() { + public static final Parcelable.Creator<{{classname}}> CREATOR = new Parcelable.Creator<>() { public {{classname}} createFromParcel(Parcel in) { {{#model}} {{#isArray}} @@ -408,14 +408,14 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens }; {{/parcelableModel}} {{#discriminator}} -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - {{#mappedModels}} - mappings.put("{{mappingName}}", {{modelName}}.class); - {{/mappedModels}} - mappings.put("{{name}}", {{classname}}.class); - JSON.registerDiscriminator({{classname}}.class, "{{propertyBaseName}}", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + {{#mappedModels}} + mappings.put("{{mappingName}}", {{modelName}}.class); + {{/mappedModels}} + mappings.put("{{name}}", {{classname}}.class); + JSON.registerDiscriminator({{classname}}.class, "{{propertyBaseName}}", mappings); + } {{/discriminator}} } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache index 962f41cc6fc..b954f950c82 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache @@ -38,6 +38,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -45,11 +46,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; {{#jsr310}} import java.time.OffsetDateTime; {{/jsr310}} @@ -79,80 +83,93 @@ import {{invokerPackage}}.auth.OAuth; */ {{>generatedAnnotation}} public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "{{{basePath}}}"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList({{#servers}}{{#-first}}Arrays.asList( -{{/-first}} new ServerConfiguration( - "{{{url}}}", - "{{{description}}}{{^description}}No description provided{{/description}}", - new HashMap(){{#variables}}{{#-first}} {{ -{{/-first}} put("{{{name}}}", new ServerVariable( - "{{{description}}}{{^description}}No description provided{{/description}}", - "{{{defaultValue}}}", - new HashSet( - {{#enumValues}} - {{#-first}} - Arrays.asList( - {{/-first}} - "{{{.}}}"{{^-last}},{{/-last}} - {{#-last}} - ) - {{/-last}} - {{/enumValues}} - ) - )); - {{#-last}} - }}{{/-last}}{{/variables}} - ){{^-last}},{{/-last}} + protected List servers = new ArrayList<>({{#servers}}{{#-first}}Arrays.asList( +{{/-first}} new ServerConfiguration( + "{{{url}}}", + "{{{description}}}{{^description}}No description provided{{/description}}", + {{^variables}} + new LinkedHashMap<>() + {{/variables}} + {{#variables}} + {{#-first}} + Stream.>of( + {{/-first}} + new SimpleEntry<>("{{{name}}}", new ServerVariable( + "{{{description}}}{{^description}}No description provided{{/description}}", + "{{{defaultValue}}}", + new LinkedHashSet<>({{#enumValues}}{{#-first}}Arrays.asList({{/-first}} + "{{{.}}}"{{^-last}},{{/-last}}{{#-last}} + ){{/-last}}{{/enumValues}}) + )){{^-last}},{{/-last}} + {{#-last}} + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + {{/-last}} + {{/variables}} + ){{^-last}},{{/-last}} {{#-last}} ){{/-last}}{{/servers}}); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ + {{^hasOperationServers}} + protected Map> operationServers = new LinkedHashMap<>(); + {{/hasOperationServers}} + {{#hasOperationServers}} + protected Map> operationServers; + + { + Map> operationServers = new LinkedHashMap<>(); {{#apiInfo}} {{#apis}} {{#operations}} {{#operation}} {{#servers}} {{#-first}} - put("{{{classname}}}.{{{operationId}}}", new ArrayList(Arrays.asList( + operationServers.put("{{{classname}}}.{{{operationId}}}", new ArrayList<>(Arrays.asList( {{/-first}} - new ServerConfiguration( - "{{{url}}}", - "{{{description}}}{{^description}}No description provided{{/description}}", - new HashMap(){{#variables}}{{#-first}} {{ -{{/-first}} put("{{{name}}}", new ServerVariable( - "{{{description}}}{{^description}}No description provided{{/description}}", - "{{{defaultValue}}}", - new HashSet( - {{#enumValues}} - {{#-first}} - Arrays.asList( - {{/-first}} - "{{{.}}}"{{^-last}},{{/-last}} - {{#-last}} - ) - {{/-last}} - {{/enumValues}} - ) - )); - {{#-last}} - }}{{/-last}}{{/variables}} - ){{^-last}},{{/-last}} + new ServerConfiguration( + "{{{url}}}", + "{{{description}}}{{^description}}No description provided{{/description}}", + {{^variables}} + new LinkedHashMap<>() + {{/variables}} + {{#variables}} + {{#-first}} + Stream.>of( + {{/-first}} + new SimpleEntry<>("{{{name}}}", new ServerVariable( + "{{{description}}}{{^description}}No description provided{{/description}}", + "{{{defaultValue}}}", + new LinkedHashSet<>({{#enumValues}}{{#-first}}Arrays.asList({{/-first}} + "{{{.}}}"{{^-last}},{{/-last}}{{#-last}} + ){{/-last}}{{/enumValues}}) + )){{^-last}},{{/-last}} + {{#-last}} + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + {{/-last}} + {{/variables}} + ){{^-last}},{{/-last}} {{#-last}} - )));{{/-last}} + ))); + {{/-last}} {{/servers}} {{/operation}} {{/operations}} {{/apis}} {{/apiInfo}} - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + this.operationServers = operationServers; + } + + {{/hasOperationServers}} + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -189,7 +206,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { setUserAgent("{{{httpUserAgent}}}{{^httpUserAgent}}OpenAPI-Generator/{{{artifactVersion}}}/java{{/httpUserAgent}}"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; {{#authMethods}} if (authMap != null) { @@ -235,7 +252,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap();{{#authMethods}}{{#vendorExtensions.x-auth-id-alias}} + authenticationLookup = new HashMap<>();{{#authMethods}}{{#vendorExtensions.x-auth-id-alias}} authenticationLookup.put("{{name}}", "{{.}}");{{/vendorExtensions.x-auth-id-alias}}{{/authMethods}} } @@ -830,7 +847,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -889,14 +906,13 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -908,8 +924,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -929,8 +945,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1222,20 +1238,22 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - {{#hasHttpSignatureMethods}} - serializeToString(body, formParams, contentType, isBodyNullable), - {{/hasHttpSignatureMethods}} - {{^hasHttpSignatureMethods}} - null, - {{/hasHttpSignatureMethods}} - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + {{#hasHttpSignatureMethods}} + serializeToString(body, formParams, contentType, isBodyNullable), + {{/hasHttpSignatureMethods}} + {{^hasHttpSignatureMethods}} + null, + {{/hasHttpSignatureMethods}} + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1253,7 +1271,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { {{#hasOAuthMethods}} // If OAuth is used and a status 401 is received, renew the access token and retry the request - if (statusCode == Status.UNAUTHORIZED.getStatusCode()) { + if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) { for (String authName : authNames) { Authentication authentication = authentications.get(authName); if (authentication instanceof OAuth) { @@ -1425,10 +1443,10 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache index 873a39ab33a..25287dcf7f1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache @@ -76,7 +76,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -96,7 +96,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -205,12 +205,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/additional_properties.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/additional_properties.mustache index 61973dc24fa..2955e93922d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/additional_properties.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/additional_properties.mustache @@ -13,7 +13,7 @@ @JsonAnySetter public {{classname}} putAdditionalProperty(String key, {{{.}}} value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache index 1d20bad1a66..8239a303ffb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache @@ -99,7 +99,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im } // store a list of schema names defined in anyOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public {{classname}}() { super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}}); @@ -134,7 +134,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im JSON.registerDescendants({{classname}}.class, Collections.unmodifiableMap(schemas)); {{#discriminator}} // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); {{#mappedModels}} mappings.put("{{mappingName}}", {{modelName}}.class); {{/mappedModels}} @@ -166,7 +166,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isNullable}} {{#anyOf}} - if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet>())) { + if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache index ac16f6e0598..0048d3c97d8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache @@ -14,6 +14,7 @@ import {{javaxPackage}}.ws.rs.core.GenericType; {{^fullJavaUtil}} import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -116,58 +117,84 @@ public class {{classname}} { @Deprecated {{/isDeprecated}} public{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}private{{/vendorExtensions.x-group-parameters}} ApiResponse<{{{returnType}}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException { - Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set + {{#hasRequiredParams}} + // Check required parameters + {{#allParams}} + {{#required}} if ({{paramName}} == null) { throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}"); } - {{/required}}{{/allParams}} - // create path and map variables + {{/required}} + {{/allParams}} + + {{/hasRequiredParams}} + {{#hasPathParams}} + // Path parameters String localVarPath = "{{{path}}}"{{#pathParams}} - .replaceAll("\\{" + "{{baseName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; - - // query params - {{javaUtilPrefix}}List localVarQueryParams = new {{javaUtilPrefix}}ArrayList(); - {{javaUtilPrefix}}Map localVarHeaderParams = new {{javaUtilPrefix}}HashMap(); - {{javaUtilPrefix}}Map localVarCookieParams = new {{javaUtilPrefix}}HashMap(); - {{javaUtilPrefix}}Map localVarFormParams = new {{javaUtilPrefix}}HashMap(); + .replaceAll({{=% %=}}"\\{%baseName%}"%={{ }}=%, apiClient.escapeString({{{paramName}}}{{^isString}}.toString(){{/isString}})){{/pathParams}}; + {{/hasPathParams}} {{#queryParams}} + {{#-first}} + // Query parameters + {{javaUtilPrefix}}List localVarQueryParams = new {{javaUtilPrefix}}ArrayList<>( + apiClient.parameterToPairs("{{{collectionFormat}}}", "{{baseName}}", {{paramName}}) + ); + {{/-first}} + {{^-first}} localVarQueryParams.addAll(apiClient.parameterToPairs("{{{collectionFormat}}}", "{{baseName}}", {{paramName}})); + {{/-first}} + {{#-last}} + + {{/-last}} {{/queryParams}} + {{#headerParams}} + {{#-first}} + // Header parameters + {{javaUtilPrefix}}Map localVarHeaderParams = new {{javaUtilPrefix}}LinkedHashMap<>(); + {{/-first}} + {{^required}}if ({{paramName}} != null) { + {{/required}}localVarHeaderParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));{{^required}} + }{{/required}} + {{#-last}} - {{#headerParams}}if ({{paramName}} != null) - localVarHeaderParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{/-last}} {{/headerParams}} + {{#cookieParams}} + {{#-first}} + // Cookie parameters + {{javaUtilPrefix}}Map localVarCookieParams = new {{javaUtilPrefix}}LinkedHashMap<>(); + {{/-first}} + {{^required}}if ({{paramName}} != null) { + {{/required}}localVarCookieParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));{{^required}} + }{{/required}} + {{#-last}} - {{#cookieParams}}if ({{paramName}} != null) - localVarCookieParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{/-last}} {{/cookieParams}} + {{#formParams}} + {{#-first}} + // Form parameters + {{javaUtilPrefix}}Map localVarFormParams = new {{javaUtilPrefix}}LinkedHashMap<>(); + {{/-first}} + {{^required}}if ({{paramName}} != null) { + {{/required}}localVarFormParams.put("{{baseName}}", {{paramName}});{{^required}} + }{{/required}} + {{#-last}} - {{#formParams}}if ({{paramName}} != null) - localVarFormParams.put("{{baseName}}", {{paramName}}); + {{/-last}} {{/formParams}} - - final String[] localVarAccepts = { - {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}} }; - + String localVarAccept = apiClient.selectHeaderAccept({{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}); + String localVarContentType = apiClient.selectHeaderContentType({{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}); + {{#hasAuthMethods}} + String[] localVarAuthNames = {{=% %=}}new String[] {%#authMethods%"%name%"%^-last%, %/-last%%/authMethods%};%={{ }}=% + {{/hasAuthMethods}} {{#returnType}} GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {}; - {{/returnType}} - return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}}, {{#bodyParam}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/bodyParam}}{{^bodyParam}}false{{/bodyParam}}); + return apiClient.invokeAPI("{{classname}}.{{operationId}}", {{#hasPathParams}}localVarPath{{/hasPathParams}}{{^hasPathParams}}"{{path}}"{{/hasPathParams}}, "{{httpMethod}}", {{#queryParams}}{{#-first}}localVarQueryParams{{/-first}}{{/queryParams}}{{^queryParams}}new ArrayList<>(){{/queryParams}}, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, + {{#headerParams}}{{#-first}}localVarHeaderParams{{/-first}}{{/headerParams}}{{^headerParams}}new LinkedHashMap<>(){{/headerParams}}, {{#cookieParams}}{{#-first}}localVarCookieParams{{/-first}}{{/cookieParams}}{{^cookieParams}}new LinkedHashMap<>(){{/cookieParams}}, {{#formParams}}{{#-first}}localVarFormParams{{/-first}}{{/formParams}}{{^formParams}}new LinkedHashMap<>(){{/formParams}}, localVarAccept, localVarContentType, + {{#hasAuthMethods}}localVarAuthNames{{/hasAuthMethods}}{{^hasAuthMethods}}null{{/hasAuthMethods}}, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}}, {{#bodyParam}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/bodyParam}}{{^bodyParam}}false{{/bodyParam}}); } {{#vendorExtensions.x-group-parameters}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache index 74ad0aa8258..de29a873b63 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache @@ -132,7 +132,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public {{classname}}() { super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}}); @@ -167,7 +167,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im JSON.registerDescendants({{classname}}.class, Collections.unmodifiableMap(schemas)); {{#discriminator}} // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); {{#mappedModels}} mappings.put("{{mappingName}}", {{modelName}}.class); {{/mappedModels}} @@ -199,7 +199,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isNullable}} {{#oneOf}} - if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet>())) { + if (JSON.isInstanceOf({{{.}}}.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache index c116c66654d..0c5cbabdac1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache @@ -389,7 +389,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return 0; } - public static final Parcelable.Creator<{{classname}}> CREATOR = new Parcelable.Creator<{{classname}}>() { + public static final Parcelable.Creator<{{classname}}> CREATOR = new Parcelable.Creator<>() { public {{classname}} createFromParcel(Parcel in) { {{#model}} {{#isArray}} @@ -408,14 +408,14 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens }; {{/parcelableModel}} {{#discriminator}} -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - {{#mappedModels}} - mappings.put("{{mappingName}}", {{modelName}}.class); - {{/mappedModels}} - mappings.put("{{name}}", {{classname}}.class); - JSON.registerDiscriminator({{classname}}.class, "{{propertyBaseName}}", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + {{#mappedModels}} + mappings.put("{{mappingName}}", {{modelName}}.class); + {{/mappedModels}} + mappings.put("{{name}}", {{classname}}.class); + JSON.registerDiscriminator({{classname}}.class, "{{propertyBaseName}}", mappings); + } {{/discriminator}} } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java index 13d46665014..6a357bf177a 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java @@ -36,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -43,11 +44,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; import java.time.OffsetDateTime; import java.net.URLEncoder; @@ -70,25 +74,26 @@ import org.openapitools.client.auth.OAuth; */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient extends JavaTimeFormatter { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "http://petstore.swagger.io:80/v2"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://petstore.swagger.io:80/v2", - "No description provided", - new HashMap() - ) + protected List servers = new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://petstore.swagger.io:80/v2", + "No description provided", + new LinkedHashMap<>() + ) )); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + protected Map> operationServers = new HashMap<>(); + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -125,7 +130,7 @@ public class ApiClient extends JavaTimeFormatter { setUserAgent("OpenAPI-Generator/1.0.0/java"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; if (authMap != null) { auth = authMap.get("petstore_auth"); @@ -163,7 +168,7 @@ public class ApiClient extends JavaTimeFormatter { authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap(); + authenticationLookup = new HashMap<>(); } /** @@ -751,7 +756,7 @@ public class ApiClient extends JavaTimeFormatter { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -810,14 +815,13 @@ public class ApiClient extends JavaTimeFormatter { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -829,8 +833,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -850,8 +854,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1143,15 +1147,17 @@ public class ApiClient extends JavaTimeFormatter { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - null, - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + null, + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1168,7 +1174,7 @@ public class ApiClient extends JavaTimeFormatter { final int statusCode = response.getStatusInfo().getStatusCode(); // If OAuth is used and a status 401 is received, renew the access token and retry the request - if (statusCode == Status.UNAUTHORIZED.getStatusCode()) { + if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) { for (String authName : authNames) { Authentication authentication = authentications.get(authName); if (authentication instanceof OAuth) { @@ -1339,10 +1345,10 @@ public class ApiClient extends JavaTimeFormatter { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/JSON.java index 24317dfe36a..8e72ba03553 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/JSON.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/JSON.java @@ -64,7 +64,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -84,7 +84,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -193,12 +193,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 98b6a534086..540cf2cbba3 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,42 +75,16 @@ public class AnotherFakeApi { */ public ApiResponse call123testSpecialTagsWithHttpInfo(Client body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling call123testSpecialTags"); } - - // create path and map variables - String localVarPath = "/another-fake/dummy"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", "/another-fake/dummy", "PATCH", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java index fc418490a4a..9fb0bb1af9d 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java @@ -20,6 +20,7 @@ import org.openapitools.client.model.XmlItem; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -81,41 +82,16 @@ public class FakeApi { */ public ApiResponse createXmlItemWithHttpInfo(XmlItem xmlItem) throws ApiException { - Object localVarPostBody = xmlItem; - - // verify the required parameter 'xmlItem' is set + // Check required parameters if (xmlItem == null) { throw new ApiException(400, "Missing the required parameter 'xmlItem' when calling createXmlItem"); } - - // create path and map variables - String localVarPath = "/fake/create_xml_item"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.createXmlItem", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16"); + return apiClient.invokeAPI("FakeApi.createXmlItem", "/fake/create_xml_item", "POST", new ArrayList<>(), xmlItem, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * @@ -146,38 +122,12 @@ public class FakeApi { */ public ApiResponse fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/boolean"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", "/fake/outer/boolean", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -208,38 +158,12 @@ public class FakeApi { */ public ApiResponse fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/composite"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", "/fake/outer/composite", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -270,38 +194,12 @@ public class FakeApi { */ public ApiResponse fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/number"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", "/fake/outer/number", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -332,38 +230,12 @@ public class FakeApi { */ public ApiResponse fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/string"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", "/fake/outer/string", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -393,41 +265,16 @@ public class FakeApi { */ public ApiResponse testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithFileSchema"); } - - // create path and map variables - String localVarPath = "/fake/body-with-file-schema"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", "/fake/body-with-file-schema", "PUT", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * @@ -459,47 +306,24 @@ public class FakeApi { */ public ApiResponse testBodyWithQueryParamsWithHttpInfo(String query, User body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'query' is set + // Check required parameters if (query == null) { throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams"); } - - // verify the required parameter 'body' is set if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithQueryParams"); } - - // create path and map variables - String localVarPath = "/fake/body-with-query-params"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "query", query) + ); - localVarQueryParams.addAll(apiClient.parameterToPairs("", "query", query)); - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", "/fake/body-with-query-params", "PUT", localVarQueryParams, body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * To test \"client\" model @@ -530,43 +354,17 @@ public class FakeApi { */ public ApiResponse testClientModelWithHttpInfo(Client body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling testClientModel"); } - - // create path and map variables - String localVarPath = "/fake"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.testClientModel", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.testClientModel", "/fake", "PATCH", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -624,83 +422,62 @@ public class FakeApi { */ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, LocalDateTime dateTime, String password, String paramCallback) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'number' is set + // Check required parameters if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); } - - // verify the required parameter '_double' is set if (_double == null) { throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters"); } - - // verify the required parameter 'patternWithoutDelimiter' is set if (patternWithoutDelimiter == null) { throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters"); } - - // verify the required parameter '_byte' is set if (_byte == null) { throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters"); } - - // create path and map variables - String localVarPath = "/fake"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (integer != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (integer != null) { localVarFormParams.put("integer", integer); -if (int32 != null) + } + if (int32 != null) { localVarFormParams.put("int32", int32); -if (int64 != null) + } + if (int64 != null) { localVarFormParams.put("int64", int64); -if (number != null) - localVarFormParams.put("number", number); -if (_float != null) + } + localVarFormParams.put("number", number); + if (_float != null) { localVarFormParams.put("float", _float); -if (_double != null) - localVarFormParams.put("double", _double); -if (string != null) + } + localVarFormParams.put("double", _double); + if (string != null) { localVarFormParams.put("string", string); -if (patternWithoutDelimiter != null) - localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); -if (_byte != null) - localVarFormParams.put("byte", _byte); -if (binary != null) + } + localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); + localVarFormParams.put("byte", _byte); + if (binary != null) { localVarFormParams.put("binary", binary); -if (date != null) + } + if (date != null) { localVarFormParams.put("date", date); -if (dateTime != null) + } + if (dateTime != null) { localVarFormParams.put("dateTime", dateTime); -if (password != null) + } + if (password != null) { localVarFormParams.put("password", password); -if (paramCallback != null) + } + if (paramCallback != null) { localVarFormParams.put("callback", paramCallback); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "http_basic_test" }; - - return apiClient.invokeAPI("FakeApi.testEndpointParameters", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"http_basic_test"}; + return apiClient.invokeAPI("FakeApi.testEndpointParameters", "/fake", "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -747,104 +524,71 @@ if (paramCallback != null) */ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/fake"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "enum_query_string_array", enumQueryStringArray)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "enum_query_string_array", enumQueryStringArray) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_string", enumQueryString)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_integer", enumQueryInteger)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_double", enumQueryDouble)); - if (enumHeaderStringArray != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (enumHeaderStringArray != null) { localVarHeaderParams.put("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); -if (enumHeaderString != null) + } + if (enumHeaderString != null) { localVarHeaderParams.put("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } - - if (enumFormStringArray != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (enumFormStringArray != null) { localVarFormParams.put("enum_form_string_array", enumFormStringArray); -if (enumFormString != null) + } + if (enumFormString != null) { localVarFormParams.put("enum_form_string", enumFormString); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testEnumParameters", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + return apiClient.invokeAPI("FakeApi.testEnumParameters", "/fake", "GET", localVarQueryParams, null, + localVarHeaderParams, new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, + null, null, false); } private ApiResponse testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'requiredStringGroup' is set + // Check required parameters if (requiredStringGroup == null) { throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters"); } - - // verify the required parameter 'requiredBooleanGroup' is set if (requiredBooleanGroup == null) { throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters"); } - - // verify the required parameter 'requiredInt64Group' is set if (requiredInt64Group == null) { throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters"); } - - // create path and map variables - String localVarPath = "/fake"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_string_group", requiredStringGroup)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "required_string_group", requiredStringGroup) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_int64_group", requiredInt64Group)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "string_group", stringGroup)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "int64_group", int64Group)); - if (requiredBooleanGroup != null) - localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); -if (booleanGroup != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); + if (booleanGroup != null) { localVarHeaderParams.put("boolean_group", apiClient.parameterToString(booleanGroup)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testGroupParameters", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("FakeApi.testGroupParameters", "/fake", "DELETE", localVarQueryParams, null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } public class APItestGroupParametersRequest { @@ -989,41 +733,16 @@ if (booleanGroup != null) */ public ApiResponse testInlineAdditionalPropertiesWithHttpInfo(Map param) throws ApiException { - Object localVarPostBody = param; - - // verify the required parameter 'param' is set + // Check required parameters if (param == null) { throw new ApiException(400, "Missing the required parameter 'param' when calling testInlineAdditionalProperties"); } - - // create path and map variables - String localVarPath = "/fake/inline-additionalProperties"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", "/fake/inline-additionalProperties", "POST", new ArrayList<>(), param, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * test json serialization of form data @@ -1055,50 +774,24 @@ if (booleanGroup != null) */ public ApiResponse testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'param' is set + // Check required parameters if (param == null) { throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData"); } - - // verify the required parameter 'param2' is set if (param2 == null) { throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData"); } - - // create path and map variables - String localVarPath = "/fake/jsonFormData"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + localVarFormParams.put("param", param); + localVarFormParams.put("param2", param2); - - - - if (param != null) - localVarFormParams.put("param", param); -if (param2 != null) - localVarFormParams.put("param2", param2); - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testJsonFormData", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + return apiClient.invokeAPI("FakeApi.testJsonFormData", "/fake/jsonFormData", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, + null, null, false); } /** * @@ -1136,65 +829,36 @@ if (param2 != null) */ public ApiResponse testQueryParameterCollectionFormatWithHttpInfo(List pipe, List ioutil, List http, List url, List context) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'pipe' is set + // Check required parameters if (pipe == null) { throw new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'ioutil' is set if (ioutil == null) { throw new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'http' is set if (http == null) { throw new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'url' is set if (url == null) { throw new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'context' is set if (context == null) { throw new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat"); } - - // create path and map variables - String localVarPath = "/fake/test-query-parameters"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "pipe", pipe)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "pipe", pipe) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "ioutil", ioutil)); localVarQueryParams.addAll(apiClient.parameterToPairs("ssv", "http", http)); localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "url", url)); localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "context", context)); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", "/fake/test-query-parameters", "PUT", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 3123826e28a..08f35e4a742 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,42 +75,17 @@ public class FakeClassnameTags123Api { */ public ApiResponse testClassnameWithHttpInfo(Client body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling testClassname"); } - - // create path and map variables - String localVarPath = "/fake_classname_test"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key_query" }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + String[] localVarAuthNames = new String[] {"api_key_query"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", "/fake_classname_test", "PATCH", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/PetApi.java index 7317e831e8c..ccc78f9d1ba 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/PetApi.java @@ -15,6 +15,7 @@ import java.util.Set; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -78,40 +79,16 @@ public class PetApi { */ public ApiResponse addPetWithHttpInfo(Pet body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling addPet"); } - - // create path and map variables - String localVarPath = "/pet"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.addPet", "/pet", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -146,43 +123,26 @@ public class PetApi { */ public ApiResponse deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - if (apiKey != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (apiKey != null) { localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", new ArrayList<>(), null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -216,43 +176,22 @@ public class PetApi { */ public ApiResponse> findPetsByStatusWithHttpInfo(List status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'status' is set + // Check required parameters if (status == null) { throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus"); } - - // create path and map variables - String localVarPath = "/pet/findByStatus"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "status", status) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByStatus", "/pet/findByStatus", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -290,43 +229,22 @@ public class PetApi { */ @Deprecated public ApiResponse> findPetsByTagsWithHttpInfo(Set tags) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'tags' is set + // Check required parameters if (tags == null) { throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags"); } - - // create path and map variables - String localVarPath = "/pet/findByTags"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "tags", tags) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByTags", "/pet/findByTags", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -362,43 +280,21 @@ public class PetApi { */ public ApiResponse getPetByIdWithHttpInfo(Long petId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -435,40 +331,16 @@ public class PetApi { */ public ApiResponse updatePetWithHttpInfo(Pet body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling updatePet"); } - - // create path and map variables - String localVarPath = "/pet"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.updatePet", "/pet", "PUT", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -503,45 +375,29 @@ public class PetApi { */ public ApiResponse updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (name != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (name != null) { localVarFormParams.put("name", name); -if (status != null) + } + if (status != null) { localVarFormParams.put("status", status); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -577,47 +433,30 @@ if (status != null) */ public ApiResponse uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}/uploadImage" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (_file != null) + } + if (_file != null) { localVarFormParams.put("file", _file); + } - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -653,52 +492,31 @@ if (_file != null) */ public ApiResponse uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile"); } - - // verify the required parameter 'requiredFile' is set if (requiredFile == null) { throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/fake/{petId}/uploadImageWithRequiredFile" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (requiredFile != null) - localVarFormParams.put("requiredFile", requiredFile); - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + } + localVarFormParams.put("requiredFile", requiredFile); + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/StoreApi.java index 1f094916301..0552c144390 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/StoreApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Order; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -75,42 +76,20 @@ public class StoreApi { */ public ApiResponse deleteOrderWithHttpInfo(String orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{order_id}" - .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString())); + .replaceAll("\\{order_id}", apiClient.escapeString(orderId)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Returns pet inventories by status @@ -139,37 +118,12 @@ public class StoreApi { */ public ApiResponse> getInventoryWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/store/inventory"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("StoreApi.getInventory", "/store/inventory", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -205,44 +159,21 @@ public class StoreApi { */ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{order_id}" - .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{order_id}", apiClient.escapeString(orderId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Place an order for a pet @@ -275,42 +206,16 @@ public class StoreApi { */ public ApiResponse placeOrderWithHttpInfo(Order body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder"); } - - // create path and map variables - String localVarPath = "/store/order"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.placeOrder", "/store/order", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/UserApi.java index a2b14e76422..ade423b52c7 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/UserApi.java @@ -13,6 +13,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,41 +75,16 @@ public class UserApi { */ public ApiResponse createUserWithHttpInfo(User body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling createUser"); } - - // create path and map variables - String localVarPath = "/user"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.createUser", "/user", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Creates list of users with given input array @@ -138,41 +114,16 @@ public class UserApi { */ public ApiResponse createUsersWithArrayInputWithHttpInfo(List body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput"); } - - // create path and map variables - String localVarPath = "/user/createWithArray"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", "/user/createWithArray", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Creates list of users with given input array @@ -202,41 +153,16 @@ public class UserApi { */ public ApiResponse createUsersWithListInputWithHttpInfo(List body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput"); } - - // create path and map variables - String localVarPath = "/user/createWithList"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.createUsersWithListInput", "/user/createWithList", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Delete user @@ -268,42 +194,20 @@ public class UserApi { */ public ApiResponse deleteUserWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Get user by user name @@ -338,44 +242,21 @@ public class UserApi { */ public ApiResponse getUserByNameWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{username}", apiClient.escapeString(username)); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs user into the system @@ -410,50 +291,26 @@ public class UserApi { */ public ApiResponse loginUserWithHttpInfo(String username, String password) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser"); } - - // verify the required parameter 'password' is set if (password == null) { throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser"); } - - // create path and map variables - String localVarPath = "/user/login"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "username", username) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password)); - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.loginUser", "/user/login", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs out current logged in user session @@ -481,36 +338,11 @@ public class UserApi { */ public ApiResponse logoutUserWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/user/logout"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.logoutUser", "/user/logout", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Updated user @@ -544,46 +376,22 @@ public class UserApi { */ public ApiResponse updateUserWithHttpInfo(String username, User body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser"); } - - // verify the required parameter 'body' is set if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling updateUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 28fdbd6e63a..69df9b57e7e 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesAnyType { @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 59093dc6eba..f9011269ad1 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -83,7 +83,7 @@ public class AdditionalPropertiesArray { @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 17ed09d84ac..a91038275c7 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesBoolean { @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index fe558167aca..c14ac4d5810 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesInteger { @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 1295699d45a..15c62efed1f 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -83,7 +83,7 @@ public class AdditionalPropertiesNumber { @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 47374023df6..556a0ec2b09 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -83,7 +83,7 @@ public class AdditionalPropertiesObject { @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index e5a9b0f86ae..a4b580f0412 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesString { @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java index 2920ae422d0..c63b11c5d3d 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java @@ -153,14 +153,14 @@ public class Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("BigCat", BigCat.class); - mappings.put("Cat", Cat.class); - mappings.put("Dog", Dog.class); - mappings.put("Animal", Animal.class); - JSON.registerDiscriminator(Animal.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("BigCat", BigCat.class); + mappings.put("Cat", Cat.class); + mappings.put("Dog", Dog.class); + mappings.put("Animal", Animal.class); + JSON.registerDiscriminator(Animal.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/BigCat.java index 46334a7030a..a3986a67006 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/BigCat.java @@ -156,11 +156,11 @@ public class BigCat extends Cat { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("BigCat", BigCat.class); - JSON.registerDiscriminator(BigCat.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("BigCat", BigCat.class); + JSON.registerDiscriminator(BigCat.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java index 170ec427664..fa1875cb67b 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java @@ -121,12 +121,12 @@ public class Cat extends Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("BigCat", BigCat.class); - mappings.put("Cat", Cat.class); - JSON.registerDiscriminator(Cat.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("BigCat", BigCat.class); + mappings.put("Cat", Cat.class); + JSON.registerDiscriminator(Cat.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Dog.java index ba19147b2d5..523ed807c85 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Dog.java @@ -117,11 +117,11 @@ public class Dog extends Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("Dog", Dog.class); - JSON.registerDiscriminator(Dog.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("Dog", Dog.class); + JSON.registerDiscriminator(Dog.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index 13d46665014..6a357bf177a 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -36,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -43,11 +44,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; import java.time.OffsetDateTime; import java.net.URLEncoder; @@ -70,25 +74,26 @@ import org.openapitools.client.auth.OAuth; */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient extends JavaTimeFormatter { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "http://petstore.swagger.io:80/v2"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://petstore.swagger.io:80/v2", - "No description provided", - new HashMap() - ) + protected List servers = new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://petstore.swagger.io:80/v2", + "No description provided", + new LinkedHashMap<>() + ) )); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + protected Map> operationServers = new HashMap<>(); + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -125,7 +130,7 @@ public class ApiClient extends JavaTimeFormatter { setUserAgent("OpenAPI-Generator/1.0.0/java"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; if (authMap != null) { auth = authMap.get("petstore_auth"); @@ -163,7 +168,7 @@ public class ApiClient extends JavaTimeFormatter { authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap(); + authenticationLookup = new HashMap<>(); } /** @@ -751,7 +756,7 @@ public class ApiClient extends JavaTimeFormatter { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -810,14 +815,13 @@ public class ApiClient extends JavaTimeFormatter { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -829,8 +833,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -850,8 +854,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1143,15 +1147,17 @@ public class ApiClient extends JavaTimeFormatter { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - null, - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + null, + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1168,7 +1174,7 @@ public class ApiClient extends JavaTimeFormatter { final int statusCode = response.getStatusInfo().getStatusCode(); // If OAuth is used and a status 401 is received, renew the access token and retry the request - if (statusCode == Status.UNAUTHORIZED.getStatusCode()) { + if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) { for (String authName : authNames) { Authentication authentication = authentications.get(authName); if (authentication instanceof OAuth) { @@ -1339,10 +1345,10 @@ public class ApiClient extends JavaTimeFormatter { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java index 24317dfe36a..8e72ba03553 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java @@ -64,7 +64,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -84,7 +84,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -193,12 +193,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 98b6a534086..540cf2cbba3 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,42 +75,16 @@ public class AnotherFakeApi { */ public ApiResponse call123testSpecialTagsWithHttpInfo(Client body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling call123testSpecialTags"); } - - // create path and map variables - String localVarPath = "/another-fake/dummy"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", "/another-fake/dummy", "PATCH", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index 0c31d3c2d14..597605cede0 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -20,6 +20,7 @@ import org.openapitools.client.model.XmlItem; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -81,41 +82,16 @@ public class FakeApi { */ public ApiResponse createXmlItemWithHttpInfo(XmlItem xmlItem) throws ApiException { - Object localVarPostBody = xmlItem; - - // verify the required parameter 'xmlItem' is set + // Check required parameters if (xmlItem == null) { throw new ApiException(400, "Missing the required parameter 'xmlItem' when calling createXmlItem"); } - - // create path and map variables - String localVarPath = "/fake/create_xml_item"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.createXmlItem", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16"); + return apiClient.invokeAPI("FakeApi.createXmlItem", "/fake/create_xml_item", "POST", new ArrayList<>(), xmlItem, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * @@ -146,38 +122,12 @@ public class FakeApi { */ public ApiResponse fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/boolean"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", "/fake/outer/boolean", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -208,38 +158,12 @@ public class FakeApi { */ public ApiResponse fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/composite"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", "/fake/outer/composite", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -270,38 +194,12 @@ public class FakeApi { */ public ApiResponse fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/number"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", "/fake/outer/number", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -332,38 +230,12 @@ public class FakeApi { */ public ApiResponse fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/string"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", "/fake/outer/string", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -393,41 +265,16 @@ public class FakeApi { */ public ApiResponse testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithFileSchema"); } - - // create path and map variables - String localVarPath = "/fake/body-with-file-schema"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", "/fake/body-with-file-schema", "PUT", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * @@ -459,47 +306,24 @@ public class FakeApi { */ public ApiResponse testBodyWithQueryParamsWithHttpInfo(String query, User body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'query' is set + // Check required parameters if (query == null) { throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams"); } - - // verify the required parameter 'body' is set if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithQueryParams"); } - - // create path and map variables - String localVarPath = "/fake/body-with-query-params"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "query", query) + ); - localVarQueryParams.addAll(apiClient.parameterToPairs("", "query", query)); - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", "/fake/body-with-query-params", "PUT", localVarQueryParams, body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * To test \"client\" model @@ -530,43 +354,17 @@ public class FakeApi { */ public ApiResponse testClientModelWithHttpInfo(Client body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling testClientModel"); } - - // create path and map variables - String localVarPath = "/fake"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.testClientModel", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.testClientModel", "/fake", "PATCH", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -624,83 +422,62 @@ public class FakeApi { */ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'number' is set + // Check required parameters if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); } - - // verify the required parameter '_double' is set if (_double == null) { throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters"); } - - // verify the required parameter 'patternWithoutDelimiter' is set if (patternWithoutDelimiter == null) { throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters"); } - - // verify the required parameter '_byte' is set if (_byte == null) { throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters"); } - - // create path and map variables - String localVarPath = "/fake"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (integer != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (integer != null) { localVarFormParams.put("integer", integer); -if (int32 != null) + } + if (int32 != null) { localVarFormParams.put("int32", int32); -if (int64 != null) + } + if (int64 != null) { localVarFormParams.put("int64", int64); -if (number != null) - localVarFormParams.put("number", number); -if (_float != null) + } + localVarFormParams.put("number", number); + if (_float != null) { localVarFormParams.put("float", _float); -if (_double != null) - localVarFormParams.put("double", _double); -if (string != null) + } + localVarFormParams.put("double", _double); + if (string != null) { localVarFormParams.put("string", string); -if (patternWithoutDelimiter != null) - localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); -if (_byte != null) - localVarFormParams.put("byte", _byte); -if (binary != null) + } + localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); + localVarFormParams.put("byte", _byte); + if (binary != null) { localVarFormParams.put("binary", binary); -if (date != null) + } + if (date != null) { localVarFormParams.put("date", date); -if (dateTime != null) + } + if (dateTime != null) { localVarFormParams.put("dateTime", dateTime); -if (password != null) + } + if (password != null) { localVarFormParams.put("password", password); -if (paramCallback != null) + } + if (paramCallback != null) { localVarFormParams.put("callback", paramCallback); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "http_basic_test" }; - - return apiClient.invokeAPI("FakeApi.testEndpointParameters", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"http_basic_test"}; + return apiClient.invokeAPI("FakeApi.testEndpointParameters", "/fake", "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -747,104 +524,71 @@ if (paramCallback != null) */ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/fake"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "enum_query_string_array", enumQueryStringArray)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "enum_query_string_array", enumQueryStringArray) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_string", enumQueryString)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_integer", enumQueryInteger)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_double", enumQueryDouble)); - if (enumHeaderStringArray != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (enumHeaderStringArray != null) { localVarHeaderParams.put("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); -if (enumHeaderString != null) + } + if (enumHeaderString != null) { localVarHeaderParams.put("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } - - if (enumFormStringArray != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (enumFormStringArray != null) { localVarFormParams.put("enum_form_string_array", enumFormStringArray); -if (enumFormString != null) + } + if (enumFormString != null) { localVarFormParams.put("enum_form_string", enumFormString); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testEnumParameters", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + return apiClient.invokeAPI("FakeApi.testEnumParameters", "/fake", "GET", localVarQueryParams, null, + localVarHeaderParams, new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, + null, null, false); } private ApiResponse testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'requiredStringGroup' is set + // Check required parameters if (requiredStringGroup == null) { throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters"); } - - // verify the required parameter 'requiredBooleanGroup' is set if (requiredBooleanGroup == null) { throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters"); } - - // verify the required parameter 'requiredInt64Group' is set if (requiredInt64Group == null) { throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters"); } - - // create path and map variables - String localVarPath = "/fake"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_string_group", requiredStringGroup)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "required_string_group", requiredStringGroup) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_int64_group", requiredInt64Group)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "string_group", stringGroup)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "int64_group", int64Group)); - if (requiredBooleanGroup != null) - localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); -if (booleanGroup != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); + if (booleanGroup != null) { localVarHeaderParams.put("boolean_group", apiClient.parameterToString(booleanGroup)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testGroupParameters", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("FakeApi.testGroupParameters", "/fake", "DELETE", localVarQueryParams, null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } public class APItestGroupParametersRequest { @@ -989,41 +733,16 @@ if (booleanGroup != null) */ public ApiResponse testInlineAdditionalPropertiesWithHttpInfo(Map param) throws ApiException { - Object localVarPostBody = param; - - // verify the required parameter 'param' is set + // Check required parameters if (param == null) { throw new ApiException(400, "Missing the required parameter 'param' when calling testInlineAdditionalProperties"); } - - // create path and map variables - String localVarPath = "/fake/inline-additionalProperties"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", "/fake/inline-additionalProperties", "POST", new ArrayList<>(), param, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * test json serialization of form data @@ -1055,50 +774,24 @@ if (booleanGroup != null) */ public ApiResponse testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'param' is set + // Check required parameters if (param == null) { throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData"); } - - // verify the required parameter 'param2' is set if (param2 == null) { throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData"); } - - // create path and map variables - String localVarPath = "/fake/jsonFormData"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + localVarFormParams.put("param", param); + localVarFormParams.put("param2", param2); - - - - if (param != null) - localVarFormParams.put("param", param); -if (param2 != null) - localVarFormParams.put("param2", param2); - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testJsonFormData", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + return apiClient.invokeAPI("FakeApi.testJsonFormData", "/fake/jsonFormData", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, + null, null, false); } /** * @@ -1136,65 +829,36 @@ if (param2 != null) */ public ApiResponse testQueryParameterCollectionFormatWithHttpInfo(List pipe, List ioutil, List http, List url, List context) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'pipe' is set + // Check required parameters if (pipe == null) { throw new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'ioutil' is set if (ioutil == null) { throw new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'http' is set if (http == null) { throw new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'url' is set if (url == null) { throw new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'context' is set if (context == null) { throw new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat"); } - - // create path and map variables - String localVarPath = "/fake/test-query-parameters"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "pipe", pipe)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "pipe", pipe) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "ioutil", ioutil)); localVarQueryParams.addAll(apiClient.parameterToPairs("ssv", "http", http)); localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "url", url)); localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "context", context)); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", "/fake/test-query-parameters", "PUT", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 3123826e28a..08f35e4a742 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,42 +75,17 @@ public class FakeClassnameTags123Api { */ public ApiResponse testClassnameWithHttpInfo(Client body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling testClassname"); } - - // create path and map variables - String localVarPath = "/fake_classname_test"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key_query" }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + String[] localVarAuthNames = new String[] {"api_key_query"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", "/fake_classname_test", "PATCH", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index 7317e831e8c..ccc78f9d1ba 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -15,6 +15,7 @@ import java.util.Set; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -78,40 +79,16 @@ public class PetApi { */ public ApiResponse addPetWithHttpInfo(Pet body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling addPet"); } - - // create path and map variables - String localVarPath = "/pet"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.addPet", "/pet", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -146,43 +123,26 @@ public class PetApi { */ public ApiResponse deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - if (apiKey != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (apiKey != null) { localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", new ArrayList<>(), null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -216,43 +176,22 @@ public class PetApi { */ public ApiResponse> findPetsByStatusWithHttpInfo(List status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'status' is set + // Check required parameters if (status == null) { throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus"); } - - // create path and map variables - String localVarPath = "/pet/findByStatus"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "status", status) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByStatus", "/pet/findByStatus", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -290,43 +229,22 @@ public class PetApi { */ @Deprecated public ApiResponse> findPetsByTagsWithHttpInfo(Set tags) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'tags' is set + // Check required parameters if (tags == null) { throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags"); } - - // create path and map variables - String localVarPath = "/pet/findByTags"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "tags", tags) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByTags", "/pet/findByTags", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -362,43 +280,21 @@ public class PetApi { */ public ApiResponse getPetByIdWithHttpInfo(Long petId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -435,40 +331,16 @@ public class PetApi { */ public ApiResponse updatePetWithHttpInfo(Pet body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling updatePet"); } - - // create path and map variables - String localVarPath = "/pet"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.updatePet", "/pet", "PUT", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -503,45 +375,29 @@ public class PetApi { */ public ApiResponse updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (name != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (name != null) { localVarFormParams.put("name", name); -if (status != null) + } + if (status != null) { localVarFormParams.put("status", status); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -577,47 +433,30 @@ if (status != null) */ public ApiResponse uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}/uploadImage" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (_file != null) + } + if (_file != null) { localVarFormParams.put("file", _file); + } - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -653,52 +492,31 @@ if (_file != null) */ public ApiResponse uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile"); } - - // verify the required parameter 'requiredFile' is set if (requiredFile == null) { throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/fake/{petId}/uploadImageWithRequiredFile" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (requiredFile != null) - localVarFormParams.put("requiredFile", requiredFile); - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + } + localVarFormParams.put("requiredFile", requiredFile); + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java index 1f094916301..0552c144390 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Order; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -75,42 +76,20 @@ public class StoreApi { */ public ApiResponse deleteOrderWithHttpInfo(String orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{order_id}" - .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString())); + .replaceAll("\\{order_id}", apiClient.escapeString(orderId)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Returns pet inventories by status @@ -139,37 +118,12 @@ public class StoreApi { */ public ApiResponse> getInventoryWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/store/inventory"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("StoreApi.getInventory", "/store/inventory", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -205,44 +159,21 @@ public class StoreApi { */ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{order_id}" - .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{order_id}", apiClient.escapeString(orderId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Place an order for a pet @@ -275,42 +206,16 @@ public class StoreApi { */ public ApiResponse placeOrderWithHttpInfo(Order body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder"); } - - // create path and map variables - String localVarPath = "/store/order"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.placeOrder", "/store/order", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java index 2a59daac578..1ccc0aad36b 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java @@ -13,6 +13,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,41 +75,16 @@ public class UserApi { */ public ApiResponse createUserWithHttpInfo(User body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling createUser"); } - - // create path and map variables - String localVarPath = "/user"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.createUser", "/user", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Creates list of users with given input array @@ -138,41 +114,16 @@ public class UserApi { */ public ApiResponse createUsersWithArrayInputWithHttpInfo(List body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput"); } - - // create path and map variables - String localVarPath = "/user/createWithArray"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", "/user/createWithArray", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Creates list of users with given input array @@ -202,41 +153,16 @@ public class UserApi { */ public ApiResponse createUsersWithListInputWithHttpInfo(List body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'body' is set + // Check required parameters if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput"); } - - // create path and map variables - String localVarPath = "/user/createWithList"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.createUsersWithListInput", "/user/createWithList", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Delete user @@ -268,42 +194,20 @@ public class UserApi { */ public ApiResponse deleteUserWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Get user by user name @@ -338,44 +242,21 @@ public class UserApi { */ public ApiResponse getUserByNameWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{username}", apiClient.escapeString(username)); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs user into the system @@ -410,50 +291,26 @@ public class UserApi { */ public ApiResponse loginUserWithHttpInfo(String username, String password) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser"); } - - // verify the required parameter 'password' is set if (password == null) { throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser"); } - - // create path and map variables - String localVarPath = "/user/login"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "username", username) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password)); - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.loginUser", "/user/login", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs out current logged in user session @@ -481,36 +338,11 @@ public class UserApi { */ public ApiResponse logoutUserWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/user/logout"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.logoutUser", "/user/logout", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Updated user @@ -544,46 +376,22 @@ public class UserApi { */ public ApiResponse updateUserWithHttpInfo(String username, User body) throws ApiException { - Object localVarPostBody = body; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser"); } - - // verify the required parameter 'body' is set if (body == null) { throw new ApiException(400, "Missing the required parameter 'body' when calling updateUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 28fdbd6e63a..69df9b57e7e 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesAnyType { @JsonAnySetter public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 59093dc6eba..f9011269ad1 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -83,7 +83,7 @@ public class AdditionalPropertiesArray { @JsonAnySetter public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 17ed09d84ac..a91038275c7 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesBoolean { @JsonAnySetter public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index fe558167aca..c14ac4d5810 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesInteger { @JsonAnySetter public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 1295699d45a..15c62efed1f 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -83,7 +83,7 @@ public class AdditionalPropertiesNumber { @JsonAnySetter public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 47374023df6..556a0ec2b09 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -83,7 +83,7 @@ public class AdditionalPropertiesObject { @JsonAnySetter public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index e5a9b0f86ae..a4b580f0412 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesString { @JsonAnySetter public AdditionalPropertiesString putAdditionalProperty(String key, String value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java index 2920ae422d0..c63b11c5d3d 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java @@ -153,14 +153,14 @@ public class Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("BigCat", BigCat.class); - mappings.put("Cat", Cat.class); - mappings.put("Dog", Dog.class); - mappings.put("Animal", Animal.class); - JSON.registerDiscriminator(Animal.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("BigCat", BigCat.class); + mappings.put("Cat", Cat.class); + mappings.put("Dog", Dog.class); + mappings.put("Animal", Animal.class); + JSON.registerDiscriminator(Animal.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java index 46334a7030a..a3986a67006 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java @@ -156,11 +156,11 @@ public class BigCat extends Cat { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("BigCat", BigCat.class); - JSON.registerDiscriminator(BigCat.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("BigCat", BigCat.class); + JSON.registerDiscriminator(BigCat.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java index 170ec427664..fa1875cb67b 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java @@ -121,12 +121,12 @@ public class Cat extends Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("BigCat", BigCat.class); - mappings.put("Cat", Cat.class); - JSON.registerDiscriminator(Cat.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("BigCat", BigCat.class); + mappings.put("Cat", Cat.class); + JSON.registerDiscriminator(Cat.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java index ba19147b2d5..523ed807c85 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java @@ -117,11 +117,11 @@ public class Dog extends Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("Dog", Dog.class); - JSON.registerDiscriminator(Dog.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("Dog", Dog.class); + JSON.registerDiscriminator(Dog.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java index b6d7bde6e20..7ffc9869d69 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java @@ -36,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -43,11 +44,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; import java.time.OffsetDateTime; import java.net.URLEncoder; @@ -71,94 +75,93 @@ import org.openapitools.client.auth.OAuth; */ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient extends JavaTimeFormatter { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "http://petstore.swagger.io:80/v2"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://{server}.swagger.io:{port}/v2", - "petstore server", - new HashMap() {{ - put("server", new ServerVariable( - "No description provided", - "petstore", - new HashSet( - Arrays.asList( - "petstore", - "qa-petstore", - "dev-petstore" - ) + protected List servers = new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://{server}.swagger.io:{port}/v2", + "petstore server", + Stream.>of( + new SimpleEntry<>("server", new ServerVariable( + "No description provided", + "petstore", + new LinkedHashSet<>(Arrays.asList( + "petstore", + "qa-petstore", + "dev-petstore" + )) + )), + new SimpleEntry<>("port", new ServerVariable( + "No description provided", + "80", + new LinkedHashSet<>(Arrays.asList( + "80", + "8080" + )) + )) + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + ), + new ServerConfiguration( + "https://localhost:8080/{version}", + "The local server", + Stream.>of( + new SimpleEntry<>("version", new ServerVariable( + "No description provided", + "v2", + new LinkedHashSet<>(Arrays.asList( + "v1", + "v2" + )) + )) + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + ), + new ServerConfiguration( + "https://127.0.0.1/no_variable", + "The local server without variables", + new LinkedHashMap<>() ) - )); - put("port", new ServerVariable( - "No description provided", - "80", - new HashSet( - Arrays.asList( - "80", - "8080" - ) - ) - )); - }} - ), - new ServerConfiguration( - "https://localhost:8080/{version}", - "The local server", - new HashMap() {{ - put("version", new ServerVariable( - "No description provided", - "v2", - new HashSet( - Arrays.asList( - "v1", - "v2" - ) - ) - )); - }} - ), - new ServerConfiguration( - "https://127.0.0.1/no_variable", - "The local server without variables", - new HashMap() - ) )); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ - put("PetApi.addPet", new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://petstore.swagger.io/v2", - "No description provided", - new HashMap() - ), + protected Map> operationServers; - new ServerConfiguration( - "http://path-server-test.petstore.local/v2", - "No description provided", - new HashMap() - ) + { + Map> operationServers = new LinkedHashMap<>(); + operationServers.put("PetApi.addPet", new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://petstore.swagger.io/v2", + "No description provided", + new LinkedHashMap<>() + ), + new ServerConfiguration( + "http://path-server-test.petstore.local/v2", + "No description provided", + new LinkedHashMap<>() + ) ))); - put("PetApi.updatePet", new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://petstore.swagger.io/v2", - "No description provided", - new HashMap() - ), + operationServers.put("PetApi.updatePet", new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://petstore.swagger.io/v2", + "No description provided", + new LinkedHashMap<>() + ), + new ServerConfiguration( + "http://path-server-test.petstore.local/v2", + "No description provided", + new LinkedHashMap<>() + ) + ))); + this.operationServers = operationServers; + } - new ServerConfiguration( - "http://path-server-test.petstore.local/v2", - "No description provided", - new HashMap() - ) - ))); - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -195,7 +198,7 @@ public class ApiClient extends JavaTimeFormatter { setUserAgent("OpenAPI-Generator/1.0.0/java"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; if (authMap != null) { auth = authMap.get("petstore_auth"); @@ -247,7 +250,7 @@ public class ApiClient extends JavaTimeFormatter { authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap(); + authenticationLookup = new HashMap<>(); } /** @@ -835,7 +838,7 @@ public class ApiClient extends JavaTimeFormatter { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -894,14 +897,13 @@ public class ApiClient extends JavaTimeFormatter { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -913,8 +915,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -934,8 +936,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1227,15 +1229,17 @@ public class ApiClient extends JavaTimeFormatter { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - serializeToString(body, formParams, contentType, isBodyNullable), - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + serializeToString(body, formParams, contentType, isBodyNullable), + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1252,7 +1256,7 @@ public class ApiClient extends JavaTimeFormatter { final int statusCode = response.getStatusInfo().getStatusCode(); // If OAuth is used and a status 401 is received, renew the access token and retry the request - if (statusCode == Status.UNAUTHORIZED.getStatusCode()) { + if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) { for (String authName : authNames) { Authentication authentication = authentications.get(authName); if (authentication instanceof OAuth) { @@ -1423,10 +1427,10 @@ public class ApiClient extends JavaTimeFormatter { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/JSON.java index f1dc353af58..8652344eaa3 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/JSON.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/JSON.java @@ -64,7 +64,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -84,7 +84,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -193,12 +193,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 0437af1a111..b5bfe28a7fc 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,42 +75,16 @@ public class AnotherFakeApi { */ public ApiResponse call123testSpecialTagsWithHttpInfo(Client client) throws ApiException { - Object localVarPostBody = client; - - // verify the required parameter 'client' is set + // Check required parameters if (client == null) { throw new ApiException(400, "Missing the required parameter 'client' when calling call123testSpecialTags"); } - - // create path and map variables - String localVarPath = "/another-fake/dummy"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", "/another-fake/dummy", "PATCH", new ArrayList<>(), client, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/DefaultApi.java index e9b2ade6895..6b2bab68d7b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.FooGetDefaultResponse; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -72,37 +73,11 @@ public class DefaultApi { */ public ApiResponse fooGetWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/foo"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("DefaultApi.fooGet", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("DefaultApi.fooGet", "/foo", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java index 84549ce0609..6ac9438f44b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java @@ -21,6 +21,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -81,38 +82,12 @@ public class FakeApi { */ public ApiResponse fakeHealthGetWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/fake/health"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeHealthGet", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeHealthGet", "/fake/health", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -143,38 +118,12 @@ public class FakeApi { */ public ApiResponse fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/boolean"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", "/fake/outer/boolean", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -205,38 +154,12 @@ public class FakeApi { */ public ApiResponse fakeOuterCompositeSerializeWithHttpInfo(OuterComposite outerComposite) throws ApiException { - Object localVarPostBody = outerComposite; - - // create path and map variables - String localVarPath = "/fake/outer/composite"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", "/fake/outer/composite", "POST", new ArrayList<>(), outerComposite, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -267,38 +190,12 @@ public class FakeApi { */ public ApiResponse fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/number"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", "/fake/outer/number", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -329,38 +226,12 @@ public class FakeApi { */ public ApiResponse fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/string"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", "/fake/outer/string", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Array of Enums @@ -389,38 +260,12 @@ public class FakeApi { */ public ApiResponse> getArrayOfEnumsWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/fake/array-of-enums"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("FakeApi.getArrayOfEnums", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.getArrayOfEnums", "/fake/array-of-enums", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -450,41 +295,16 @@ public class FakeApi { */ public ApiResponse testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass fileSchemaTestClass) throws ApiException { - Object localVarPostBody = fileSchemaTestClass; - - // verify the required parameter 'fileSchemaTestClass' is set + // Check required parameters if (fileSchemaTestClass == null) { throw new ApiException(400, "Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema"); } - - // create path and map variables - String localVarPath = "/fake/body-with-file-schema"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", "/fake/body-with-file-schema", "PUT", new ArrayList<>(), fileSchemaTestClass, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * @@ -516,47 +336,24 @@ public class FakeApi { */ public ApiResponse testBodyWithQueryParamsWithHttpInfo(String query, User user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'query' is set + // Check required parameters if (query == null) { throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams"); } - - // verify the required parameter 'user' is set if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling testBodyWithQueryParams"); } - - // create path and map variables - String localVarPath = "/fake/body-with-query-params"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "query", query) + ); - localVarQueryParams.addAll(apiClient.parameterToPairs("", "query", query)); - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", "/fake/body-with-query-params", "PUT", localVarQueryParams, user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * To test \"client\" model @@ -587,43 +384,17 @@ public class FakeApi { */ public ApiResponse testClientModelWithHttpInfo(Client client) throws ApiException { - Object localVarPostBody = client; - - // verify the required parameter 'client' is set + // Check required parameters if (client == null) { throw new ApiException(400, "Missing the required parameter 'client' when calling testClientModel"); } - - // create path and map variables - String localVarPath = "/fake"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.testClientModel", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.testClientModel", "/fake", "PATCH", new ArrayList<>(), client, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -681,83 +452,62 @@ public class FakeApi { */ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'number' is set + // Check required parameters if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); } - - // verify the required parameter '_double' is set if (_double == null) { throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters"); } - - // verify the required parameter 'patternWithoutDelimiter' is set if (patternWithoutDelimiter == null) { throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters"); } - - // verify the required parameter '_byte' is set if (_byte == null) { throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters"); } - - // create path and map variables - String localVarPath = "/fake"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (integer != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (integer != null) { localVarFormParams.put("integer", integer); -if (int32 != null) + } + if (int32 != null) { localVarFormParams.put("int32", int32); -if (int64 != null) + } + if (int64 != null) { localVarFormParams.put("int64", int64); -if (number != null) - localVarFormParams.put("number", number); -if (_float != null) + } + localVarFormParams.put("number", number); + if (_float != null) { localVarFormParams.put("float", _float); -if (_double != null) - localVarFormParams.put("double", _double); -if (string != null) + } + localVarFormParams.put("double", _double); + if (string != null) { localVarFormParams.put("string", string); -if (patternWithoutDelimiter != null) - localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); -if (_byte != null) - localVarFormParams.put("byte", _byte); -if (binary != null) + } + localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); + localVarFormParams.put("byte", _byte); + if (binary != null) { localVarFormParams.put("binary", binary); -if (date != null) + } + if (date != null) { localVarFormParams.put("date", date); -if (dateTime != null) + } + if (dateTime != null) { localVarFormParams.put("dateTime", dateTime); -if (password != null) + } + if (password != null) { localVarFormParams.put("password", password); -if (paramCallback != null) + } + if (paramCallback != null) { localVarFormParams.put("callback", paramCallback); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "http_basic_test" }; - - return apiClient.invokeAPI("FakeApi.testEndpointParameters", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"http_basic_test"}; + return apiClient.invokeAPI("FakeApi.testEndpointParameters", "/fake", "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -804,103 +554,71 @@ if (paramCallback != null) */ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/fake"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_string", enumQueryString)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_integer", enumQueryInteger)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_double", enumQueryDouble)); - if (enumHeaderStringArray != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (enumHeaderStringArray != null) { localVarHeaderParams.put("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); -if (enumHeaderString != null) + } + if (enumHeaderString != null) { localVarHeaderParams.put("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } - - if (enumFormStringArray != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (enumFormStringArray != null) { localVarFormParams.put("enum_form_string_array", enumFormStringArray); -if (enumFormString != null) + } + if (enumFormString != null) { localVarFormParams.put("enum_form_string", enumFormString); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testEnumParameters", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + return apiClient.invokeAPI("FakeApi.testEnumParameters", "/fake", "GET", localVarQueryParams, null, + localVarHeaderParams, new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, + null, null, false); } private ApiResponse testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'requiredStringGroup' is set + // Check required parameters if (requiredStringGroup == null) { throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters"); } - - // verify the required parameter 'requiredBooleanGroup' is set if (requiredBooleanGroup == null) { throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters"); } - - // verify the required parameter 'requiredInt64Group' is set if (requiredInt64Group == null) { throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters"); } - - // create path and map variables - String localVarPath = "/fake"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_string_group", requiredStringGroup)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "required_string_group", requiredStringGroup) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_int64_group", requiredInt64Group)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "string_group", stringGroup)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "int64_group", int64Group)); - if (requiredBooleanGroup != null) - localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); -if (booleanGroup != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); + if (booleanGroup != null) { localVarHeaderParams.put("boolean_group", apiClient.parameterToString(booleanGroup)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "bearer_test" }; - - return apiClient.invokeAPI("FakeApi.testGroupParameters", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"bearer_test"}; + return apiClient.invokeAPI("FakeApi.testGroupParameters", "/fake", "DELETE", localVarQueryParams, null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } @@ -1046,41 +764,16 @@ if (booleanGroup != null) */ public ApiResponse testInlineAdditionalPropertiesWithHttpInfo(Map requestBody) throws ApiException { - Object localVarPostBody = requestBody; - - // verify the required parameter 'requestBody' is set + // Check required parameters if (requestBody == null) { throw new ApiException(400, "Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties"); } - - // create path and map variables - String localVarPath = "/fake/inline-additionalProperties"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", "/fake/inline-additionalProperties", "POST", new ArrayList<>(), requestBody, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * test json serialization of form data @@ -1112,50 +805,24 @@ if (booleanGroup != null) */ public ApiResponse testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'param' is set + // Check required parameters if (param == null) { throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData"); } - - // verify the required parameter 'param2' is set if (param2 == null) { throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData"); } - - // create path and map variables - String localVarPath = "/fake/jsonFormData"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + localVarFormParams.put("param", param); + localVarFormParams.put("param2", param2); - - - - if (param != null) - localVarFormParams.put("param", param); -if (param2 != null) - localVarFormParams.put("param2", param2); - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testJsonFormData", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + return apiClient.invokeAPI("FakeApi.testJsonFormData", "/fake/jsonFormData", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, + null, null, false); } /** * @@ -1193,65 +860,36 @@ if (param2 != null) */ public ApiResponse testQueryParameterCollectionFormatWithHttpInfo(List pipe, List ioutil, List http, List url, List context) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'pipe' is set + // Check required parameters if (pipe == null) { throw new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'ioutil' is set if (ioutil == null) { throw new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'http' is set if (http == null) { throw new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'url' is set if (url == null) { throw new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'context' is set if (context == null) { throw new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat"); } - - // create path and map variables - String localVarPath = "/fake/test-query-parameters"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "pipe", pipe)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("multi", "pipe", pipe) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "ioutil", ioutil)); localVarQueryParams.addAll(apiClient.parameterToPairs("ssv", "http", http)); localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "url", url)); localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "context", context)); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", "/fake/test-query-parameters", "PUT", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 6aee09d3edd..7827fe7274c 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,42 +75,17 @@ public class FakeClassnameTags123Api { */ public ApiResponse testClassnameWithHttpInfo(Client client) throws ApiException { - Object localVarPostBody = client; - - // verify the required parameter 'client' is set + // Check required parameters if (client == null) { throw new ApiException(400, "Missing the required parameter 'client' when calling testClassname"); } - - // create path and map variables - String localVarPath = "/fake_classname_test"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key_query" }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + String[] localVarAuthNames = new String[] {"api_key_query"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", "/fake_classname_test", "PATCH", new ArrayList<>(), client, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/PetApi.java index 273c7ffb489..5b1ed054cc3 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/PetApi.java @@ -14,6 +14,7 @@ import org.openapitools.client.model.Pet; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -75,40 +76,16 @@ public class PetApi { */ public ApiResponse addPetWithHttpInfo(Pet pet) throws ApiException { - Object localVarPostBody = pet; - - // verify the required parameter 'pet' is set + // Check required parameters if (pet == null) { throw new ApiException(400, "Missing the required parameter 'pet' when calling addPet"); } - - // create path and map variables - String localVarPath = "/pet"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth", "http_signature_test" }; - - return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth", "http_signature_test"}; + return apiClient.invokeAPI("PetApi.addPet", "/pet", "POST", new ArrayList<>(), pet, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -141,43 +118,26 @@ public class PetApi { */ public ApiResponse deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - if (apiKey != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (apiKey != null) { localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", new ArrayList<>(), null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -211,43 +171,22 @@ public class PetApi { */ public ApiResponse> findPetsByStatusWithHttpInfo(List status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'status' is set + // Check required parameters if (status == null) { throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus"); } - - // create path and map variables - String localVarPath = "/pet/findByStatus"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth", "http_signature_test" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "status", status) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth", "http_signature_test"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByStatus", "/pet/findByStatus", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -285,43 +224,22 @@ public class PetApi { */ @Deprecated public ApiResponse> findPetsByTagsWithHttpInfo(List tags) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'tags' is set + // Check required parameters if (tags == null) { throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags"); } - - // create path and map variables - String localVarPath = "/pet/findByTags"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth", "http_signature_test" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "tags", tags) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth", "http_signature_test"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByTags", "/pet/findByTags", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -357,43 +275,21 @@ public class PetApi { */ public ApiResponse getPetByIdWithHttpInfo(Long petId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -428,40 +324,16 @@ public class PetApi { */ public ApiResponse updatePetWithHttpInfo(Pet pet) throws ApiException { - Object localVarPostBody = pet; - - // verify the required parameter 'pet' is set + // Check required parameters if (pet == null) { throw new ApiException(400, "Missing the required parameter 'pet' when calling updatePet"); } - - // create path and map variables - String localVarPath = "/pet"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth", "http_signature_test" }; - - return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth", "http_signature_test"}; + return apiClient.invokeAPI("PetApi.updatePet", "/pet", "PUT", new ArrayList<>(), pet, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -496,45 +368,29 @@ public class PetApi { */ public ApiResponse updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (name != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (name != null) { localVarFormParams.put("name", name); -if (status != null) + } + if (status != null) { localVarFormParams.put("status", status); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -570,47 +426,30 @@ if (status != null) */ public ApiResponse uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}/uploadImage" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (_file != null) + } + if (_file != null) { localVarFormParams.put("file", _file); + } - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -646,52 +485,31 @@ if (_file != null) */ public ApiResponse uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile"); } - - // verify the required parameter 'requiredFile' is set if (requiredFile == null) { throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/fake/{petId}/uploadImageWithRequiredFile" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (requiredFile != null) - localVarFormParams.put("requiredFile", requiredFile); - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + } + localVarFormParams.put("requiredFile", requiredFile); + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java index bee4f7e72bf..53b91b2abe9 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Order; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -75,42 +76,20 @@ public class StoreApi { */ public ApiResponse deleteOrderWithHttpInfo(String orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{order_id}" - .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString())); + .replaceAll("\\{order_id}", apiClient.escapeString(orderId)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Returns pet inventories by status @@ -139,37 +118,12 @@ public class StoreApi { */ public ApiResponse> getInventoryWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/store/inventory"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("StoreApi.getInventory", "/store/inventory", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -205,44 +159,21 @@ public class StoreApi { */ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{order_id}" - .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{order_id}", apiClient.escapeString(orderId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Place an order for a pet @@ -275,42 +206,16 @@ public class StoreApi { */ public ApiResponse placeOrderWithHttpInfo(Order order) throws ApiException { - Object localVarPostBody = order; - - // verify the required parameter 'order' is set + // Check required parameters if (order == null) { throw new ApiException(400, "Missing the required parameter 'order' when calling placeOrder"); } - - // create path and map variables - String localVarPath = "/store/order"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.placeOrder", "/store/order", "POST", new ArrayList<>(), order, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/UserApi.java index c23402c300b..837abd285fd 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/UserApi.java @@ -13,6 +13,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,41 +75,16 @@ public class UserApi { */ public ApiResponse createUserWithHttpInfo(User user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUser"); } - - // create path and map variables - String localVarPath = "/user"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("UserApi.createUser", "/user", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Creates list of users with given input array @@ -138,41 +114,16 @@ public class UserApi { */ public ApiResponse createUsersWithArrayInputWithHttpInfo(List user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithArrayInput"); } - - // create path and map variables - String localVarPath = "/user/createWithArray"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", "/user/createWithArray", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Creates list of users with given input array @@ -202,41 +153,16 @@ public class UserApi { */ public ApiResponse createUsersWithListInputWithHttpInfo(List user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithListInput"); } - - // create path and map variables - String localVarPath = "/user/createWithList"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("UserApi.createUsersWithListInput", "/user/createWithList", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Delete user @@ -268,42 +194,20 @@ public class UserApi { */ public ApiResponse deleteUserWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Get user by user name @@ -338,44 +242,21 @@ public class UserApi { */ public ApiResponse getUserByNameWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{username}", apiClient.escapeString(username)); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs user into the system @@ -410,50 +291,26 @@ public class UserApi { */ public ApiResponse loginUserWithHttpInfo(String username, String password) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser"); } - - // verify the required parameter 'password' is set if (password == null) { throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser"); } - - // create path and map variables - String localVarPath = "/user/login"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "username", username) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password)); - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.loginUser", "/user/login", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs out current logged in user session @@ -481,36 +338,11 @@ public class UserApi { */ public ApiResponse logoutUserWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/user/logout"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.logoutUser", "/user/logout", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Updated user @@ -544,46 +376,22 @@ public class UserApi { */ public ApiResponse updateUserWithHttpInfo(String username, User user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser"); } - - // verify the required parameter 'user' is set if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling updateUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java index a64e28aa537..b07ca339373 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java @@ -151,13 +151,13 @@ public class Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("Cat", Cat.class); - mappings.put("Dog", Dog.class); - mappings.put("Animal", Animal.class); - JSON.registerDiscriminator(Animal.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("Cat", Cat.class); + mappings.put("Dog", Dog.class); + mappings.put("Animal", Animal.class); + JSON.registerDiscriminator(Animal.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java index 032be87b127..64da62158f8 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java @@ -92,7 +92,7 @@ public class Cat extends Animal { @JsonAnySetter public Cat putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -160,11 +160,11 @@ public class Cat extends Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("Cat", Cat.class); - JSON.registerDiscriminator(Cat.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("Cat", Cat.class); + JSON.registerDiscriminator(Cat.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java index f97f1c28530..9d87b793cd8 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java @@ -135,7 +135,7 @@ public class ChildCat extends ParentPet { @JsonAnySetter public ChildCat putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -205,11 +205,11 @@ public class ChildCat extends ParentPet { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("ChildCat", ChildCat.class); - JSON.registerDiscriminator(ChildCat.class, "pet_type", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("ChildCat", ChildCat.class); + JSON.registerDiscriminator(ChildCat.class, "pet_type", mappings); + } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java index aa3660ca479..79990832e00 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java @@ -111,7 +111,7 @@ public class ComplexQuadrilateral { @JsonAnySetter public ComplexQuadrilateral putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java index bd197421d13..6fcd4ce468e 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java @@ -92,7 +92,7 @@ public class Dog extends Animal { @JsonAnySetter public Dog putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -160,11 +160,11 @@ public class Dog extends Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("Dog", Dog.class); - JSON.registerDiscriminator(Dog.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("Dog", Dog.class); + JSON.registerDiscriminator(Dog.class, "className", mappings); + } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java index c5eaa771d2f..6b6639d2c98 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java @@ -195,7 +195,7 @@ public class Drawing { @JsonAnySetter public Drawing putAdditionalProperty(String key, Fruit value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java index 0eb9d642457..d9c3cf11119 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java @@ -111,7 +111,7 @@ public class EquilateralTriangle { @JsonAnySetter public EquilateralTriangle putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java index 6bd90ba2086..7f4ff8190bc 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java @@ -162,7 +162,7 @@ public class Fruit extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Fruit() { super("oneOf", Boolean.FALSE); @@ -201,12 +201,12 @@ public class Fruit extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(Apple.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Apple.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Banana.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Banana.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java index 69bc43bf44f..812aee01f83 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java @@ -164,7 +164,7 @@ public class FruitReq extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public FruitReq() { super("oneOf", Boolean.TRUE); @@ -208,12 +208,12 @@ public class FruitReq extends AbstractOpenApiSchema { return; } - if (JSON.isInstanceOf(AppleReq.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(AppleReq.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(BananaReq.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(BananaReq.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java index 23f7dedaf94..92dbb1a6550 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java @@ -122,7 +122,7 @@ public class GmFruit extends AbstractOpenApiSchema { } // store a list of schema names defined in anyOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public GmFruit() { super("anyOf", Boolean.FALSE); @@ -161,12 +161,12 @@ public class GmFruit extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(Apple.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Apple.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Banana.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Banana.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index c1e20a04960..5eacdbf4c7f 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -120,13 +120,13 @@ public class GrandparentAnimal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("ChildCat", ChildCat.class); - mappings.put("ParentPet", ParentPet.class); - mappings.put("GrandparentAnimal", GrandparentAnimal.class); - JSON.registerDiscriminator(GrandparentAnimal.class, "pet_type", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("ChildCat", ChildCat.class); + mappings.put("ParentPet", ParentPet.class); + mappings.put("GrandparentAnimal", GrandparentAnimal.class); + JSON.registerDiscriminator(GrandparentAnimal.class, "pet_type", mappings); + } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java index b83972ae700..4a14248c240 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java @@ -215,7 +215,7 @@ public class Mammal extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Mammal() { super("oneOf", Boolean.FALSE); @@ -234,7 +234,7 @@ public class Mammal extends AbstractOpenApiSchema { @JsonAnySetter public Mammal putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -294,7 +294,7 @@ public class Mammal extends AbstractOpenApiSchema { }); JSON.registerDescendants(Mammal.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("Pig", Pig.class); mappings.put("whale", Whale.class); mappings.put("zebra", Zebra.class); @@ -317,17 +317,17 @@ public class Mammal extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(Pig.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Pig.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Whale.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Whale.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Zebra.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Zebra.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java index 2b68e8615f3..4d8ffec5e9a 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java @@ -556,7 +556,7 @@ public class NullableClass { @JsonAnySetter public NullableClass putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java index d1700e791de..e51f239ec04 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java @@ -186,7 +186,7 @@ public class NullableShape extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public NullableShape() { super("oneOf", Boolean.TRUE); @@ -205,7 +205,7 @@ public class NullableShape extends AbstractOpenApiSchema { @JsonAnySetter public NullableShape putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -258,7 +258,7 @@ public class NullableShape extends AbstractOpenApiSchema { }); JSON.registerDescendants(NullableShape.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("Quadrilateral", Quadrilateral.class); mappings.put("Triangle", Triangle.class); mappings.put("NullableShape", NullableShape.class); @@ -285,12 +285,12 @@ public class NullableShape extends AbstractOpenApiSchema { return; } - if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Triangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java index e84cafd2ff6..c4188603a1b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java @@ -67,7 +67,7 @@ public class ParentPet extends GrandparentAnimal { @JsonAnySetter public ParentPet putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -131,12 +131,12 @@ public class ParentPet extends GrandparentAnimal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("ChildCat", ChildCat.class); - mappings.put("ParentPet", ParentPet.class); - JSON.registerDiscriminator(ParentPet.class, "pet_type", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("ChildCat", ChildCat.class); + mappings.put("ParentPet", ParentPet.class); + JSON.registerDiscriminator(ParentPet.class, "pet_type", mappings); + } } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java index 64fd06875a3..2428fcd0d9f 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java @@ -184,7 +184,7 @@ public class Pig extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Pig() { super("oneOf", Boolean.FALSE); @@ -203,7 +203,7 @@ public class Pig extends AbstractOpenApiSchema { @JsonAnySetter public Pig putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -256,7 +256,7 @@ public class Pig extends AbstractOpenApiSchema { }); JSON.registerDescendants(Pig.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("BasquePig", BasquePig.class); mappings.put("DanishPig", DanishPig.class); mappings.put("Pig", Pig.class); @@ -278,12 +278,12 @@ public class Pig extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(BasquePig.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(BasquePig.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(DanishPig.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(DanishPig.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java index f13a722423a..77835c95271 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -184,7 +184,7 @@ public class Quadrilateral extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Quadrilateral() { super("oneOf", Boolean.FALSE); @@ -203,7 +203,7 @@ public class Quadrilateral extends AbstractOpenApiSchema { @JsonAnySetter public Quadrilateral putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -256,7 +256,7 @@ public class Quadrilateral extends AbstractOpenApiSchema { }); JSON.registerDescendants(Quadrilateral.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("ComplexQuadrilateral", ComplexQuadrilateral.class); mappings.put("SimpleQuadrilateral", SimpleQuadrilateral.class); mappings.put("Quadrilateral", Quadrilateral.class); @@ -278,12 +278,12 @@ public class Quadrilateral extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(ComplexQuadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(ComplexQuadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(SimpleQuadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(SimpleQuadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java index 8152b82cde9..6c6e585e557 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java @@ -111,7 +111,7 @@ public class ScaleneTriangle { @JsonAnySetter public ScaleneTriangle putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java index 6f278d5f261..673436c0965 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java @@ -184,7 +184,7 @@ public class Shape extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Shape() { super("oneOf", Boolean.FALSE); @@ -203,7 +203,7 @@ public class Shape extends AbstractOpenApiSchema { @JsonAnySetter public Shape putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -256,7 +256,7 @@ public class Shape extends AbstractOpenApiSchema { }); JSON.registerDescendants(Shape.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("Quadrilateral", Quadrilateral.class); mappings.put("Triangle", Triangle.class); mappings.put("Shape", Shape.class); @@ -278,12 +278,12 @@ public class Shape extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Triangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 4cfa05685c1..435c59cda0b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -186,7 +186,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public ShapeOrNull() { super("oneOf", Boolean.TRUE); @@ -205,7 +205,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema { @JsonAnySetter public ShapeOrNull putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -258,7 +258,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema { }); JSON.registerDescendants(ShapeOrNull.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("Quadrilateral", Quadrilateral.class); mappings.put("Triangle", Triangle.class); mappings.put("ShapeOrNull", ShapeOrNull.class); @@ -285,12 +285,12 @@ public class ShapeOrNull extends AbstractOpenApiSchema { return; } - if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Triangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java index e18386d9875..154e29bf76e 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java @@ -111,7 +111,7 @@ public class SimpleQuadrilateral { @JsonAnySetter public SimpleQuadrilateral putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java index d79423b2b3e..faa35f7e747 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java @@ -215,7 +215,7 @@ public class Triangle extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Triangle() { super("oneOf", Boolean.FALSE); @@ -234,7 +234,7 @@ public class Triangle extends AbstractOpenApiSchema { @JsonAnySetter public Triangle putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -294,7 +294,7 @@ public class Triangle extends AbstractOpenApiSchema { }); JSON.registerDescendants(Triangle.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("EquilateralTriangle", EquilateralTriangle.class); mappings.put("IsoscelesTriangle", IsoscelesTriangle.class); mappings.put("ScaleneTriangle", ScaleneTriangle.class); @@ -317,17 +317,17 @@ public class Triangle extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(EquilateralTriangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(EquilateralTriangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(IsoscelesTriangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(IsoscelesTriangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(ScaleneTriangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(ScaleneTriangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java index 30ea3e69bf1..a2e2dbb4a71 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java @@ -149,7 +149,7 @@ public class Zebra { @JsonAnySetter public Zebra putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index 7462e79590a..a143237a07e 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -35,6 +35,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -42,11 +43,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; import java.time.OffsetDateTime; import java.net.URLEncoder; @@ -68,63 +72,58 @@ import org.openapitools.client.auth.ApiKeyAuth; */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient extends JavaTimeFormatter { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "http://petstore.swagger.io:80/v2"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://{server}.swagger.io:{port}/v2", - "petstore server", - new HashMap() {{ - put("server", new ServerVariable( - "No description provided", - "petstore", - new HashSet( - Arrays.asList( - "petstore", - "qa-petstore", - "dev-petstore" - ) + protected List servers = new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://{server}.swagger.io:{port}/v2", + "petstore server", + Stream.>of( + new SimpleEntry<>("server", new ServerVariable( + "No description provided", + "petstore", + new LinkedHashSet<>(Arrays.asList( + "petstore", + "qa-petstore", + "dev-petstore" + )) + )), + new SimpleEntry<>("port", new ServerVariable( + "No description provided", + "80", + new LinkedHashSet<>(Arrays.asList( + "80", + "8080" + )) + )) + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + ), + new ServerConfiguration( + "https://localhost:8080/{version}", + "The local server", + Stream.>of( + new SimpleEntry<>("version", new ServerVariable( + "No description provided", + "v2", + new LinkedHashSet<>(Arrays.asList( + "v1", + "v2" + )) + )) + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) ) - )); - put("port", new ServerVariable( - "No description provided", - "80", - new HashSet( - Arrays.asList( - "80", - "8080" - ) - ) - )); - }} - ), - new ServerConfiguration( - "https://localhost:8080/{version}", - "The local server", - new HashMap() {{ - put("version", new ServerVariable( - "No description provided", - "v2", - new HashSet( - Arrays.asList( - "v1", - "v2" - ) - ) - )); - }} - ) )); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + protected Map> operationServers = new HashMap<>(); + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -161,7 +160,7 @@ public class ApiClient extends JavaTimeFormatter { setUserAgent("OpenAPI-Generator/1.0.0/java"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; if (authMap != null) { auth = authMap.get("api_key"); @@ -183,7 +182,7 @@ public class ApiClient extends JavaTimeFormatter { authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap(); + authenticationLookup = new HashMap<>(); authenticationLookup.put("api_key_query", "api_key"); } @@ -665,7 +664,7 @@ public class ApiClient extends JavaTimeFormatter { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -724,14 +723,13 @@ public class ApiClient extends JavaTimeFormatter { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -743,8 +741,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -764,8 +762,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1057,15 +1055,17 @@ public class ApiClient extends JavaTimeFormatter { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - null, - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + null, + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1237,10 +1237,10 @@ public class ApiClient extends JavaTimeFormatter { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java index c6c83696217..af211b53e53 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java @@ -63,7 +63,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -83,7 +83,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -192,12 +192,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/api/UsageApi.java b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/api/UsageApi.java index 3b1d2d280f0..5843abb0b83 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/api/UsageApi.java +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/api/UsageApi.java @@ -11,6 +11,7 @@ import javax.ws.rs.core.GenericType; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -71,37 +72,12 @@ public class UsageApi { */ public ApiResponse anyKeyWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/any"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key", "api_key_query" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key", "api_key_query"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UsageApi.anyKey", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("UsageApi.anyKey", "/any", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -131,37 +107,12 @@ public class UsageApi { */ public ApiResponse bothKeysWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/both"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key", "api_key_query" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key", "api_key_query"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UsageApi.bothKeys", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("UsageApi.bothKeys", "/both", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -191,37 +142,12 @@ public class UsageApi { */ public ApiResponse keyInHeaderWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/header"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UsageApi.keyInHeader", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("UsageApi.keyInHeader", "/header", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -251,37 +177,12 @@ public class UsageApi { */ public ApiResponse keyInQueryWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/query"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key_query" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key_query"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UsageApi.keyInQuery", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("UsageApi.keyInQuery", "/query", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java index 93587e00afd..641b5f5d50f 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java @@ -35,6 +35,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -42,11 +43,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; import java.time.OffsetDateTime; import java.net.URLEncoder; @@ -68,25 +72,26 @@ import org.openapitools.client.auth.ApiKeyAuth; */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient extends JavaTimeFormatter { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "http://localhost"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList(Arrays.asList( - new ServerConfiguration( - "", - "No description provided", - new HashMap() - ) + protected List servers = new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "", + "No description provided", + new LinkedHashMap<>() + ) )); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + protected Map> operationServers = new HashMap<>(); + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -123,13 +128,13 @@ public class ApiClient extends JavaTimeFormatter { setUserAgent("OpenAPI-Generator/1.0.0/java"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; // Prevent the authentications from being modified. authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap(); + authenticationLookup = new HashMap<>(); } /** @@ -610,7 +615,7 @@ public class ApiClient extends JavaTimeFormatter { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -669,14 +674,13 @@ public class ApiClient extends JavaTimeFormatter { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -688,8 +692,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -709,8 +713,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1002,15 +1006,17 @@ public class ApiClient extends JavaTimeFormatter { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - null, - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + null, + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1182,10 +1188,10 @@ public class ApiClient extends JavaTimeFormatter { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/JSON.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/JSON.java index 24317dfe36a..8e72ba03553 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/JSON.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/JSON.java @@ -64,7 +64,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -84,7 +84,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -193,12 +193,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/api/DefaultApi.java index 2bbea7b750c..5652c5a00bc 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.MySchemaNameCharacters; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,37 +75,11 @@ public class DefaultApi { */ public ApiResponse testPostWithHttpInfo(MySchemaNameCharacters mySchemaNameCharacters) throws ApiException { - Object localVarPostBody = mySchemaNameCharacters; - - // create path and map variables - String localVarPath = "/test"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("DefaultApi.testPost", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("DefaultApi.testPost", "/test", "POST", new ArrayList<>(), mySchemaNameCharacters, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/ChildSchema.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/ChildSchema.java index a39f12c00b1..4c35f1b883c 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/ChildSchema.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/ChildSchema.java @@ -92,7 +92,7 @@ public class ChildSchema extends Parent { @JsonAnySetter public ChildSchema putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -160,11 +160,11 @@ public class ChildSchema extends Parent { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("ChildSchema", ChildSchema.class); - JSON.registerDiscriminator(ChildSchema.class, "objectType", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("ChildSchema", ChildSchema.class); + JSON.registerDiscriminator(ChildSchema.class, "objectType", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java index fd536702c9c..d54af6d0d58 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java @@ -93,7 +93,7 @@ public class MySchemaNameCharacters extends Parent { @JsonAnySetter public MySchemaNameCharacters putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -161,11 +161,11 @@ public class MySchemaNameCharacters extends Parent { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("MySchemaName._-Characters", MySchemaNameCharacters.class); - JSON.registerDiscriminator(MySchemaNameCharacters.class, "objectType", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("MySchemaName._-Characters", MySchemaNameCharacters.class); + JSON.registerDiscriminator(MySchemaNameCharacters.class, "objectType", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java index ebef79d5e94..67758eceb02 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java @@ -120,13 +120,13 @@ public class Parent { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("ChildSchema", ChildSchema.class); - mappings.put("MySchemaName._-Characters", MySchemaNameCharacters.class); - mappings.put("Parent", Parent.class); - JSON.registerDiscriminator(Parent.class, "objectType", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("ChildSchema", ChildSchema.class); + mappings.put("MySchemaName._-Characters", MySchemaNameCharacters.class); + mappings.put("Parent", Parent.class); + JSON.registerDiscriminator(Parent.class, "objectType", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java index da12109e92d..86f484909f7 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java @@ -36,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -43,11 +44,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; import java.time.OffsetDateTime; import java.net.URLEncoder; @@ -70,25 +74,26 @@ import org.openapitools.client.auth.OAuth; */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient extends JavaTimeFormatter { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "http://petstore.swagger.io/v2"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://petstore.swagger.io/v2", - "No description provided", - new HashMap() - ) + protected List servers = new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://petstore.swagger.io/v2", + "No description provided", + new LinkedHashMap<>() + ) )); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + protected Map> operationServers = new HashMap<>(); + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -125,7 +130,7 @@ public class ApiClient extends JavaTimeFormatter { setUserAgent("OpenAPI-Generator/1.0.0/java"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; if (authMap != null) { auth = authMap.get("petstore_auth"); @@ -147,7 +152,7 @@ public class ApiClient extends JavaTimeFormatter { authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap(); + authenticationLookup = new HashMap<>(); } /** @@ -735,7 +740,7 @@ public class ApiClient extends JavaTimeFormatter { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -794,14 +799,13 @@ public class ApiClient extends JavaTimeFormatter { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -813,8 +817,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -834,8 +838,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1127,15 +1131,17 @@ public class ApiClient extends JavaTimeFormatter { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - null, - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + null, + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1152,7 +1158,7 @@ public class ApiClient extends JavaTimeFormatter { final int statusCode = response.getStatusInfo().getStatusCode(); // If OAuth is used and a status 401 is received, renew the access token and retry the request - if (statusCode == Status.UNAUTHORIZED.getStatusCode()) { + if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) { for (String authName : authNames) { Authentication authentication = authentications.get(authName); if (authentication instanceof OAuth) { @@ -1323,10 +1329,10 @@ public class ApiClient extends JavaTimeFormatter { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/JSON.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/JSON.java index 24317dfe36a..8e72ba03553 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/JSON.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/JSON.java @@ -64,7 +64,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -84,7 +84,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -193,12 +193,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/PetApi.java index b08f6fccba5..c0a100379b9 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/PetApi.java @@ -14,6 +14,7 @@ import org.openapitools.client.model.Pet; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -78,42 +79,17 @@ public class PetApi { */ public ApiResponse addPetWithHttpInfo(Pet pet) throws ApiException { - Object localVarPostBody = pet; - - // verify the required parameter 'pet' is set + // Check required parameters if (pet == null) { throw new ApiException(400, "Missing the required parameter 'pet' when calling addPet"); } - - // create path and map variables - String localVarPath = "/pet"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.addPet", "/pet", "POST", new ArrayList<>(), pet, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -146,43 +122,26 @@ public class PetApi { */ public ApiResponse deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - if (apiKey != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (apiKey != null) { localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", new ArrayList<>(), null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -216,43 +175,22 @@ public class PetApi { */ public ApiResponse> findPetsByStatusWithHttpInfo(List status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'status' is set + // Check required parameters if (status == null) { throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus"); } - - // create path and map variables - String localVarPath = "/pet/findByStatus"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "status", status) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByStatus", "/pet/findByStatus", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -290,43 +228,22 @@ public class PetApi { */ @Deprecated public ApiResponse> findPetsByTagsWithHttpInfo(List tags) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'tags' is set + // Check required parameters if (tags == null) { throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags"); } - - // create path and map variables - String localVarPath = "/pet/findByTags"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "tags", tags) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByTags", "/pet/findByTags", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -362,43 +279,21 @@ public class PetApi { */ public ApiResponse getPetByIdWithHttpInfo(Long petId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -440,42 +335,17 @@ public class PetApi { * @see Update an existing pet Documentation */ public ApiResponse updatePetWithHttpInfo(Pet pet) throws ApiException { - Object localVarPostBody = pet; - - // verify the required parameter 'pet' is set + // Check required parameters if (pet == null) { throw new ApiException(400, "Missing the required parameter 'pet' when calling updatePet"); } - - // create path and map variables - String localVarPath = "/pet"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.updatePet", "/pet", "PUT", new ArrayList<>(), pet, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -510,45 +380,29 @@ public class PetApi { */ public ApiResponse updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (name != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (name != null) { localVarFormParams.put("name", name); -if (status != null) + } + if (status != null) { localVarFormParams.put("status", status); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -584,47 +438,30 @@ if (status != null) */ public ApiResponse uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}/uploadImage" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (_file != null) + } + if (_file != null) { localVarFormParams.put("file", _file); + } - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java index 612bf71da3e..94ad6912d67 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Order; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -75,42 +76,20 @@ public class StoreApi { */ public ApiResponse deleteOrderWithHttpInfo(String orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{orderId}" - .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); + .replaceAll("\\{orderId}", apiClient.escapeString(orderId)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Returns pet inventories by status @@ -139,37 +118,12 @@ public class StoreApi { */ public ApiResponse> getInventoryWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/store/inventory"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("StoreApi.getInventory", "/store/inventory", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -205,44 +159,21 @@ public class StoreApi { */ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{orderId}" - .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{orderId}", apiClient.escapeString(orderId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Place an order for a pet @@ -275,42 +206,16 @@ public class StoreApi { */ public ApiResponse placeOrderWithHttpInfo(Order order) throws ApiException { - Object localVarPostBody = order; - - // verify the required parameter 'order' is set + // Check required parameters if (order == null) { throw new ApiException(400, "Missing the required parameter 'order' when calling placeOrder"); } - - // create path and map variables - String localVarPath = "/store/order"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.placeOrder", "/store/order", "POST", new ArrayList<>(), order, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/UserApi.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/UserApi.java index ba58b97a090..291c174a161 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/UserApi.java @@ -13,6 +13,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,40 +75,16 @@ public class UserApi { */ public ApiResponse createUserWithHttpInfo(User user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUser"); } - - // create path and map variables - String localVarPath = "/user"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - - return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + String[] localVarAuthNames = new String[] {"api_key"}; + return apiClient.invokeAPI("UserApi.createUser", "/user", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -138,40 +115,16 @@ public class UserApi { */ public ApiResponse createUsersWithArrayInputWithHttpInfo(List user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithArrayInput"); } - - // create path and map variables - String localVarPath = "/user/createWithArray"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - - return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + String[] localVarAuthNames = new String[] {"api_key"}; + return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", "/user/createWithArray", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -202,40 +155,16 @@ public class UserApi { */ public ApiResponse createUsersWithListInputWithHttpInfo(List user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithListInput"); } - - // create path and map variables - String localVarPath = "/user/createWithList"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - - return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + String[] localVarAuthNames = new String[] {"api_key"}; + return apiClient.invokeAPI("UserApi.createUsersWithListInput", "/user/createWithList", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -268,41 +197,20 @@ public class UserApi { */ public ApiResponse deleteUserWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - - return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; + return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -338,44 +246,21 @@ public class UserApi { */ public ApiResponse getUserByNameWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{username}", apiClient.escapeString(username)); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs user into the system @@ -410,50 +295,26 @@ public class UserApi { */ public ApiResponse loginUserWithHttpInfo(String username, String password) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser"); } - - // verify the required parameter 'password' is set if (password == null) { throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser"); } - - // create path and map variables - String localVarPath = "/user/login"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "username", username) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password)); - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.loginUser", "/user/login", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs out current logged in user session @@ -481,35 +342,11 @@ public class UserApi { */ public ApiResponse logoutUserWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/user/logout"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - - return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; + return apiClient.invokeAPI("UserApi.logoutUser", "/user/logout", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -544,46 +381,23 @@ public class UserApi { */ public ApiResponse updateUserWithHttpInfo(String username, User user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser"); } - - // verify the required parameter 'user' is set if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling updateUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - - return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + String[] localVarAuthNames = new String[] {"api_key"}; + return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index aa6944f29d9..25eb87c05ea 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -36,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.glassfish.jersey.logging.LoggingFeature; +import java.util.AbstractMap.SimpleEntry; import java.util.logging.Level; import java.util.logging.Logger; import java.util.Collection; @@ -43,11 +44,14 @@ import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Arrays; import java.util.ArrayList; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; import java.time.OffsetDateTime; import java.net.URLEncoder; @@ -71,94 +75,93 @@ import org.openapitools.client.auth.OAuth; */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient extends JavaTimeFormatter { - protected Map defaultHeaderMap = new HashMap(); - protected Map defaultCookieMap = new HashMap(); + private static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + protected Map defaultHeaderMap = new HashMap<>(); + protected Map defaultCookieMap = new HashMap<>(); protected String basePath = "http://petstore.swagger.io:80/v2"; protected String userAgent; private static final Logger log = Logger.getLogger(ApiClient.class.getName()); - protected List servers = new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://{server}.swagger.io:{port}/v2", - "petstore server", - new HashMap() {{ - put("server", new ServerVariable( - "No description provided", - "petstore", - new HashSet( - Arrays.asList( - "petstore", - "qa-petstore", - "dev-petstore" - ) + protected List servers = new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://{server}.swagger.io:{port}/v2", + "petstore server", + Stream.>of( + new SimpleEntry<>("server", new ServerVariable( + "No description provided", + "petstore", + new LinkedHashSet<>(Arrays.asList( + "petstore", + "qa-petstore", + "dev-petstore" + )) + )), + new SimpleEntry<>("port", new ServerVariable( + "No description provided", + "80", + new LinkedHashSet<>(Arrays.asList( + "80", + "8080" + )) + )) + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + ), + new ServerConfiguration( + "https://localhost:8080/{version}", + "The local server", + Stream.>of( + new SimpleEntry<>("version", new ServerVariable( + "No description provided", + "v2", + new LinkedHashSet<>(Arrays.asList( + "v1", + "v2" + )) + )) + ).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (a, b) -> a, LinkedHashMap::new)) + ), + new ServerConfiguration( + "https://127.0.0.1/no_variable", + "The local server without variables", + new LinkedHashMap<>() ) - )); - put("port", new ServerVariable( - "No description provided", - "80", - new HashSet( - Arrays.asList( - "80", - "8080" - ) - ) - )); - }} - ), - new ServerConfiguration( - "https://localhost:8080/{version}", - "The local server", - new HashMap() {{ - put("version", new ServerVariable( - "No description provided", - "v2", - new HashSet( - Arrays.asList( - "v1", - "v2" - ) - ) - )); - }} - ), - new ServerConfiguration( - "https://127.0.0.1/no_variable", - "The local server without variables", - new HashMap() - ) )); protected Integer serverIndex = 0; protected Map serverVariables = null; - protected Map> operationServers = new HashMap>() {{ - put("PetApi.addPet", new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://petstore.swagger.io/v2", - "No description provided", - new HashMap() - ), + protected Map> operationServers; - new ServerConfiguration( - "http://path-server-test.petstore.local/v2", - "No description provided", - new HashMap() - ) + { + Map> operationServers = new HashMap<>(); + operationServers.put("PetApi.addPet", new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://petstore.swagger.io/v2", + "No description provided", + new LinkedHashMap<>() + ), + new ServerConfiguration( + "http://path-server-test.petstore.local/v2", + "No description provided", + new LinkedHashMap<>() + ) ))); - put("PetApi.updatePet", new ArrayList(Arrays.asList( - new ServerConfiguration( - "http://petstore.swagger.io/v2", - "No description provided", - new HashMap() - ), + operationServers.put("PetApi.updatePet", new ArrayList<>(Arrays.asList( + new ServerConfiguration( + "http://petstore.swagger.io/v2", + "No description provided", + new LinkedHashMap<>() + ), + new ServerConfiguration( + "http://path-server-test.petstore.local/v2", + "No description provided", + new LinkedHashMap<>() + ) + ))); + this.operationServers = operationServers; + } - new ServerConfiguration( - "http://path-server-test.petstore.local/v2", - "No description provided", - new HashMap() - ) - ))); - }}; - protected Map operationServerIndex = new HashMap(); - protected Map> operationServerVariables = new HashMap>(); + protected Map operationServerIndex = new HashMap<>(); + protected Map> operationServerVariables = new HashMap<>(); protected boolean debugging = false; protected ClientConfig clientConfig; protected int connectionTimeout = 0; @@ -195,7 +198,7 @@ public class ApiClient extends JavaTimeFormatter { setUserAgent("OpenAPI-Generator/1.0.0/java"); // Setup authentications (key: authentication name, value: authentication). - authentications = new HashMap(); + authentications = new HashMap<>(); Authentication auth = null; if (authMap != null) { auth = authMap.get("petstore_auth"); @@ -247,7 +250,7 @@ public class ApiClient extends JavaTimeFormatter { authentications = Collections.unmodifiableMap(authentications); // Setup authentication lookup (key: authentication alias, value: authentication name) - authenticationLookup = new HashMap(); + authenticationLookup = new HashMap<>(); } /** @@ -835,7 +838,7 @@ public class ApiClient extends JavaTimeFormatter { * @return List of pairs */ public List parameterToPairs(String collectionFormat, String name, Object value){ - List params = new ArrayList(); + List params = new ArrayList<>(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -894,14 +897,13 @@ public class ApiClient extends JavaTimeFormatter { * application/json; charset=UTF8 * APPLICATION/JSON * application/vnd.company+json - * "* / *" is also default to JSON + * "*{@literal /}*" is also considered JSON by this method. * * @param mime MIME * @return True if the MIME type is JSON */ public boolean isJsonMime(String mime) { - String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"; - return mime != null && (mime.matches(jsonMime) || mime.equals("*/*")); + return mime != null && (mime.equals("*/*") || JSON_MIME_PATTERN.matcher(mime).matches()); } /** @@ -913,8 +915,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Accept header to use. If the given array is empty, * null will be returned (not to set the Accept header explicitly). */ - public String selectHeaderAccept(String[] accepts) { - if (accepts.length == 0) { + public String selectHeaderAccept(String... accepts) { + if (accepts == null || accepts.length == 0) { return null; } for (String accept : accepts) { @@ -934,8 +936,8 @@ public class ApiClient extends JavaTimeFormatter { * @return The Content-Type header to use. If the given array is empty, * JSON will be used. */ - public String selectHeaderContentType(String[] contentTypes) { - if (contentTypes.length == 0) { + public String selectHeaderContentType(String... contentTypes) { + if (contentTypes == null || contentTypes.length == 0) { return "application/json"; } for (String contentType : contentTypes) { @@ -1227,15 +1229,17 @@ public class ApiClient extends JavaTimeFormatter { Map allHeaderParams = new HashMap<>(defaultHeaderMap); allHeaderParams.putAll(headerParams); - // update different parameters (e.g. headers) for authentication - updateParamsForAuth( - authNames, - queryParams, - allHeaderParams, - cookieParams, - serializeToString(body, formParams, contentType, isBodyNullable), - method, - target.getUri()); + if (authNames != null) { + // update different parameters (e.g. headers) for authentication + updateParamsForAuth( + authNames, + queryParams, + allHeaderParams, + cookieParams, + serializeToString(body, formParams, contentType, isBodyNullable), + method, + target.getUri()); + } for (Entry entry : allHeaderParams.entrySet()) { String value = entry.getValue(); @@ -1252,7 +1256,7 @@ public class ApiClient extends JavaTimeFormatter { final int statusCode = response.getStatusInfo().getStatusCode(); // If OAuth is used and a status 401 is received, renew the access token and retry the request - if (statusCode == Status.UNAUTHORIZED.getStatusCode()) { + if (authNames != null && statusCode == Status.UNAUTHORIZED.getStatusCode()) { for (String authName : authNames) { Authentication authentication = authentications.get(authName); if (authentication instanceof OAuth) { @@ -1423,10 +1427,10 @@ public class ApiClient extends JavaTimeFormatter { * @return a {@link java.util.Map} of response headers. */ protected Map> buildResponseHeaders(Response response) { - Map> responseHeaders = new HashMap>(); + Map> responseHeaders = new HashMap<>(); for (Entry> entry: response.getHeaders().entrySet()) { List values = entry.getValue(); - List headers = new ArrayList(); + List headers = new ArrayList<>(); for (Object o : values) { headers.add(String.valueOf(o)); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java index 24317dfe36a..8e72ba03553 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java @@ -64,7 +64,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -84,7 +84,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -193,12 +193,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap<>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 0a0eb17b606..493d0d99a0f 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,42 +75,16 @@ public class AnotherFakeApi { */ public ApiResponse call123testSpecialTagsWithHttpInfo(Client client) throws ApiException { - Object localVarPostBody = client; - - // verify the required parameter 'client' is set + // Check required parameters if (client == null) { throw new ApiException(400, "Missing the required parameter 'client' when calling call123testSpecialTags"); } - - // create path and map variables - String localVarPath = "/another-fake/dummy"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", "/another-fake/dummy", "PATCH", new ArrayList<>(), client, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java index 9088aa8da1f..03f7f512dbd 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.FooGetDefaultResponse; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -72,37 +73,11 @@ public class DefaultApi { */ public ApiResponse fooGetWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/foo"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("DefaultApi.fooGet", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("DefaultApi.fooGet", "/foo", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index 5b555dab325..a925510e6e3 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -21,6 +21,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -81,38 +82,12 @@ public class FakeApi { */ public ApiResponse fakeHealthGetWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/fake/health"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeHealthGet", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeHealthGet", "/fake/health", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -143,38 +118,12 @@ public class FakeApi { */ public ApiResponse fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/boolean"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", "/fake/outer/boolean", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -205,38 +154,12 @@ public class FakeApi { */ public ApiResponse fakeOuterCompositeSerializeWithHttpInfo(OuterComposite outerComposite) throws ApiException { - Object localVarPostBody = outerComposite; - - // create path and map variables - String localVarPath = "/fake/outer/composite"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", "/fake/outer/composite", "POST", new ArrayList<>(), outerComposite, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -267,38 +190,12 @@ public class FakeApi { */ public ApiResponse fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/number"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", "/fake/outer/number", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -329,38 +226,12 @@ public class FakeApi { */ public ApiResponse fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { - Object localVarPostBody = body; - - // create path and map variables - String localVarPath = "/fake/outer/string"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "*/*" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("*/*"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", "/fake/outer/string", "POST", new ArrayList<>(), body, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Array of Enums @@ -389,38 +260,12 @@ public class FakeApi { */ public ApiResponse> getArrayOfEnumsWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/fake/array-of-enums"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("FakeApi.getArrayOfEnums", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.getArrayOfEnums", "/fake/array-of-enums", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * @@ -450,41 +295,16 @@ public class FakeApi { */ public ApiResponse testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass fileSchemaTestClass) throws ApiException { - Object localVarPostBody = fileSchemaTestClass; - - // verify the required parameter 'fileSchemaTestClass' is set + // Check required parameters if (fileSchemaTestClass == null) { throw new ApiException(400, "Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema"); } - - // create path and map variables - String localVarPath = "/fake/body-with-file-schema"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", "/fake/body-with-file-schema", "PUT", new ArrayList<>(), fileSchemaTestClass, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * @@ -516,47 +336,24 @@ public class FakeApi { */ public ApiResponse testBodyWithQueryParamsWithHttpInfo(String query, User user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'query' is set + // Check required parameters if (query == null) { throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams"); } - - // verify the required parameter 'user' is set if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling testBodyWithQueryParams"); } - - // create path and map variables - String localVarPath = "/fake/body-with-query-params"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "query", query) + ); - localVarQueryParams.addAll(apiClient.parameterToPairs("", "query", query)); - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", "/fake/body-with-query-params", "PUT", localVarQueryParams, user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * To test \"client\" model @@ -587,43 +384,17 @@ public class FakeApi { */ public ApiResponse testClientModelWithHttpInfo(Client client) throws ApiException { - Object localVarPostBody = client; - - // verify the required parameter 'client' is set + // Check required parameters if (client == null) { throw new ApiException(400, "Missing the required parameter 'client' when calling testClientModel"); } - - // create path and map variables - String localVarPath = "/fake"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeApi.testClientModel", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("FakeApi.testClientModel", "/fake", "PATCH", new ArrayList<>(), client, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -681,83 +452,62 @@ public class FakeApi { */ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'number' is set + // Check required parameters if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); } - - // verify the required parameter '_double' is set if (_double == null) { throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters"); } - - // verify the required parameter 'patternWithoutDelimiter' is set if (patternWithoutDelimiter == null) { throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters"); } - - // verify the required parameter '_byte' is set if (_byte == null) { throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters"); } - - // create path and map variables - String localVarPath = "/fake"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (integer != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (integer != null) { localVarFormParams.put("integer", integer); -if (int32 != null) + } + if (int32 != null) { localVarFormParams.put("int32", int32); -if (int64 != null) + } + if (int64 != null) { localVarFormParams.put("int64", int64); -if (number != null) - localVarFormParams.put("number", number); -if (_float != null) + } + localVarFormParams.put("number", number); + if (_float != null) { localVarFormParams.put("float", _float); -if (_double != null) - localVarFormParams.put("double", _double); -if (string != null) + } + localVarFormParams.put("double", _double); + if (string != null) { localVarFormParams.put("string", string); -if (patternWithoutDelimiter != null) - localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); -if (_byte != null) - localVarFormParams.put("byte", _byte); -if (binary != null) + } + localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); + localVarFormParams.put("byte", _byte); + if (binary != null) { localVarFormParams.put("binary", binary); -if (date != null) + } + if (date != null) { localVarFormParams.put("date", date); -if (dateTime != null) + } + if (dateTime != null) { localVarFormParams.put("dateTime", dateTime); -if (password != null) + } + if (password != null) { localVarFormParams.put("password", password); -if (paramCallback != null) + } + if (paramCallback != null) { localVarFormParams.put("callback", paramCallback); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "http_basic_test" }; - - return apiClient.invokeAPI("FakeApi.testEndpointParameters", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"http_basic_test"}; + return apiClient.invokeAPI("FakeApi.testEndpointParameters", "/fake", "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -804,103 +554,71 @@ if (paramCallback != null) */ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/fake"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_string", enumQueryString)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_integer", enumQueryInteger)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_double", enumQueryDouble)); - if (enumHeaderStringArray != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (enumHeaderStringArray != null) { localVarHeaderParams.put("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); -if (enumHeaderString != null) + } + if (enumHeaderString != null) { localVarHeaderParams.put("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } - - if (enumFormStringArray != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (enumFormStringArray != null) { localVarFormParams.put("enum_form_string_array", enumFormStringArray); -if (enumFormString != null) + } + if (enumFormString != null) { localVarFormParams.put("enum_form_string", enumFormString); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testEnumParameters", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + return apiClient.invokeAPI("FakeApi.testEnumParameters", "/fake", "GET", localVarQueryParams, null, + localVarHeaderParams, new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, + null, null, false); } private ApiResponse testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'requiredStringGroup' is set + // Check required parameters if (requiredStringGroup == null) { throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters"); } - - // verify the required parameter 'requiredBooleanGroup' is set if (requiredBooleanGroup == null) { throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters"); } - - // verify the required parameter 'requiredInt64Group' is set if (requiredInt64Group == null) { throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters"); } - - // create path and map variables - String localVarPath = "/fake"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_string_group", requiredStringGroup)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "required_string_group", requiredStringGroup) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_int64_group", requiredInt64Group)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "string_group", stringGroup)); localVarQueryParams.addAll(apiClient.parameterToPairs("", "int64_group", int64Group)); - if (requiredBooleanGroup != null) - localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); -if (booleanGroup != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); + if (booleanGroup != null) { localVarHeaderParams.put("boolean_group", apiClient.parameterToString(booleanGroup)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "bearer_test" }; - - return apiClient.invokeAPI("FakeApi.testGroupParameters", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"bearer_test"}; + return apiClient.invokeAPI("FakeApi.testGroupParameters", "/fake", "DELETE", localVarQueryParams, null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } @@ -1046,41 +764,16 @@ if (booleanGroup != null) */ public ApiResponse testInlineAdditionalPropertiesWithHttpInfo(Map requestBody) throws ApiException { - Object localVarPostBody = requestBody; - - // verify the required parameter 'requestBody' is set + // Check required parameters if (requestBody == null) { throw new ApiException(400, "Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties"); } - - // create path and map variables - String localVarPath = "/fake/inline-additionalProperties"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", "/fake/inline-additionalProperties", "POST", new ArrayList<>(), requestBody, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * test json serialization of form data @@ -1112,50 +805,24 @@ if (booleanGroup != null) */ public ApiResponse testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'param' is set + // Check required parameters if (param == null) { throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData"); } - - // verify the required parameter 'param2' is set if (param2 == null) { throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData"); } - - // create path and map variables - String localVarPath = "/fake/jsonFormData"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + localVarFormParams.put("param", param); + localVarFormParams.put("param2", param2); - - - - if (param != null) - localVarFormParams.put("param", param); -if (param2 != null) - localVarFormParams.put("param2", param2); - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testJsonFormData", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + return apiClient.invokeAPI("FakeApi.testJsonFormData", "/fake/jsonFormData", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, + null, null, false); } /** * @@ -1193,65 +860,36 @@ if (param2 != null) */ public ApiResponse testQueryParameterCollectionFormatWithHttpInfo(List pipe, List ioutil, List http, List url, List context) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'pipe' is set + // Check required parameters if (pipe == null) { throw new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'ioutil' is set if (ioutil == null) { throw new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'http' is set if (http == null) { throw new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'url' is set if (url == null) { throw new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat"); } - - // verify the required parameter 'context' is set if (context == null) { throw new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat"); } - - // create path and map variables - String localVarPath = "/fake/test-query-parameters"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "pipe", pipe)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("multi", "pipe", pipe) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "ioutil", ioutil)); localVarQueryParams.addAll(apiClient.parameterToPairs("ssv", "http", http)); localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "url", url)); localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "context", context)); - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", "/fake/test-query-parameters", "PUT", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 7dabf14a620..2c736ab8f8f 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,42 +75,17 @@ public class FakeClassnameTags123Api { */ public ApiResponse testClassnameWithHttpInfo(Client client) throws ApiException { - Object localVarPostBody = client; - - // verify the required parameter 'client' is set + // Check required parameters if (client == null) { throw new ApiException(400, "Missing the required parameter 'client' when calling testClassname"); } - - // create path and map variables - String localVarPath = "/fake_classname_test"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key_query" }; + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + String[] localVarAuthNames = new String[] {"api_key_query"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", "/fake_classname_test", "PATCH", new ArrayList<>(), client, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index f985d589a3f..77301195e02 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -14,6 +14,7 @@ import org.openapitools.client.model.Pet; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -75,40 +76,16 @@ public class PetApi { */ public ApiResponse addPetWithHttpInfo(Pet pet) throws ApiException { - Object localVarPostBody = pet; - - // verify the required parameter 'pet' is set + // Check required parameters if (pet == null) { throw new ApiException(400, "Missing the required parameter 'pet' when calling addPet"); } - - // create path and map variables - String localVarPath = "/pet"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth", "http_signature_test" }; - - return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth", "http_signature_test"}; + return apiClient.invokeAPI("PetApi.addPet", "/pet", "POST", new ArrayList<>(), pet, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -141,43 +118,26 @@ public class PetApi { */ public ApiResponse deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - if (apiKey != null) + // Header parameters + Map localVarHeaderParams = new LinkedHashMap<>(); + if (apiKey != null) { localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey)); + } - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", new ArrayList<>(), null, + localVarHeaderParams, new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -211,43 +171,22 @@ public class PetApi { */ public ApiResponse> findPetsByStatusWithHttpInfo(List status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'status' is set + // Check required parameters if (status == null) { throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus"); } - - // create path and map variables - String localVarPath = "/pet/findByStatus"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth", "http_signature_test" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "status", status) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth", "http_signature_test"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByStatus", "/pet/findByStatus", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -285,43 +224,22 @@ public class PetApi { */ @Deprecated public ApiResponse> findPetsByTagsWithHttpInfo(List tags) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'tags' is set + // Check required parameters if (tags == null) { throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags"); } - - // create path and map variables - String localVarPath = "/pet/findByTags"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags)); - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth", "http_signature_test" }; + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("csv", "tags", tags) + ); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"petstore_auth", "http_signature_test"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.findPetsByTags", "/pet/findByTags", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -357,43 +275,21 @@ public class PetApi { */ public ApiResponse getPetByIdWithHttpInfo(Long petId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -428,40 +324,16 @@ public class PetApi { */ public ApiResponse updatePetWithHttpInfo(Pet pet) throws ApiException { - Object localVarPostBody = pet; - - // verify the required parameter 'pet' is set + // Check required parameters if (pet == null) { throw new ApiException(400, "Missing the required parameter 'pet' when calling updatePet"); } - - // create path and map variables - String localVarPath = "/pet"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json", "application/xml" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth", "http_signature_test" }; - - return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json", "application/xml"); + String[] localVarAuthNames = new String[] {"petstore_auth", "http_signature_test"}; + return apiClient.invokeAPI("PetApi.updatePet", "/pet", "PUT", new ArrayList<>(), pet, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -496,45 +368,29 @@ public class PetApi { */ public ApiResponse updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (name != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (name != null) { localVarFormParams.put("name", name); -if (status != null) + } + if (status != null) { localVarFormParams.put("status", status); + } - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/x-www-form-urlencoded" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - - return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/x-www-form-urlencoded"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; + return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null, false); } /** @@ -570,47 +426,30 @@ if (status != null) */ public ApiResponse uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/pet/{petId}/uploadImage" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (_file != null) + } + if (_file != null) { localVarFormParams.put("file", _file); + } - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -646,52 +485,31 @@ if (_file != null) */ public ApiResponse uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'petId' is set + // Check required parameters if (petId == null) { throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile"); } - - // verify the required parameter 'requiredFile' is set if (requiredFile == null) { throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile"); } - - // create path and map variables + + // Path parameters String localVarPath = "/fake/{petId}/uploadImageWithRequiredFile" - .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); + .replaceAll("\\{petId}", apiClient.escapeString(petId.toString())); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - if (additionalMetadata != null) + // Form parameters + Map localVarFormParams = new LinkedHashMap<>(); + if (additionalMetadata != null) { localVarFormParams.put("additionalMetadata", additionalMetadata); -if (requiredFile != null) - localVarFormParams.put("requiredFile", requiredFile); - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "multipart/form-data" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "petstore_auth" }; + } + localVarFormParams.put("requiredFile", requiredFile); + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType("multipart/form-data"); + String[] localVarAuthNames = new String[] {"petstore_auth"}; GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java index ae83b818043..2e85d6953a5 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java @@ -12,6 +12,7 @@ import org.openapitools.client.model.Order; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -75,42 +76,20 @@ public class StoreApi { */ public ApiResponse deleteOrderWithHttpInfo(String orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{order_id}" - .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString())); + .replaceAll("\\{order_id}", apiClient.escapeString(orderId)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Returns pet inventories by status @@ -139,37 +118,12 @@ public class StoreApi { */ public ApiResponse> getInventoryWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/store/inventory"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { "api_key" }; - + String localVarAccept = apiClient.selectHeaderAccept("application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); + String[] localVarAuthNames = new String[] {"api_key"}; GenericType> localVarReturnType = new GenericType>() {}; - - return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, + return apiClient.invokeAPI("StoreApi.getInventory", "/store/inventory", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType, false); } /** @@ -205,44 +159,21 @@ public class StoreApi { */ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'orderId' is set + // Check required parameters if (orderId == null) { throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById"); } - - // create path and map variables + + // Path parameters String localVarPath = "/store/order/{order_id}" - .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{order_id}", apiClient.escapeString(orderId.toString())); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Place an order for a pet @@ -275,42 +206,16 @@ public class StoreApi { */ public ApiResponse placeOrderWithHttpInfo(Order order) throws ApiException { - Object localVarPostBody = order; - - // verify the required parameter 'order' is set + // Check required parameters if (order == null) { throw new ApiException(400, "Missing the required parameter 'order' when calling placeOrder"); } - - // create path and map variables - String localVarPath = "/store/order"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("StoreApi.placeOrder", "/store/order", "POST", new ArrayList<>(), order, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java index 769693bc7e4..ed938d93187 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java @@ -13,6 +13,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -74,41 +75,16 @@ public class UserApi { */ public ApiResponse createUserWithHttpInfo(User user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUser"); } - - // create path and map variables - String localVarPath = "/user"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("UserApi.createUser", "/user", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Creates list of users with given input array @@ -138,41 +114,16 @@ public class UserApi { */ public ApiResponse createUsersWithArrayInputWithHttpInfo(List user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithArrayInput"); } - - // create path and map variables - String localVarPath = "/user/createWithArray"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", "/user/createWithArray", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Creates list of users with given input array @@ -202,41 +153,16 @@ public class UserApi { */ public ApiResponse createUsersWithListInputWithHttpInfo(List user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'user' is set + // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithListInput"); } - - // create path and map variables - String localVarPath = "/user/createWithList"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("UserApi.createUsersWithListInput", "/user/createWithList", "POST", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Delete user @@ -268,42 +194,20 @@ public class UserApi { */ public ApiResponse deleteUserWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Get user by user name @@ -338,44 +242,21 @@ public class UserApi { */ public ApiResponse getUserByNameWithHttpInfo(String username) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; + .replaceAll("\\{username}", apiClient.escapeString(username)); + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs user into the system @@ -410,50 +291,26 @@ public class UserApi { */ public ApiResponse loginUserWithHttpInfo(String username, String password) throws ApiException { - Object localVarPostBody = null; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser"); } - - // verify the required parameter 'password' is set if (password == null) { throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser"); } - - // create path and map variables - String localVarPath = "/user/login"; - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username)); + // Query parameters + List localVarQueryParams = new ArrayList<>( + apiClient.parameterToPairs("", "username", username) + ); localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password)); - - - - final String[] localVarAccepts = { - "application/xml", "application/json" - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - + String localVarAccept = apiClient.selectHeaderAccept("application/xml", "application/json"); + String localVarContentType = apiClient.selectHeaderContentType(); GenericType localVarReturnType = new GenericType() {}; - - return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, localVarReturnType, false); + return apiClient.invokeAPI("UserApi.loginUser", "/user/login", "GET", localVarQueryParams, null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, localVarReturnType, false); } /** * Logs out current logged in user session @@ -481,36 +338,11 @@ public class UserApi { */ public ApiResponse logoutUserWithHttpInfo() throws ApiException { - Object localVarPostBody = null; - - // create path and map variables - String localVarPath = "/user/logout"; - - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType(); + return apiClient.invokeAPI("UserApi.logoutUser", "/user/logout", "GET", new ArrayList<>(), null, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } /** * Updated user @@ -544,46 +376,22 @@ public class UserApi { */ public ApiResponse updateUserWithHttpInfo(String username, User user) throws ApiException { - Object localVarPostBody = user; - - // verify the required parameter 'username' is set + // Check required parameters if (username == null) { throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser"); } - - // verify the required parameter 'user' is set if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling updateUser"); } - - // create path and map variables + + // Path parameters String localVarPath = "/user/{username}" - .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); + .replaceAll("\\{username}", apiClient.escapeString(username)); - // query params - List localVarQueryParams = new ArrayList(); - Map localVarHeaderParams = new HashMap(); - Map localVarCookieParams = new HashMap(); - Map localVarFormParams = new HashMap(); - - - - - - final String[] localVarAccepts = { - - }; - final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); - - final String[] localVarContentTypes = { - "application/json" - }; - final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); - - String[] localVarAuthNames = new String[] { }; - - return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody, - localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, - localVarAuthNames, null, false); + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", new ArrayList<>(), user, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java index 9e376a44729..3aa72ab1112 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java @@ -151,13 +151,13 @@ public class Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("Cat", Cat.class); - mappings.put("Dog", Dog.class); - mappings.put("Animal", Animal.class); - JSON.registerDiscriminator(Animal.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("Cat", Cat.class); + mappings.put("Dog", Dog.class); + mappings.put("Animal", Animal.class); + JSON.registerDiscriminator(Animal.class, "className", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java index 12b32a246fd..60b84c4da78 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java @@ -92,7 +92,7 @@ public class Cat extends Animal { @JsonAnySetter public Cat putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -160,11 +160,11 @@ public class Cat extends Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("Cat", Cat.class); - JSON.registerDiscriminator(Cat.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("Cat", Cat.class); + JSON.registerDiscriminator(Cat.class, "className", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java index 3ac6ccd656d..e6d126868a3 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java @@ -135,7 +135,7 @@ public class ChildCat extends ParentPet { @JsonAnySetter public ChildCat putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -205,11 +205,11 @@ public class ChildCat extends ParentPet { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("ChildCat", ChildCat.class); - JSON.registerDiscriminator(ChildCat.class, "pet_type", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("ChildCat", ChildCat.class); + JSON.registerDiscriminator(ChildCat.class, "pet_type", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java index 8541cb00ed1..06456f92460 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java @@ -111,7 +111,7 @@ public class ComplexQuadrilateral { @JsonAnySetter public ComplexQuadrilateral putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java index f0ad8bc6a8c..20b066546d1 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java @@ -92,7 +92,7 @@ public class Dog extends Animal { @JsonAnySetter public Dog putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -160,11 +160,11 @@ public class Dog extends Animal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("Dog", Dog.class); - JSON.registerDiscriminator(Dog.class, "className", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("Dog", Dog.class); + JSON.registerDiscriminator(Dog.class, "className", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java index f344f11ad05..5f83993ee24 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java @@ -195,7 +195,7 @@ public class Drawing { @JsonAnySetter public Drawing putAdditionalProperty(String key, Fruit value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java index 7dd69787f4f..28229b549b8 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java @@ -111,7 +111,7 @@ public class EquilateralTriangle { @JsonAnySetter public EquilateralTriangle putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java index 6a129ce7dd5..0d6ac3ccd9c 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java @@ -162,7 +162,7 @@ public class Fruit extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Fruit() { super("oneOf", Boolean.FALSE); @@ -201,12 +201,12 @@ public class Fruit extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(Apple.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Apple.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Banana.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Banana.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java index 72da8edfb43..4f555519330 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java @@ -164,7 +164,7 @@ public class FruitReq extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public FruitReq() { super("oneOf", Boolean.TRUE); @@ -208,12 +208,12 @@ public class FruitReq extends AbstractOpenApiSchema { return; } - if (JSON.isInstanceOf(AppleReq.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(AppleReq.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(BananaReq.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(BananaReq.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java index 2dc45f2acae..3ddffddec45 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java @@ -122,7 +122,7 @@ public class GmFruit extends AbstractOpenApiSchema { } // store a list of schema names defined in anyOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public GmFruit() { super("anyOf", Boolean.FALSE); @@ -161,12 +161,12 @@ public class GmFruit extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(Apple.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Apple.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Banana.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Banana.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index b5b983bf448..240416e4b9e 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -120,13 +120,13 @@ public class GrandparentAnimal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("ChildCat", ChildCat.class); - mappings.put("ParentPet", ParentPet.class); - mappings.put("GrandparentAnimal", GrandparentAnimal.class); - JSON.registerDiscriminator(GrandparentAnimal.class, "pet_type", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("ChildCat", ChildCat.class); + mappings.put("ParentPet", ParentPet.class); + mappings.put("GrandparentAnimal", GrandparentAnimal.class); + JSON.registerDiscriminator(GrandparentAnimal.class, "pet_type", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java index 4eaf73a35a7..752f009935d 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java @@ -97,7 +97,7 @@ public class Mammal extends AbstractOpenApiSchema { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; Mammal newMammal = new Mammal(); - Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); + Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String)result2.get("className"); switch (discriminatorValue) { case "Pig": @@ -215,7 +215,7 @@ public class Mammal extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Mammal() { super("oneOf", Boolean.FALSE); @@ -234,7 +234,7 @@ public class Mammal extends AbstractOpenApiSchema { @JsonAnySetter public Mammal putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -294,7 +294,7 @@ public class Mammal extends AbstractOpenApiSchema { }); JSON.registerDescendants(Mammal.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("Pig", Pig.class); mappings.put("whale", Whale.class); mappings.put("zebra", Zebra.class); @@ -317,17 +317,17 @@ public class Mammal extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(Pig.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Pig.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Whale.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Whale.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Zebra.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Zebra.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java index 7415b8ed01f..2c8274ecaca 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java @@ -556,7 +556,7 @@ public class NullableClass { @JsonAnySetter public NullableClass putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java index c2124244758..c6a8d3c70d8 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java @@ -96,7 +96,7 @@ public class NullableShape extends AbstractOpenApiSchema { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; NullableShape newNullableShape = new NullableShape(); - Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); + Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String)result2.get("shapeType"); switch (discriminatorValue) { case "Quadrilateral": @@ -186,7 +186,7 @@ public class NullableShape extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public NullableShape() { super("oneOf", Boolean.TRUE); @@ -205,7 +205,7 @@ public class NullableShape extends AbstractOpenApiSchema { @JsonAnySetter public NullableShape putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -258,7 +258,7 @@ public class NullableShape extends AbstractOpenApiSchema { }); JSON.registerDescendants(NullableShape.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("Quadrilateral", Quadrilateral.class); mappings.put("Triangle", Triangle.class); mappings.put("NullableShape", NullableShape.class); @@ -285,12 +285,12 @@ public class NullableShape extends AbstractOpenApiSchema { return; } - if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Triangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java index 1dcdfb52d1e..9aad3fd3d86 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java @@ -67,7 +67,7 @@ public class ParentPet extends GrandparentAnimal { @JsonAnySetter public ParentPet putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -131,12 +131,12 @@ public class ParentPet extends GrandparentAnimal { return o.toString().replace("\n", "\n "); } -static { - // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); - mappings.put("ChildCat", ChildCat.class); - mappings.put("ParentPet", ParentPet.class); - JSON.registerDiscriminator(ParentPet.class, "pet_type", mappings); -} + static { + // Initialize and register the discriminator mappings. + Map> mappings = new HashMap<>(); + mappings.put("ChildCat", ChildCat.class); + mappings.put("ParentPet", ParentPet.class); + JSON.registerDiscriminator(ParentPet.class, "pet_type", mappings); + } } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java index e75900b1bcf..d93d4be006f 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java @@ -96,7 +96,7 @@ public class Pig extends AbstractOpenApiSchema { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; Pig newPig = new Pig(); - Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); + Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String)result2.get("className"); switch (discriminatorValue) { case "BasquePig": @@ -184,7 +184,7 @@ public class Pig extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Pig() { super("oneOf", Boolean.FALSE); @@ -203,7 +203,7 @@ public class Pig extends AbstractOpenApiSchema { @JsonAnySetter public Pig putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -256,7 +256,7 @@ public class Pig extends AbstractOpenApiSchema { }); JSON.registerDescendants(Pig.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("BasquePig", BasquePig.class); mappings.put("DanishPig", DanishPig.class); mappings.put("Pig", Pig.class); @@ -278,12 +278,12 @@ public class Pig extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(BasquePig.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(BasquePig.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(DanishPig.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(DanishPig.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java index 7f1a2f87366..3e5e890dc23 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -96,7 +96,7 @@ public class Quadrilateral extends AbstractOpenApiSchema { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; Quadrilateral newQuadrilateral = new Quadrilateral(); - Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); + Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String)result2.get("quadrilateralType"); switch (discriminatorValue) { case "ComplexQuadrilateral": @@ -184,7 +184,7 @@ public class Quadrilateral extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Quadrilateral() { super("oneOf", Boolean.FALSE); @@ -203,7 +203,7 @@ public class Quadrilateral extends AbstractOpenApiSchema { @JsonAnySetter public Quadrilateral putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -256,7 +256,7 @@ public class Quadrilateral extends AbstractOpenApiSchema { }); JSON.registerDescendants(Quadrilateral.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("ComplexQuadrilateral", ComplexQuadrilateral.class); mappings.put("SimpleQuadrilateral", SimpleQuadrilateral.class); mappings.put("Quadrilateral", Quadrilateral.class); @@ -278,12 +278,12 @@ public class Quadrilateral extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(ComplexQuadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(ComplexQuadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(SimpleQuadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(SimpleQuadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java index 65e9c9c120b..5aecc750295 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java @@ -111,7 +111,7 @@ public class ScaleneTriangle { @JsonAnySetter public ScaleneTriangle putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java index 6a4229f69fa..c685a630de6 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java @@ -96,7 +96,7 @@ public class Shape extends AbstractOpenApiSchema { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; Shape newShape = new Shape(); - Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); + Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String)result2.get("shapeType"); switch (discriminatorValue) { case "Quadrilateral": @@ -184,7 +184,7 @@ public class Shape extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Shape() { super("oneOf", Boolean.FALSE); @@ -203,7 +203,7 @@ public class Shape extends AbstractOpenApiSchema { @JsonAnySetter public Shape putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -256,7 +256,7 @@ public class Shape extends AbstractOpenApiSchema { }); JSON.registerDescendants(Shape.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("Quadrilateral", Quadrilateral.class); mappings.put("Triangle", Triangle.class); mappings.put("Shape", Shape.class); @@ -278,12 +278,12 @@ public class Shape extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Triangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 9e993d94de2..e7058ad5a04 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -96,7 +96,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; ShapeOrNull newShapeOrNull = new ShapeOrNull(); - Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); + Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String)result2.get("shapeType"); switch (discriminatorValue) { case "Quadrilateral": @@ -186,7 +186,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public ShapeOrNull() { super("oneOf", Boolean.TRUE); @@ -205,7 +205,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema { @JsonAnySetter public ShapeOrNull putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -258,7 +258,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema { }); JSON.registerDescendants(ShapeOrNull.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("Quadrilateral", Quadrilateral.class); mappings.put("Triangle", Triangle.class); mappings.put("ShapeOrNull", ShapeOrNull.class); @@ -285,12 +285,12 @@ public class ShapeOrNull extends AbstractOpenApiSchema { return; } - if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Quadrilateral.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(Triangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(Triangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java index ebe8b033d8c..db08e735e6a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java @@ -111,7 +111,7 @@ public class SimpleQuadrilateral { @JsonAnySetter public SimpleQuadrilateral putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java index c4c5687cf01..08e069cde17 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java @@ -97,7 +97,7 @@ public class Triangle extends AbstractOpenApiSchema { JsonNode tree = jp.readValueAsTree(); Object deserialized = null; Triangle newTriangle = new Triangle(); - Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); + Map result2 = tree.traverse(jp.getCodec()).readValueAs(new TypeReference>() {}); String discriminatorValue = (String)result2.get("triangleType"); switch (discriminatorValue) { case "EquilateralTriangle": @@ -215,7 +215,7 @@ public class Triangle extends AbstractOpenApiSchema { } // store a list of schema names defined in oneOf - public static final Map schemas = new HashMap(); + public static final Map schemas = new HashMap<>(); public Triangle() { super("oneOf", Boolean.FALSE); @@ -234,7 +234,7 @@ public class Triangle extends AbstractOpenApiSchema { @JsonAnySetter public Triangle putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; @@ -294,7 +294,7 @@ public class Triangle extends AbstractOpenApiSchema { }); JSON.registerDescendants(Triangle.class, Collections.unmodifiableMap(schemas)); // Initialize and register the discriminator mappings. - Map> mappings = new HashMap>(); + Map> mappings = new HashMap<>(); mappings.put("EquilateralTriangle", EquilateralTriangle.class); mappings.put("IsoscelesTriangle", IsoscelesTriangle.class); mappings.put("ScaleneTriangle", ScaleneTriangle.class); @@ -317,17 +317,17 @@ public class Triangle extends AbstractOpenApiSchema { */ @Override public void setActualInstance(Object instance) { - if (JSON.isInstanceOf(EquilateralTriangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(EquilateralTriangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(IsoscelesTriangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(IsoscelesTriangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } - if (JSON.isInstanceOf(ScaleneTriangle.class, instance, new HashSet>())) { + if (JSON.isInstanceOf(ScaleneTriangle.class, instance, new HashSet<>())) { super.setActualInstance(instance); return; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java index 28287ba639c..0f10ff57b24 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java @@ -149,7 +149,7 @@ public class Zebra { @JsonAnySetter public Zebra putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + this.additionalProperties = new HashMap<>(); } this.additionalProperties.put(key, value); return this; From f45523dd1a6c4c02d1745c13104beadfa103fa26 Mon Sep 17 00:00:00 2001 From: Jonas Reichert <75073818+Jonas1893@users.noreply.github.com> Date: Mon, 13 Mar 2023 10:42:24 +0100 Subject: [PATCH 029/131] [swift5] fix modelNamePrefix and -suffix for reserved types (#14768) * only add suffix or prefix if type is not a primitive or from dependency * add tests * add sample * add second API with prefix and suffix * add primitives * add missing pom * add missing shell script * fix cycle dependency * generate samples --- bin/configs/swift5-any-codable.yaml | 10 + docs/generators/swift5.md | 1 + .../languages/Swift5ClientCodegen.java | 11 +- .../swift5/Swift5ClientCodegenTest.java | 36 + .../src/test/resources/3_0/any_codable.yaml | 45 ++ .../petstore/swift5/anycodable/.gitignore | 105 +++ .../anycodable/.openapi-generator-ignore | 23 + .../anycodable/.openapi-generator/FILES | 24 + .../anycodable/.openapi-generator/VERSION | 1 + .../petstore/swift5/anycodable/.swiftformat | 45 ++ .../petstore/swift5/anycodable/Cartfile | 1 + .../swift5/anycodable/OpenAPIClient.podspec | 15 + .../petstore/swift5/anycodable/Package.swift | 33 + .../swift5/anycodable/PetstoreClient.podspec | 15 + .../Classes/OpenAPIs/APIHelper.swift | 119 ++++ .../Classes/OpenAPIs/APIs.swift | 75 ++ .../Classes/OpenAPIs/APIs/PetsAPI.swift | 99 +++ .../Classes/OpenAPIs/CodableHelper.swift | 49 ++ .../Classes/OpenAPIs/Configuration.swift | 19 + .../Classes/OpenAPIs/Extensions.swift | 230 +++++++ .../Classes/OpenAPIs/JSONDataEncoding.swift | 53 ++ .../Classes/OpenAPIs/JSONEncodingHelper.swift | 45 ++ .../Classes/OpenAPIs/Models.swift | 126 ++++ .../OpenAPIs/Models/PrefixPetSuffix.swift | 32 + .../OpenAPIs/OpenISO8601DateFormatter.swift | 56 ++ .../OpenAPIs/SynchronizedDictionary.swift | 36 + .../OpenAPIs/URLSessionImplementations.swift | 641 ++++++++++++++++++ .../Classes/OpenAPIs/Validation.swift | 126 ++++ .../petstore/swift5/anycodable/README.md | 45 ++ .../swift5/anycodable/docs/PetsAPI.md | 101 +++ .../swift5/anycodable/docs/PrefixPetSuffix.md | 10 + .../petstore/swift5/anycodable/git_push.sh | 57 ++ .../client/petstore/swift5/anycodable/pom.xml | 43 ++ .../petstore/swift5/anycodable/project.yml | 15 + .../swift5/anycodable/run_spmbuild.sh | 3 + .../default/docs/AdditionalPropertiesClass.md | 6 +- .../client/petstore/swift5/swift5_test_all.sh | 1 + .../docs/AdditionalPropertiesClass.md | 6 +- 38 files changed, 2349 insertions(+), 9 deletions(-) create mode 100644 bin/configs/swift5-any-codable.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/any_codable.yaml create mode 100644 samples/client/petstore/swift5/anycodable/.gitignore create mode 100644 samples/client/petstore/swift5/anycodable/.openapi-generator-ignore create mode 100644 samples/client/petstore/swift5/anycodable/.openapi-generator/FILES create mode 100644 samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION create mode 100644 samples/client/petstore/swift5/anycodable/.swiftformat create mode 100644 samples/client/petstore/swift5/anycodable/Cartfile create mode 100644 samples/client/petstore/swift5/anycodable/OpenAPIClient.podspec create mode 100644 samples/client/petstore/swift5/anycodable/Package.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient.podspec create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Configuration.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Extensions.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift create mode 100644 samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Validation.swift create mode 100644 samples/client/petstore/swift5/anycodable/README.md create mode 100644 samples/client/petstore/swift5/anycodable/docs/PetsAPI.md create mode 100644 samples/client/petstore/swift5/anycodable/docs/PrefixPetSuffix.md create mode 100644 samples/client/petstore/swift5/anycodable/git_push.sh create mode 100644 samples/client/petstore/swift5/anycodable/pom.xml create mode 100644 samples/client/petstore/swift5/anycodable/project.yml create mode 100755 samples/client/petstore/swift5/anycodable/run_spmbuild.sh diff --git a/bin/configs/swift5-any-codable.yaml b/bin/configs/swift5-any-codable.yaml new file mode 100644 index 00000000000..62031951b9e --- /dev/null +++ b/bin/configs/swift5-any-codable.yaml @@ -0,0 +1,10 @@ +generatorName: swift5 +outputDir: samples/client/petstore/swift5/anycodable +inputSpec: modules/openapi-generator/src/test/resources/3_0/any_codable.yaml +modelNamePrefix: Prefix +modelNameSuffix: Suffix +additionalProperties: + podAuthors: "" + podSummary: PetstoreClient + projectName: PetstoreClient + podHomepage: https://github.com/openapitools/openapi-generator \ No newline at end of file diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md index 72887e3b55f..474ff6b0629 100644 --- a/docs/generators/swift5.md +++ b/docs/generators/swift5.md @@ -74,6 +74,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
        • Any
        • +
        • AnyCodable
        • AnyObject
        • Bool
        • Character
        • diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java index 5bd1dfb2db0..584e7720910 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java @@ -145,7 +145,8 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig "URL", "AnyObject", "Any", - "Decimal") + "Decimal", + "AnyCodable") // from AnyCodable dependency ); defaultIncludes = new HashSet<>( Arrays.asList( @@ -731,11 +732,11 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig // FIXME parameter should not be assigned. Also declare it as "final" name = sanitizeName(name); - if (!StringUtils.isEmpty(modelNameSuffix)) { // set model suffix + if (!StringUtils.isEmpty(modelNameSuffix) && !isLanguageSpecificType(name)) { // set model suffix name = name + "_" + modelNameSuffix; } - if (!StringUtils.isEmpty(modelNamePrefix)) { // set model prefix + if (!StringUtils.isEmpty(modelNamePrefix) && !isLanguageSpecificType(name)) { // set model prefix name = modelNamePrefix + "_" + name; } @@ -1086,6 +1087,10 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig LOWERCASE_FIRST_LETTER); } + private Boolean isLanguageSpecificType(String name) { + return languageSpecificPrimitives.contains(name); + } + private String replaceSpecialCharacters(String name) { for (Map.Entry specialCharacters : specialCharReplacements.entrySet()) { String specialChar = specialCharacters.getKey(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java index 59928dbc266..d71bef08e80 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ClientCodegenTest.java @@ -166,6 +166,42 @@ public class Swift5ClientCodegenTest { Assert.assertEquals(op.bodyParam.dataType, "OpenAPIDateWithoutTime"); } + @Test(description = "type from languageSpecificPrimitives should not be prefixed", enabled = true) + public void prefixExceptionTest() { + final DefaultCodegen codegen = new Swift5ClientCodegen(); + codegen.setModelNamePrefix("API"); + + final String result = codegen.toModelName("AnyCodable"); + Assert.assertEquals(result, "AnyCodable"); + } + + @Test(description = "type from languageSpecificPrimitives should not be suffixed", enabled = true) + public void suffixExceptionTest() { + final DefaultCodegen codegen = new Swift5ClientCodegen(); + codegen.setModelNameSuffix("API"); + + final String result = codegen.toModelName("AnyCodable"); + Assert.assertEquals(result, "AnyCodable"); + } + + @Test(description = "Other types should be prefixed", enabled = true) + public void prefixTest() { + final DefaultCodegen codegen = new Swift5ClientCodegen(); + codegen.setModelNamePrefix("API"); + + final String result = codegen.toModelName("MyType"); + Assert.assertEquals(result, "APIMyType"); + } + + @Test(description = "Other types should be suffixed", enabled = true) + public void suffixTest() { + final DefaultCodegen codegen = new Swift5ClientCodegen(); + codegen.setModelNameSuffix("API"); + + final String result = codegen.toModelName("MyType"); + Assert.assertEquals(result, "MyTypeAPI"); + } + @Test(enabled = true) public void testDefaultPodAuthors() throws Exception { // Given diff --git a/modules/openapi-generator/src/test/resources/3_0/any_codable.yaml b/modules/openapi-generator/src/test/resources/3_0/any_codable.yaml new file mode 100644 index 00000000000..00448b22ff6 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/any_codable.yaml @@ -0,0 +1,45 @@ +openapi: "3.0.0" +info: + version: 1.0.0 + title: Swagger Petstore +paths: + /pets: + get: + tags: + - pets + responses: + '200': + description: Expected response to a valid request + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + /pets/{petId}: + get: + summary: Info for a specific pet + operationId: showPetById + tags: + - pets + parameters: + - name: petId + in: path + required: true + description: The id of the pet to retrieve + schema: + type: string + responses: + '200': + description: Expected response to a valid request + content: + application/json: + schema: + type: object +components: + schemas: + Pet: + type: object + properties: + testProperty: + type: string + required: + - testProperty \ No newline at end of file diff --git a/samples/client/petstore/swift5/anycodable/.gitignore b/samples/client/petstore/swift5/anycodable/.gitignore new file mode 100644 index 00000000000..627d360a903 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/.gitignore @@ -0,0 +1,105 @@ +# Created by https://www.toptal.com/developers/gitignore/api/swift,xcode +# Edit at https://www.toptal.com/developers/gitignore?templates=swift,xcode + +### Swift ### +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Obj-C/Swift specific +*.hmap + +## App packaging +*.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +# *.xcodeproj +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +# .swiftpm + +.build/ + +# CocoaPods +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# Pods/ +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build/ + +# Add this lines if you are using Accio dependency management (Deprecated since Xcode 12) +# Dependencies/ +# .accio/ + +# fastlane +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + +### Xcode ### +# Xcode +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + + + + +## Gcc Patch +/*.gcno + +### Xcode Patch ### +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcworkspace/contents.xcworkspacedata +**/xcshareddata/WorkspaceSettings.xcsettings + +# End of https://www.toptal.com/developers/gitignore/api/swift,xcode diff --git a/samples/client/petstore/swift5/anycodable/.openapi-generator-ignore b/samples/client/petstore/swift5/anycodable/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/swift5/anycodable/.openapi-generator/FILES b/samples/client/petstore/swift5/anycodable/.openapi-generator/FILES new file mode 100644 index 00000000000..916770788c3 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/.openapi-generator/FILES @@ -0,0 +1,24 @@ +.gitignore +.swiftformat +Cartfile +Package.swift +PetstoreClient.podspec +PetstoreClient/Classes/OpenAPIs/APIHelper.swift +PetstoreClient/Classes/OpenAPIs/APIs.swift +PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift +PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +PetstoreClient/Classes/OpenAPIs/Configuration.swift +PetstoreClient/Classes/OpenAPIs/Extensions.swift +PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift +PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift +PetstoreClient/Classes/OpenAPIs/Models.swift +PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift +PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift +PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift +PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +PetstoreClient/Classes/OpenAPIs/Validation.swift +README.md +docs/PetsAPI.md +docs/PrefixPetSuffix.md +git_push.sh +project.yml diff --git a/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION b/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION new file mode 100644 index 00000000000..7f4d792ec2c --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION @@ -0,0 +1 @@ +6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/anycodable/.swiftformat b/samples/client/petstore/swift5/anycodable/.swiftformat new file mode 100644 index 00000000000..93007252801 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/.swiftformat @@ -0,0 +1,45 @@ +# This file is auto-generated by OpenAPI Generator: https://openapi-generator.tech/ +# +# For rules on SwiftFormat, please refer to https://github.com/nicklockwood/SwiftFormat/blob/master/Rules.md +# +# file options + +# uncomment below to exclude files, folders +#--exclude path/to/test1.swift,Snapshots,Build + +# format options + +--allman false +--binarygrouping 4,8 +--commas always +--comments indent +--decimalgrouping 3,6 +--elseposition same-line +--empty void +--exponentcase lowercase +--exponentgrouping disabled +--fractiongrouping disabled +--header ignore +--hexgrouping 4,8 +--hexliteralcase uppercase +--ifdef indent +--indent 4 +--indentcase false +--importgrouping testable-bottom +--linebreaks lf +--maxwidth none +--octalgrouping 4,8 +--operatorfunc spaced +--patternlet hoist +--ranges spaced +--self remove +--semicolons inline +--stripunusedargs always +--swiftversion 5.4 +--trimwhitespace always +--wraparguments preserve +--wrapcollections preserve + +# rules + +--enable isEmpty diff --git a/samples/client/petstore/swift5/anycodable/Cartfile b/samples/client/petstore/swift5/anycodable/Cartfile new file mode 100644 index 00000000000..92bac174543 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/Cartfile @@ -0,0 +1 @@ +github "Flight-School/AnyCodable" ~> 0.6 diff --git a/samples/client/petstore/swift5/anycodable/OpenAPIClient.podspec b/samples/client/petstore/swift5/anycodable/OpenAPIClient.podspec new file mode 100644 index 00000000000..57d5e06e6e6 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/OpenAPIClient.podspec @@ -0,0 +1,15 @@ +Pod::Spec.new do |s| + s.name = 'OpenAPIClient' + s.ios.deployment_target = '9.0' + s.osx.deployment_target = '10.11' + s.tvos.deployment_target = '9.0' + s.watchos.deployment_target = '3.0' + s.version = '1.0.0' + s.source = { :git => 'git@github.com:OpenAPITools/openapi-generator.git', :tag => 'v1.0.0' } + s.authors = 'OpenAPI Generator' + s.license = 'Proprietary' + s.homepage = 'https://github.com/OpenAPITools/openapi-generator' + s.summary = 'OpenAPIClient Swift SDK' + s.source_files = 'OpenAPIClient/Classes/**/*.swift' + s.dependency 'AnyCodable-FlightSchool', '~> 0.6' +end diff --git a/samples/client/petstore/swift5/anycodable/Package.swift b/samples/client/petstore/swift5/anycodable/Package.swift new file mode 100644 index 00000000000..5335b0a3093 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/Package.swift @@ -0,0 +1,33 @@ +// swift-tools-version:5.1 + +import PackageDescription + +let package = Package( + name: "PetstoreClient", + platforms: [ + .iOS(.v9), + .macOS(.v10_11), + .tvOS(.v9), + .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"] + ), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + .package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.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: ["AnyCodable", ], + path: "PetstoreClient/Classes" + ), + ] +) diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient.podspec b/samples/client/petstore/swift5/anycodable/PetstoreClient.podspec new file mode 100644 index 00000000000..4265bb2dc10 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient.podspec @@ -0,0 +1,15 @@ +Pod::Spec.new do |s| + s.name = 'PetstoreClient' + s.ios.deployment_target = '9.0' + s.osx.deployment_target = '10.11' + s.tvos.deployment_target = '9.0' + s.watchos.deployment_target = '3.0' + s.version = '1.0.0' + s.source = { :git => 'git@github.com:OpenAPITools/openapi-generator.git', :tag => 'v1.0.0' } + s.authors = '' + s.license = 'Proprietary' + s.homepage = 'https://github.com/openapitools/openapi-generator' + s.summary = 'PetstoreClient' + s.source_files = 'PetstoreClient/Classes/**/*.swift' + s.dependency 'AnyCodable-FlightSchool', '~> 0.6' +end diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift new file mode 100644 index 00000000000..93c5c762602 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -0,0 +1,119 @@ +// APIHelper.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +public struct APIHelper { + public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { + let destination = source.reduce(into: [String: Any]()) { result, item in + if let value = item.value { + result[item.key] = value + } + } + + if destination.isEmpty { + return nil + } + return destination + } + + public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { + return source.reduce(into: [String: String]()) { result, item in + if let collection = item.value as? [Any?] { + result[item.key] = collection + .compactMap { value in convertAnyToString(value) } + .joined(separator: ",") + } else if let value: Any = item.value { + result[item.key] = convertAnyToString(value) + } + } + } + + public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? { + guard let source = source else { + return nil + } + + 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 convertAnyToString(_ value: Any?) -> String? { + guard let value = value else { return nil } + if let value = value as? any RawRepresentable { + return "\(value.rawValue)" + } else { + return "\(value)" + } + } + + public static func mapValueToPathItem(_ source: Any) -> Any { + if let collection = source as? [Any?] { + return collection + .compactMap { value in convertAnyToString(value) } + .joined(separator: ",") + } + return source + } + + /// maps all values from source to query parameters + /// + /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs + public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? { + let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in + if let collection = item.value.wrappedValue as? [Any?] { + + let collectionValues: [String] = collection.compactMap { value in convertAnyToString(value) } + + if !item.value.isExplode { + result.append(URLQueryItem(name: item.key, value: collectionValues.joined(separator: ","))) + } else { + collectionValues + .forEach { value in + result.append(URLQueryItem(name: item.key, value: value)) + } + } + + } else if let value = item.value.wrappedValue { + result.append(URLQueryItem(name: item.key, value: convertAnyToString(value))) + } + } + + if destination.isEmpty { + return nil + } + return destination + } + + /// maps all values from source to query parameters + /// + /// collection values are always exploded + public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in + if let collection = item.value as? [Any?] { + collection + .compactMap { value in convertAnyToString(value) } + .forEach { value in + result.append(URLQueryItem(name: item.key, value: value)) + } + + } else if let value = item.value { + result.append(URLQueryItem(name: item.key, value: convertAnyToString(value))) + } + } + + if destination.isEmpty { + return nil + } + return destination + } +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs.swift new file mode 100644 index 00000000000..513c1222ada --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -0,0 +1,75 @@ +// APIs.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +// We reverted the change of PetstoreClientAPI to PetstoreClient introduced in https://github.com/OpenAPITools/openapi-generator/pull/9624 +// Because it was causing the following issue https://github.com/OpenAPITools/openapi-generator/issues/9953 +// If you are affected by this issue, please consider removing the following two lines, +// By setting the option removeMigrationProjectNameClass to true in the generator +@available(*, deprecated, renamed: "PetstoreClientAPI") +public typealias PetstoreClient = PetstoreClientAPI + +open class PetstoreClientAPI { + public static var basePath = "http://localhost" + public static var customHeaders: [String: String] = [:] + public static var credential: URLCredential? + public static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory() + public static var apiResponseQueue: DispatchQueue = .main +} + +open class RequestBuilder { + var credential: URLCredential? + var headers: [String: String] + public let parameters: [String: Any]? + public let method: String + public let URLString: String + public let requestTask: RequestTask = RequestTask() + public let requiresAuthentication: Bool + + /// Optional block to obtain a reference to the request's progress instance when available. + /// With the URLSession http client the request's progress only works on iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0. + /// If you need to get the request's progress in older OS versions, please use Alamofire http client. + public var onProgressReady: ((Progress) -> Void)? + + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + self.method = method + self.URLString = URLString + self.parameters = parameters + self.headers = headers + self.requiresAuthentication = requiresAuthentication + + addHeaders(PetstoreClientAPI.customHeaders) + } + + open func addHeaders(_ aHeaders: [String: String]) { + for (header, value) in aHeaders { + headers[header] = value + } + } + + @discardableResult + open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) -> RequestTask { + return requestTask + } + + public func addHeader(name: String, value: String) -> Self { + if !value.isEmpty { + headers[name] = value + } + return self + } + + open func addCredential() -> Self { + credential = PetstoreClientAPI.credential + return self + } +} + +public protocol RequestBuilderFactory { + func getNonDecodableBuilder() -> RequestBuilder.Type + func getBuilder() -> RequestBuilder.Type +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift new file mode 100644 index 00000000000..03222c67a75 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift @@ -0,0 +1,99 @@ +// +// PetsAPI.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation +#if canImport(AnyCodable) +import AnyCodable +#endif + +open class PetsAPI { + + /** + + - parameter apiResponseQueue: The queue on which api response is dispatched. + - parameter completion: completion handler to receive the data and the error objects + */ + @discardableResult + open class func petsGet(apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: PrefixPetSuffix?, _ error: Error?) -> Void)) -> RequestTask { + return petsGetWithRequestBuilder().execute(apiResponseQueue) { result in + switch result { + case let .success(response): + completion(response.body, nil) + case let .failure(error): + completion(nil, error) + } + } + } + + /** + - GET /pets + - returns: RequestBuilder + */ + open class func petsGetWithRequestBuilder() -> RequestBuilder { + let localVariablePath = "/pets" + let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableParameters: [String: Any]? = nil + + let localVariableUrlComponents = URLComponents(string: localVariableURLString) + + let localVariableNillableHeaders: [String: Any?] = [ + : + ] + + let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + + let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + } + + /** + Info for a specific pet + + - parameter petId: (path) The id of the pet to retrieve + - parameter apiResponseQueue: The queue on which api response is dispatched. + - parameter completion: completion handler to receive the data and the error objects + */ + @discardableResult + open class func showPetById(petId: String, apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, completion: @escaping ((_ data: AnyCodable?, _ error: Error?) -> Void)) -> RequestTask { + return showPetByIdWithRequestBuilder(petId: petId).execute(apiResponseQueue) { result in + switch result { + case let .success(response): + completion(response.body, nil) + case let .failure(error): + completion(nil, error) + } + } + } + + /** + Info for a specific pet + - GET /pets/{petId} + - parameter petId: (path) The id of the pet to retrieve + - returns: RequestBuilder + */ + open class func showPetByIdWithRequestBuilder(petId: String) -> RequestBuilder { + var localVariablePath = "/pets/{petId}" + let petIdPreEscape = "\(APIHelper.mapValueToPathItem(petId))" + let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? "" + localVariablePath = localVariablePath.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil) + let localVariableURLString = PetstoreClientAPI.basePath + localVariablePath + let localVariableParameters: [String: Any]? = nil + + let localVariableUrlComponents = URLComponents(string: localVariableURLString) + + let localVariableNillableHeaders: [String: Any?] = [ + : + ] + + let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders) + + let localVariableRequestBuilder: RequestBuilder.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder() + + return localVariableRequestBuilder.init(method: "GET", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: false) + } +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift new file mode 100644 index 00000000000..09c82e53e13 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -0,0 +1,49 @@ +// +// CodableHelper.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +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() + encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) + encoder.outputFormatting = .prettyPrinted + return encoder + }() + + public static var dateFormatter: DateFormatter { + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } + } + public static var jsonDecoder: JSONDecoder { + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } + } + public static var jsonEncoder: JSONEncoder { + 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 jsonDecoder.decode(type, from: data) } + } + + open class func encode(_ value: T) -> Swift.Result where T: Encodable { + return Swift.Result { try jsonEncoder.encode(value) } + } +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Configuration.swift new file mode 100644 index 00000000000..03789f4b492 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -0,0 +1,19 @@ +// Configuration.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +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.") + public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" + /// Configures the range of HTTP status codes that will result in a successful response + /// + /// If a HTTP status code is outside of this range the response will be interpreted as failed. + public static var successfulStatusCodeRange: Range = 200..<300 +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Extensions.swift new file mode 100644 index 00000000000..d12fa0fb513 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -0,0 +1,230 @@ +// Extensions.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation +#if canImport(AnyCodable) +import AnyCodable +#endif + +extension Bool: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension Float: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension Int: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension Int32: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension Int64: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension Double: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension Decimal: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension String: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension URL: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension UUID: JSONEncodable { + func encodeToJSON() -> Any { self } +} + +extension RawRepresentable where RawValue: JSONEncodable { + func encodeToJSON() -> Any { return self.rawValue } +} + +private func encodeIfPossible(_ object: T) -> Any { + if let encodableObject = object as? JSONEncodable { + return encodableObject.encodeToJSON() + } else { + return object + } +} + +extension Array: JSONEncodable { + func encodeToJSON() -> Any { + return self.map(encodeIfPossible) + } +} + +extension Set: JSONEncodable { + func encodeToJSON() -> Any { + return Array(self).encodeToJSON() + } +} + +extension Dictionary: JSONEncodable { + func encodeToJSON() -> Any { + var dictionary = [AnyHashable: Any]() + for (key, value) in self { + dictionary[key] = encodeIfPossible(value) + } + return dictionary + } +} + +extension Data: JSONEncodable { + func encodeToJSON() -> Any { + return self.base64EncodedString(options: Data.Base64EncodingOptions()) + } +} + +extension Date: JSONEncodable { + func encodeToJSON() -> Any { + return CodableHelper.dateFormatter.string(from: self) + } +} + +extension JSONEncodable where Self: Encodable { + func encodeToJSON() -> Any { + guard let data = try? CodableHelper.jsonEncoder.encode(self) else { + fatalError("Could not encode to json: \(self)") + } + return data.encodeToJSON() + } +} + +extension String: CodingKey { + + public var stringValue: String { + return self + } + + public init?(stringValue: String) { + self.init(stringLiteral: stringValue) + } + + public var intValue: Int? { + return nil + } + + public init?(intValue: Int) { + return nil + } + +} + +extension KeyedEncodingContainerProtocol { + + public mutating func encodeArray(_ values: [T], forKey key: Self.Key) throws where T: Encodable { + var arrayContainer = nestedUnkeyedContainer(forKey: key) + try arrayContainer.encode(contentsOf: values) + } + + public mutating func encodeArrayIfPresent(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable { + if let values = values { + try encodeArray(values, forKey: key) + } + } + + public mutating func encodeMap(_ pairs: [Self.Key: T]) throws where T: Encodable { + for (key, value) in pairs { + try encode(value, forKey: key) + } + } + + public mutating func encodeMapIfPresent(_ pairs: [Self.Key: T]?) throws where T: Encodable { + if let pairs = pairs { + try encodeMap(pairs) + } + } + + public mutating func encode(_ value: Decimal, forKey key: Self.Key) throws { + var mutableValue = value + let stringValue = NSDecimalString(&mutableValue, Locale(identifier: "en_US")) + try encode(stringValue, forKey: key) + } + + public mutating func encodeIfPresent(_ value: Decimal?, forKey key: Self.Key) throws { + if let value = value { + try encode(value, forKey: key) + } + } +} + +extension KeyedDecodingContainerProtocol { + + public func decodeArray(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable { + var tmpArray = [T]() + + var nestedContainer = try nestedUnkeyedContainer(forKey: key) + while !nestedContainer.isAtEnd { + let arrayValue = try nestedContainer.decode(T.self) + tmpArray.append(arrayValue) + } + + return tmpArray + } + + public func decodeArrayIfPresent(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable { + var tmpArray: [T]? + + if contains(key) { + tmpArray = try decodeArray(T.self, forKey: key) + } + + return tmpArray + } + + public func decodeMap(_ type: T.Type, excludedKeys: Set) throws -> [Self.Key: T] where T: Decodable { + var map: [Self.Key: T] = [:] + + for key in allKeys { + if !excludedKeys.contains(key) { + let value = try decode(T.self, forKey: key) + map[key] = value + } + } + + return map + } + + public func decode(_ type: Decimal.Type, forKey key: Self.Key) throws -> Decimal { + let stringValue = try decode(String.self, forKey: key) + guard let decimalValue = Decimal(string: stringValue) else { + let context = DecodingError.Context(codingPath: [key], debugDescription: "The key \(key) couldn't be converted to a Decimal value") + throw DecodingError.typeMismatch(type, context) + } + + return decimalValue + } + + public func decodeIfPresent(_ type: Decimal.Type, forKey key: Self.Key) throws -> Decimal? { + guard let stringValue = try decodeIfPresent(String.self, forKey: key) else { + return nil + } + guard let decimalValue = Decimal(string: stringValue) else { + let context = DecodingError.Context(codingPath: [key], debugDescription: "The key \(key) couldn't be converted to a Decimal value") + throw DecodingError.typeMismatch(type, context) + } + + return decimalValue + } + +} + +extension HTTPURLResponse { + var isStatusCodeSuccessful: Bool { + return Configuration.successfulStatusCodeRange.contains(statusCode) + } +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift new file mode 100644 index 00000000000..b79e9f5e64d --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift @@ -0,0 +1,53 @@ +// +// JSONDataEncoding.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +public struct JSONDataEncoding { + + // MARK: Properties + + private static let jsonDataKey = "jsonData" + + // MARK: Encoding + + /// Creates a URL request by encoding parameters and applying them onto an existing request. + /// + /// - parameter urlRequest: The request to have parameters applied. + /// - parameter parameters: The parameters to apply. This should have a single key/value + /// pair with "jsonData" as the key and a Data object as the value. + /// + /// - throws: An `Error` if the encoding process encounters an error. + /// + /// - returns: The encoded request. + public func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) -> URLRequest { + var urlRequest = urlRequest + + guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else { + return urlRequest + } + + if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil { + urlRequest.setValue("application/json", forHTTPHeaderField: "Content-Type") + } + + urlRequest.httpBody = jsonData + + return urlRequest + } + + public static func encodingParameters(jsonData: Data?) -> [String: Any]? { + var returnedParams: [String: Any]? + if let jsonData = jsonData, !jsonData.isEmpty { + var params: [String: Any] = [:] + params[jsonDataKey] = jsonData + returnedParams = params + } + return returnedParams + } + +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift new file mode 100644 index 00000000000..02f78ffb470 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift @@ -0,0 +1,45 @@ +// +// JSONEncodingHelper.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +open class JSONEncodingHelper { + + open class func encodingParameters(forEncodableObject encodableObj: T?) -> [String: Any]? { + var params: [String: Any]? + + // Encode the Encodable object + if let encodableObj = encodableObj { + let encodeResult = CodableHelper.encode(encodableObj) + do { + let data = try encodeResult.get() + params = JSONDataEncoding.encodingParameters(jsonData: data) + } catch { + print(error.localizedDescription) + } + } + + return params + } + + open class func encodingParameters(forEncodableObject encodableObj: Any?) -> [String: Any]? { + var params: [String: Any]? + + if let encodableObj = encodableObj { + do { + let data = try JSONSerialization.data(withJSONObject: encodableObj, options: .prettyPrinted) + params = JSONDataEncoding.encodingParameters(jsonData: data) + } catch { + print(error.localizedDescription) + return nil + } + } + + return params + } + +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models.swift new file mode 100644 index 00000000000..b73c2b8fde0 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models.swift @@ -0,0 +1,126 @@ +// Models.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +protocol JSONEncodable { + func encodeToJSON() -> Any +} + +/// An enum where the last case value can be used as a default catch-all. +protocol CaseIterableDefaultsLast: Decodable & CaseIterable & RawRepresentable +where RawValue: Decodable, AllCases: BidirectionalCollection {} + +extension CaseIterableDefaultsLast { + /// Initializes an enum such that if a known raw value is found, then it is decoded. + /// Otherwise the last case is used. + /// - Parameter decoder: A decoder. + public init(from decoder: Decoder) throws { + if let value = try Self(rawValue: decoder.singleValueContainer().decode(RawValue.self)) { + self = value + } else if let lastValue = Self.allCases.last { + self = lastValue + } else { + throw DecodingError.valueNotFound( + Self.Type.self, + .init(codingPath: decoder.codingPath, debugDescription: "CaseIterableDefaultsLast") + ) + } + } +} + +/// A flexible type that can be encoded (`.encodeNull` or `.encodeValue`) +/// or not encoded (`.encodeNothing`). Intended for request payloads. +public enum NullEncodable: Hashable { + case encodeNothing + case encodeNull + case encodeValue(Wrapped) +} + +extension NullEncodable: Codable where Wrapped: Codable { + public init(from decoder: Decoder) throws { + let container = try decoder.singleValueContainer() + if let value = try? container.decode(Wrapped.self) { + self = .encodeValue(value) + } else if container.decodeNil() { + self = .encodeNull + } else { + self = .encodeNothing + } + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.singleValueContainer() + switch self { + case .encodeNothing: return + case .encodeNull: try container.encodeNil() + case .encodeValue(let wrapped): try container.encode(wrapped) + } + } +} + +public enum ErrorResponse: Error { + case error(Int, Data?, URLResponse?, Error) +} + +public enum DownloadException: Error { + case responseDataMissing + case responseFailed + case requestMissing + case requestMissingPath + case requestMissingURL +} + +public enum DecodableRequestBuilderError: Error { + case emptyDataResponse + case nilHTTPResponse + case unsuccessfulHTTPStatusCode + case jsonDecoding(DecodingError) + case generalError(Error) +} + +open class Response { + public let statusCode: Int + public let header: [String: String] + public let body: T + public let bodyData: Data? + + public init(statusCode: Int, header: [String: String], body: T, bodyData: Data?) { + self.statusCode = statusCode + self.header = header + self.body = body + self.bodyData = bodyData + } + + public convenience init(response: HTTPURLResponse, body: T, bodyData: Data?) { + let rawHeader = response.allHeaderFields + var header = [String: String]() + for (key, value) in rawHeader { + if let key = key.base as? String, let value = value as? String { + header[key] = value + } + } + self.init(statusCode: response.statusCode, header: header, body: body, bodyData: bodyData) + } +} + +public final class RequestTask { + private var lock = NSRecursiveLock() + private var task: URLSessionTask? + + internal func set(task: URLSessionTask) { + lock.lock() + defer { lock.unlock() } + self.task = task + } + + public func cancel() { + lock.lock() + defer { lock.unlock() } + task?.cancel() + task = nil + } +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift new file mode 100644 index 00000000000..183f8eeb770 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift @@ -0,0 +1,32 @@ +// +// PrefixPetSuffix.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation +#if canImport(AnyCodable) +import AnyCodable +#endif + +public struct PrefixPetSuffix: Codable, JSONEncodable, Hashable { + + public var testProperty: String + + public init(testProperty: String) { + self.testProperty = testProperty + } + + public enum CodingKeys: String, CodingKey, CaseIterable { + case testProperty + } + + // Encodable protocol methods + + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(testProperty, forKey: .testProperty) + } +} + diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift new file mode 100644 index 00000000000..cc3288805f1 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift @@ -0,0 +1,56 @@ +// +// OpenISO8601DateFormatter.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +// https://stackoverflow.com/a/50281094/976628 +public class OpenISO8601DateFormatter: DateFormatter { + static let withoutSeconds: DateFormatter = { + let formatter = DateFormatter() + formatter.calendar = Calendar(identifier: .iso8601) + formatter.locale = Locale(identifier: "en_US_POSIX") + formatter.timeZone = TimeZone(secondsFromGMT: 0) + formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ" + return formatter + }() + + static let withoutTime: DateFormatter = { + let formatter = DateFormatter() + formatter.calendar = Calendar(identifier: .iso8601) + formatter.locale = Locale(identifier: "en_US_POSIX") + formatter.timeZone = TimeZone(secondsFromGMT: 0) + formatter.dateFormat = "yyyy-MM-dd" + return formatter + }() + + private func setup() { + calendar = Calendar(identifier: .iso8601) + locale = Locale(identifier: "en_US_POSIX") + timeZone = TimeZone(secondsFromGMT: 0) + dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" + } + + override init() { + super.init() + setup() + } + + required init?(coder aDecoder: NSCoder) { + super.init(coder: aDecoder) + setup() + } + + override public func date(from string: String) -> Date? { + if let result = super.date(from: string) { + return result + } else if let result = OpenISO8601DateFormatter.withoutSeconds.date(from: string) { + return result + } + + return OpenISO8601DateFormatter.withoutTime.date(from: string) + } +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift new file mode 100644 index 00000000000..acf7ff4031b --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift @@ -0,0 +1,36 @@ +// SynchronizedDictionary.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +internal struct SynchronizedDictionary { + + private var dictionary = [K: V]() + private let queue = DispatchQueue( + label: "SynchronizedDictionary", + qos: DispatchQoS.userInitiated, + attributes: [DispatchQueue.Attributes.concurrent], + autoreleaseFrequency: DispatchQueue.AutoreleaseFrequency.inherit, + target: nil + ) + + internal subscript(key: K) -> V? { + get { + var value: V? + + queue.sync { + value = self.dictionary[key] + } + + return value + } + set { + queue.sync(flags: DispatchWorkItemFlags.barrier) { + self.dictionary[key] = newValue + } + } + } +} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift new file mode 100644 index 00000000000..635c69cd6a8 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -0,0 +1,641 @@ +// URLSessionImplementations.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation +#if !os(macOS) +import MobileCoreServices +#endif + +public protocol URLSessionProtocol { + func dataTask(with request: URLRequest, completionHandler: @escaping @Sendable (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask +} + +extension URLSession: URLSessionProtocol {} + +class URLSessionRequestBuilderFactory: RequestBuilderFactory { + func getNonDecodableBuilder() -> RequestBuilder.Type { + return URLSessionRequestBuilder.self + } + + func getBuilder() -> RequestBuilder.Type { + return URLSessionDecodableRequestBuilder.self + } +} + +public typealias PetstoreClientAPIChallengeHandler = ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?)) + +// Store the URLSession's delegate to retain its reference +private let sessionDelegate = SessionDelegate() + +// Store the URLSession to retain its reference +private let defaultURLSession = URLSession(configuration: .default, delegate: sessionDelegate, delegateQueue: nil) + +// Store current taskDidReceiveChallenge for every URLSessionTask +private var challengeHandlerStore = SynchronizedDictionary() + +// Store current URLCredential for every URLSessionTask +private var credentialStore = SynchronizedDictionary() + +open class URLSessionRequestBuilder: RequestBuilder { + + /** + May be assigned if you want to control the authentication challenges. + */ + public var taskDidReceiveChallenge: PetstoreClientAPIChallengeHandler? + + /** + May be assigned if you want to do any of those things: + - control the task completion + - intercept and handle errors like authorization + - retry the request. + */ + @available(*, deprecated, message: "Please override execute() method to intercept and handle errors like authorization or retry the request. Check the Wiki for more info. https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-do-i-implement-bearer-token-authentication-with-urlsession-on-the-swift-api-client") + public var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)? + + required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], requiresAuthentication: Bool) { + super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, requiresAuthentication: requiresAuthentication) + } + + /** + May be overridden by a subclass if you want to control the URLSession + configuration. + */ + open func createURLSession() -> URLSessionProtocol { + return defaultURLSession + } + + /** + May be overridden by a subclass if you want to control the Content-Type + that is given to an uploaded form part. + + Return nil to use the default behavior (inferring the Content-Type from + the file extension). Return the desired Content-Type otherwise. + */ + open func contentTypeForFormPart(fileURL: URL) -> String? { + return nil + } + + /** + May be overridden by a subclass if you want to control the URLRequest + configuration (e.g. to override the cache policy). + */ + open func createURLRequest(urlSession: URLSessionProtocol, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest { + + guard let url = URL(string: URLString) else { + throw DownloadException.requestMissingURL + } + + var originalRequest = URLRequest(url: url) + + originalRequest.httpMethod = method.rawValue + + headers.forEach { key, value in + originalRequest.setValue(value, forHTTPHeaderField: key) + } + + buildHeaders().forEach { key, value in + originalRequest.setValue(value, forHTTPHeaderField: key) + } + + let modifiedRequest = try encoding.encode(originalRequest, with: parameters) + + return modifiedRequest + } + + @discardableResult + override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) -> RequestTask { + let urlSession = createURLSession() + + guard let xMethod = HTTPMethod(rawValue: method) else { + fatalError("Unsupported Http method - \(method)") + } + + let encoding: ParameterEncoding + + switch xMethod { + case .get, .head: + encoding = URLEncoding() + + case .options, .post, .put, .patch, .delete, .trace, .connect: + let contentType = headers["Content-Type"] ?? "application/json" + + if contentType.hasPrefix("application/json") { + encoding = JSONDataEncoding() + } else if contentType.hasPrefix("multipart/form-data") { + encoding = FormDataEncoding(contentTypeForFormPart: contentTypeForFormPart(fileURL:)) + } else if contentType.hasPrefix("application/x-www-form-urlencoded") { + encoding = FormURLEncoding() + } else { + fatalError("Unsupported Media Type - \(contentType)") + } + } + + do { + let request = try createURLRequest(urlSession: urlSession, method: xMethod, encoding: encoding, headers: headers) + + var taskIdentifier: Int? + let cleanupRequest = { + if let taskIdentifier = taskIdentifier { + challengeHandlerStore[taskIdentifier] = nil + credentialStore[taskIdentifier] = nil + } + } + + let dataTask = urlSession.dataTask(with: request) { data, response, error in + + if let taskCompletionShouldRetry = self.taskCompletionShouldRetry { + + taskCompletionShouldRetry(data, response, error) { shouldRetry in + + if shouldRetry { + cleanupRequest() + self.execute(apiResponseQueue, completion) + } else { + apiResponseQueue.async { + self.processRequestResponse(urlRequest: request, data: data, response: response, error: error, completion: completion) + cleanupRequest() + } + } + } + } else { + apiResponseQueue.async { + self.processRequestResponse(urlRequest: request, data: data, response: response, error: error, completion: completion) + cleanupRequest() + } + } + } + + if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) { + onProgressReady?(dataTask.progress) + } + + taskIdentifier = dataTask.taskIdentifier + challengeHandlerStore[dataTask.taskIdentifier] = taskDidReceiveChallenge + credentialStore[dataTask.taskIdentifier] = credential + + dataTask.resume() + + requestTask.set(task: dataTask) + } catch { + apiResponseQueue.async { + completion(.failure(ErrorResponse.error(415, nil, nil, error))) + } + } + + return requestTask + } + + fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { + + if let error = error { + completion(.failure(ErrorResponse.error(-1, data, response, error))) + return + } + + guard let httpResponse = response as? HTTPURLResponse else { + completion(.failure(ErrorResponse.error(-2, data, response, DecodableRequestBuilderError.nilHTTPResponse))) + return + } + + guard httpResponse.isStatusCodeSuccessful else { + completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, response, DecodableRequestBuilderError.unsuccessfulHTTPStatusCode))) + return + } + + switch T.self { + case is Void.Type: + + completion(.success(Response(response: httpResponse, body: () as! T, bodyData: data))) + + default: + fatalError("Unsupported Response Body Type - \(String(describing: T.self))") + } + + } + + open func buildHeaders() -> [String: String] { + var httpHeaders: [String: String] = [:] + for (key, value) in headers { + httpHeaders[key] = value + } + for (key, value) in PetstoreClientAPI.customHeaders { + httpHeaders[key] = value + } + return httpHeaders + } + + fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? { + + guard let contentDisposition = contentDisposition else { + return nil + } + + let items = contentDisposition.components(separatedBy: ";") + + var filename: String? + + for contentItem in items { + + let filenameKey = "filename=" + guard let range = contentItem.range(of: filenameKey) else { + continue + } + + filename = contentItem + return filename? + .replacingCharacters(in: range, with: "") + .replacingOccurrences(of: "\"", with: "") + .trimmingCharacters(in: .whitespacesAndNewlines) + } + + return filename + + } + + fileprivate func getPath(from url: URL) throws -> String { + + guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else { + throw DownloadException.requestMissingPath + } + + if path.hasPrefix("/") { + path.remove(at: path.startIndex) + } + + return path + + } + + fileprivate func getURL(from urlRequest: URLRequest) throws -> URL { + + guard let url = urlRequest.url else { + throw DownloadException.requestMissingURL + } + + return url + } + +} + +open class URLSessionDecodableRequestBuilder: URLSessionRequestBuilder { + override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result, ErrorResponse>) -> Void) { + + if let error = error { + completion(.failure(ErrorResponse.error(-1, data, response, error))) + return + } + + guard let httpResponse = response as? HTTPURLResponse else { + completion(.failure(ErrorResponse.error(-2, data, response, DecodableRequestBuilderError.nilHTTPResponse))) + return + } + + guard httpResponse.isStatusCodeSuccessful else { + completion(.failure(ErrorResponse.error(httpResponse.statusCode, data, response, DecodableRequestBuilderError.unsuccessfulHTTPStatusCode))) + return + } + + switch T.self { + case is String.Type: + + let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? "" + + completion(.success(Response(response: httpResponse, body: body as! T, bodyData: data))) + + case is URL.Type: + do { + + guard error == nil else { + throw DownloadException.responseFailed + } + + guard let data = data else { + throw DownloadException.responseDataMissing + } + + let fileManager = FileManager.default + let cachesDirectory = fileManager.urls(for: .cachesDirectory, in: .userDomainMask)[0] + let requestURL = try getURL(from: urlRequest) + + var requestPath = try getPath(from: requestURL) + + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + requestPath = requestPath.appending("/\(headerFileName)") + } else { + requestPath = requestPath.appending("/tmp.PetstoreClient.\(UUID().uuidString)") + } + + let filePath = cachesDirectory.appendingPathComponent(requestPath) + let directoryPath = filePath.deletingLastPathComponent().path + + try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil) + try data.write(to: filePath, options: .atomic) + + completion(.success(Response(response: httpResponse, body: filePath as! T, bodyData: data))) + + } catch let requestParserError as DownloadException { + completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) + } catch { + completion(.failure(ErrorResponse.error(400, data, response, error))) + } + + case is Void.Type: + + completion(.success(Response(response: httpResponse, body: () as! T, bodyData: data))) + + case is Data.Type: + + completion(.success(Response(response: httpResponse, body: data as! T, bodyData: data))) + + default: + + guard let unwrappedData = data, !unwrappedData.isEmpty else { + if let E = T.self as? ExpressibleByNilLiteral.Type { + completion(.success(Response(response: httpResponse, body: E.init(nilLiteral: ()) as! T, bodyData: data))) + } else { + completion(.failure(ErrorResponse.error(httpResponse.statusCode, nil, response, DecodableRequestBuilderError.emptyDataResponse))) + } + return + } + + let decodeResult = CodableHelper.decode(T.self, from: unwrappedData) + + switch decodeResult { + case let .success(decodableObj): + completion(.success(Response(response: httpResponse, body: decodableObj, bodyData: unwrappedData))) + case let .failure(error): + completion(.failure(ErrorResponse.error(httpResponse.statusCode, unwrappedData, response, error))) + } + } + } +} + +private class SessionDelegate: NSObject, URLSessionTaskDelegate { + func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) { + + var disposition: URLSession.AuthChallengeDisposition = .performDefaultHandling + + var credential: URLCredential? + + if let taskDidReceiveChallenge = challengeHandlerStore[task.taskIdentifier] { + (disposition, credential) = taskDidReceiveChallenge(session, task, challenge) + } else { + if challenge.previousFailureCount > 0 { + disposition = .rejectProtectionSpace + } else { + credential = credentialStore[task.taskIdentifier] ?? session.configuration.urlCredentialStorage?.defaultCredential(for: challenge.protectionSpace) + + if credential != nil { + disposition = .useCredential + } + } + } + + completionHandler(disposition, credential) + } +} + +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 connect = "CONNECT" +} + +public protocol ParameterEncoding { + func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest +} + +private class URLEncoding: ParameterEncoding { + func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + + var urlRequest = urlRequest + + guard let parameters = parameters else { return urlRequest } + + guard let url = urlRequest.url else { + throw DownloadException.requestMissingURL + } + + if var urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false), !parameters.isEmpty { + urlComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters) + urlRequest.url = urlComponents.url + } + + return urlRequest + } +} + +private class FormDataEncoding: ParameterEncoding { + + let contentTypeForFormPart: (_ fileURL: URL) -> String? + + init(contentTypeForFormPart: @escaping (_ fileURL: URL) -> String?) { + self.contentTypeForFormPart = contentTypeForFormPart + } + + func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + + var urlRequest = urlRequest + + guard let parameters = parameters, !parameters.isEmpty else { + return urlRequest + } + + let boundary = "Boundary-\(UUID().uuidString)" + + urlRequest.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type") + + for (key, value) in parameters { + for value in (value as? Array ?? [value]) { + switch value { + case let fileURL as URL: + + urlRequest = try configureFileUploadRequest( + urlRequest: urlRequest, + boundary: boundary, + name: key, + fileURL: fileURL + ) + + case let string as String: + + if let data = string.data(using: .utf8) { + urlRequest = configureDataUploadRequest( + urlRequest: urlRequest, + boundary: boundary, + name: key, + data: data + ) + } + + case let number as NSNumber: + + if let data = number.stringValue.data(using: .utf8) { + urlRequest = configureDataUploadRequest( + urlRequest: urlRequest, + boundary: boundary, + name: key, + data: data + ) + } + + case let data as Data: + + urlRequest = configureDataUploadRequest( + urlRequest: urlRequest, + boundary: boundary, + name: key, + data: data + ) + + case let uuid as UUID: + + if let data = uuid.uuidString.data(using: .utf8) { + urlRequest = configureDataUploadRequest( + urlRequest: urlRequest, + boundary: boundary, + name: key, + data: data + ) + } + + default: + fatalError("Unprocessable value \(value) with key \(key)") + } + } + } + + var body = urlRequest.httpBody.orEmpty + + body.append("\r\n--\(boundary)--\r\n") + + urlRequest.httpBody = body + + return urlRequest + } + + private func configureFileUploadRequest(urlRequest: URLRequest, boundary: String, name: String, fileURL: URL) throws -> URLRequest { + + var urlRequest = urlRequest + + var body = urlRequest.httpBody.orEmpty + + let fileData = try Data(contentsOf: fileURL) + + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + + let fileName = fileURL.lastPathComponent + + // If we already added something then we need an additional newline. + if body.count > 0 { + body.append("\r\n") + } + + // Value boundary. + body.append("--\(boundary)\r\n") + + // Value headers. + body.append("Content-Disposition: form-data; name=\"\(name)\"; filename=\"\(fileName)\"\r\n") + body.append("Content-Type: \(mimetype)\r\n") + + // Separate headers and body. + body.append("\r\n") + + // The value data. + body.append(fileData) + + urlRequest.httpBody = body + + return urlRequest + } + + private func configureDataUploadRequest(urlRequest: URLRequest, boundary: String, name: String, data: Data) -> URLRequest { + + var urlRequest = urlRequest + + var body = urlRequest.httpBody.orEmpty + + // If we already added something then we need an additional newline. + if body.count > 0 { + body.append("\r\n") + } + + // Value boundary. + body.append("--\(boundary)\r\n") + + // Value headers. + body.append("Content-Disposition: form-data; name=\"\(name)\"\r\n") + + // Separate headers and body. + body.append("\r\n") + + // The value data. + body.append(data) + + urlRequest.httpBody = body + + return urlRequest + + } + + func mimeType(for url: URL) -> String { + let pathExtension = url.pathExtension + + if let uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, pathExtension as NSString, nil)?.takeRetainedValue() { + if let mimetype = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType)?.takeRetainedValue() { + return mimetype as String + } + } + return "application/octet-stream" + } + +} + +private class FormURLEncoding: ParameterEncoding { + func encode(_ urlRequest: URLRequest, with parameters: [String: Any]?) throws -> URLRequest { + + var urlRequest = urlRequest + + var requestBodyComponents = URLComponents() + requestBodyComponents.queryItems = APIHelper.mapValuesToQueryItems(parameters ?? [:]) + + if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil { + urlRequest.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + } + + urlRequest.httpBody = requestBodyComponents.query?.data(using: .utf8) + + return urlRequest + } +} + +private extension Data { + /// Append string to Data + /// + /// Rather than littering my code with calls to `dataUsingEncoding` to convert strings to Data, and then add that data to the Data, this wraps it in a nice convenient little extension to Data. This converts using UTF-8. + /// + /// - parameter string: The string to be added to the `Data`. + + mutating func append(_ string: String) { + if let data = string.data(using: .utf8) { + append(data) + } + } +} + +private extension Optional where Wrapped == Data { + var orEmpty: Data { + self ?? Data() + } +} + +extension JSONDataEncoding: ParameterEncoding {} diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Validation.swift new file mode 100644 index 00000000000..df99b3e124b --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Validation.swift @@ -0,0 +1,126 @@ +// Validation.swift +// +// Generated by openapi-generator +// https://openapi-generator.tech +// + +import Foundation + +public struct StringRule { + public var minLength: Int? + public var maxLength: Int? + public var pattern: String? +} + +public struct NumericRule { + public var minimum: T? + public var exclusiveMinimum = false + public var maximum: T? + public var exclusiveMaximum = false + public var multipleOf: T? +} + +public enum StringValidationErrorKind: Error { + case minLength, maxLength, pattern +} + +public enum NumericValidationErrorKind: Error { + case minimum, maximum, multipleOf +} + +public struct ValidationError: Error { + public fileprivate(set) var kinds: Set +} + +public struct Validator { + /// Validate a string against a rule. + /// - Parameter string: The String you wish to validate. + /// - Parameter rule: The StringRule you wish to use for validation. + /// - Returns: A validated string. + /// - Throws: `ValidationError` if the string is invalid against the rule, + /// `NSError` if the rule.pattern is invalid. + public static func validate(_ string: String, against rule: StringRule) throws -> String { + var error = ValidationError(kinds: []) + if let minLength = rule.minLength, !(minLength <= string.count) { + error.kinds.insert(.minLength) + } + if let maxLength = rule.maxLength, !(string.count <= maxLength) { + error.kinds.insert(.maxLength) + } + if let pattern = rule.pattern { + let matches = try NSRegularExpression(pattern: pattern, options: .caseInsensitive) + .matches(in: string, range: .init(location: 0, length: string.utf16.count)) + if matches.isEmpty { + error.kinds.insert(.pattern) + } + } + guard error.kinds.isEmpty else { + throw error + } + return string + } + + /// Validate a integer against a rule. + /// - Parameter numeric: The integer you wish to validate. + /// - Parameter rule: The NumericRule you wish to use for validation. + /// - Returns: A validated integer. + /// - Throws: `ValidationError` if the numeric is invalid against the rule. + public static func validate(_ numeric: T, against rule: NumericRule) throws -> T { + var error = ValidationError(kinds: []) + if let minium = rule.minimum { + if !rule.exclusiveMinimum, !(minium <= numeric) { + error.kinds.insert(.minimum) + } + if rule.exclusiveMinimum, !(minium < numeric) { + error.kinds.insert(.minimum) + } + } + if let maximum = rule.maximum { + if !rule.exclusiveMaximum, !(numeric <= maximum) { + error.kinds.insert(.maximum) + } + if rule.exclusiveMaximum, !(numeric < maximum) { + error.kinds.insert(.maximum) + } + } + if let multipleOf = rule.multipleOf, !numeric.isMultiple(of: multipleOf) { + error.kinds.insert(.multipleOf) + } + guard error.kinds.isEmpty else { + throw error + } + return numeric + } + + /// Validate a fractional number against a rule. + /// - Parameter numeric: The fractional number you wish to validate. + /// - Parameter rule: The NumericRule you wish to use for validation. + /// - Returns: A validated fractional number. + /// - Throws: `ValidationError` if the numeric is invalid against the rule. + public static func validate(_ numeric: T, against rule: NumericRule) throws -> T { + var error = ValidationError(kinds: []) + if let minium = rule.minimum { + if !rule.exclusiveMinimum, !(minium <= numeric) { + error.kinds.insert(.minimum) + } + if rule.exclusiveMinimum, !(minium < numeric) { + error.kinds.insert(.minimum) + } + } + if let maximum = rule.maximum { + if !rule.exclusiveMaximum, !(numeric <= maximum) { + error.kinds.insert(.maximum) + } + if rule.exclusiveMaximum, !(numeric < maximum) { + error.kinds.insert(.maximum) + } + } + if let multipleOf = rule.multipleOf, numeric.remainder(dividingBy: multipleOf) != 0 { + error.kinds.insert(.multipleOf) + } + guard error.kinds.isEmpty else { + throw error + } + return numeric + } +} diff --git a/samples/client/petstore/swift5/anycodable/README.md b/samples/client/petstore/swift5/anycodable/README.md new file mode 100644 index 00000000000..f98ca53800a --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/README.md @@ -0,0 +1,45 @@ +# Swift5 API client for PetstoreClient + +No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + +## Overview +This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client. + +- API version: 1.0.0 +- Package version: +- Build package: org.openapitools.codegen.languages.Swift5ClientCodegen + +## Installation + +### Carthage + +Run `carthage update` + +### CocoaPods + +Run `pod install` + +## Documentation for API Endpoints + +All URIs are relative to *http://localhost* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*PetsAPI* | [**petsGet**](docs/PetsAPI.md#petsget) | **GET** /pets | +*PetsAPI* | [**showPetById**](docs/PetsAPI.md#showpetbyid) | **GET** /pets/{petId} | Info for a specific pet + + +## Documentation For Models + + - [PrefixPetSuffix](docs/PrefixPetSuffix.md) + + +## Documentation For Authorization + + All endpoints do not require authorization. + + +## Author + + + diff --git a/samples/client/petstore/swift5/anycodable/docs/PetsAPI.md b/samples/client/petstore/swift5/anycodable/docs/PetsAPI.md new file mode 100644 index 00000000000..9dfc4bc6c7e --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/docs/PetsAPI.md @@ -0,0 +1,101 @@ +# PetsAPI + +All URIs are relative to *http://localhost* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**petsGet**](PetsAPI.md#petsget) | **GET** /pets | +[**showPetById**](PetsAPI.md#showpetbyid) | **GET** /pets/{petId} | Info for a specific pet + + +# **petsGet** +```swift + open class func petsGet(completion: @escaping (_ data: PrefixPetSuffix?, _ error: Error?) -> Void) +``` + + + +### Example +```swift +// The following code samples are still beta. For any issue, please report via http://github.com/OpenAPITools/openapi-generator/issues/new +import PetstoreClient + + +PetsAPI.petsGet() { (response, error) in + guard error == nil else { + print(error) + return + } + + if (response) { + dump(response) + } +} +``` + +### Parameters +This endpoint does not need any parameter. + +### Return type + +[**PrefixPetSuffix**](PrefixPetSuffix.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + +[[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) + +# **showPetById** +```swift + open class func showPetById(petId: String, completion: @escaping (_ data: AnyCodable?, _ error: Error?) -> Void) +``` + +Info for a specific pet + +### Example +```swift +// The following code samples are still beta. For any issue, please report via http://github.com/OpenAPITools/openapi-generator/issues/new +import PetstoreClient + +let petId = "petId_example" // String | The id of the pet to retrieve + +// Info for a specific pet +PetsAPI.showPetById(petId: petId) { (response, error) in + guard error == nil else { + print(error) + return + } + + if (response) { + dump(response) + } +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | **String** | The id of the pet to retrieve | + +### Return type + +**AnyCodable** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + +[[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/client/petstore/swift5/anycodable/docs/PrefixPetSuffix.md b/samples/client/petstore/swift5/anycodable/docs/PrefixPetSuffix.md new file mode 100644 index 00000000000..62e3869100b --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/docs/PrefixPetSuffix.md @@ -0,0 +1,10 @@ +# PrefixPetSuffix + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**testProperty** | **String** | | + +[[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/client/petstore/swift5/anycodable/git_push.sh b/samples/client/petstore/swift5/anycodable/git_push.sh new file mode 100644 index 00000000000..f53a75d4fab --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/git_push.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="github.com" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=$(git remote) +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' diff --git a/samples/client/petstore/swift5/anycodable/pom.xml b/samples/client/petstore/swift5/anycodable/pom.xml new file mode 100644 index 00000000000..c1b201eb3b4 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/pom.xml @@ -0,0 +1,43 @@ + + 4.0.0 + io.swagger + Swift5PetstoreClientTests + pom + 1.0-SNAPSHOT + Swift5 Swagger Petstore Client + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory} + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + xcodebuild-test + integration-test + + exec + + + ./run_spmbuild.sh + + + + + + + diff --git a/samples/client/petstore/swift5/anycodable/project.yml b/samples/client/petstore/swift5/anycodable/project.yml new file mode 100644 index 00000000000..0493cf65896 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/project.yml @@ -0,0 +1,15 @@ +name: PetstoreClient +targets: + PetstoreClient: + type: framework + platform: iOS + deploymentTarget: "9.0" + sources: [PetstoreClient] + info: + path: ./Info.plist + version: 1.0.0 + settings: + APPLICATION_EXTENSION_API_ONLY: true + scheme: {} + dependencies: + - carthage: AnyCodable diff --git a/samples/client/petstore/swift5/anycodable/run_spmbuild.sh b/samples/client/petstore/swift5/anycodable/run_spmbuild.sh new file mode 100755 index 00000000000..1a9f585ad05 --- /dev/null +++ b/samples/client/petstore/swift5/anycodable/run_spmbuild.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +swift build && exit ${PIPESTATUS[0]} diff --git a/samples/client/petstore/swift5/default/docs/AdditionalPropertiesClass.md b/samples/client/petstore/swift5/default/docs/AdditionalPropertiesClass.md index 1cffcdd8484..4d5f0963145 100644 --- a/samples/client/petstore/swift5/default/docs/AdditionalPropertiesClass.md +++ b/samples/client/petstore/swift5/default/docs/AdditionalPropertiesClass.md @@ -11,9 +11,9 @@ Name | Type | Description | Notes **mapArrayAnytype** | [String: [AnyCodable]] | | [optional] **mapMapString** | [String: [String: String]] | | [optional] **mapMapAnytype** | [String: [String: AnyCodable]] | | [optional] -**anytype1** | [**AnyCodable**](.md) | | [optional] -**anytype2** | [**AnyCodable**](.md) | | [optional] -**anytype3** | [**AnyCodable**](.md) | | [optional] +**anytype1** | **AnyCodable** | | [optional] +**anytype2** | **AnyCodable** | | [optional] +**anytype3** | **AnyCodable** | | [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/client/petstore/swift5/swift5_test_all.sh b/samples/client/petstore/swift5/swift5_test_all.sh index c1d6899114a..902a476ef7d 100755 --- a/samples/client/petstore/swift5/swift5_test_all.sh +++ b/samples/client/petstore/swift5/swift5_test_all.sh @@ -14,6 +14,7 @@ mvn -f $DIRECTORY/urlsessionLibrary/SwaggerClientTests/pom.xml integration-test # spm build mvn -f $DIRECTORY/alamofireLibrary/pom.xml integration-test +mvn -f $DIRECTORY/anycodable/pom.xml integration-test mvn -f $DIRECTORY/asyncAwaitLibrary/pom.xml integration-test mvn -f $DIRECTORY/combineLibrary/pom.xml integration-test mvn -f $DIRECTORY/default/pom.xml integration-test diff --git a/samples/client/petstore/swift5/vaporLibrary/docs/AdditionalPropertiesClass.md b/samples/client/petstore/swift5/vaporLibrary/docs/AdditionalPropertiesClass.md index 1cffcdd8484..4d5f0963145 100644 --- a/samples/client/petstore/swift5/vaporLibrary/docs/AdditionalPropertiesClass.md +++ b/samples/client/petstore/swift5/vaporLibrary/docs/AdditionalPropertiesClass.md @@ -11,9 +11,9 @@ Name | Type | Description | Notes **mapArrayAnytype** | [String: [AnyCodable]] | | [optional] **mapMapString** | [String: [String: String]] | | [optional] **mapMapAnytype** | [String: [String: AnyCodable]] | | [optional] -**anytype1** | [**AnyCodable**](.md) | | [optional] -**anytype2** | [**AnyCodable**](.md) | | [optional] -**anytype3** | [**AnyCodable**](.md) | | [optional] +**anytype1** | **AnyCodable** | | [optional] +**anytype2** | **AnyCodable** | | [optional] +**anytype3** | **AnyCodable** | | [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) From 23cf8368e8c367fd8671f4e0238c81f5c99f1b27 Mon Sep 17 00:00:00 2001 From: Nick Ufer Date: Mon, 13 Mar 2023 15:40:16 +0100 Subject: [PATCH 030/131] [Rust] fix: removes replacement which makes x-tag-name incompatible with spec (#14746) --- .../org/openapitools/codegen/languages/RustClientCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java index 2aeefdbac00..fd7c018a1db 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java @@ -241,7 +241,7 @@ public class RustClientCodegen extends AbstractRustCodegen implements CodegenCon discriminatorVars.add(mas); } // TODO: figure out how to properly have the original property type that didn't go through toVarName - String vendorExtensionTagName = cm.discriminator.getPropertyName().replace("_", ""); + String vendorExtensionTagName = cm.discriminator.getPropertyName(); cm.vendorExtensions.put("x-tag-name", vendorExtensionTagName); cm.vendorExtensions.put("x-mapped-models", discriminatorVars); } From 245851116f571a6cdb1787728ecc08fe6ccfd745 Mon Sep 17 00:00:00 2001 From: KlausH09 <44837058+KlausH09@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:51:49 +0100 Subject: [PATCH 031/131] [Kotlin-Spring] add skip-default-interface option (#14662) --- docs/generators/kotlin-spring.md | 1 + .../languages/KotlinSpringServerCodegen.java | 12 ++++++++++ .../kotlin-spring/apiInterface.mustache | 4 ++-- .../spring/KotlinSpringServerCodegenTest.java | 22 +++++++++++++++++++ .../3_0/kotlin/skip-default-interface.yaml | 13 +++++++++++ 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/kotlin/skip-default-interface.yaml diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index 339497621d1..8c4f3e6b340 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -44,6 +44,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |serverPort|configuration the port in which the sever is to run on| |8080| |serviceImplementation|generate stub service implementations that extends service interfaces. If this is set to true service interfaces will also be generated| |false| |serviceInterface|generate service interfaces to go alongside controllers. In most cases this option would be used to update an existing project, so not to override implementations. Useful to help facilitate the generation gap pattern| |false| +|skipDefaultInterface|Whether to skip generation of default implementations for interfaces| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null| |sourceFolder|source folder for generated code| |src/main/kotlin| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 266cb6ccbad..2be4589572a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -66,6 +66,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String GRADLE_BUILD_FILE = "gradleBuildFile"; public static final String SERVICE_INTERFACE = "serviceInterface"; public static final String SERVICE_IMPLEMENTATION = "serviceImplementation"; + public static final String SKIP_DEFAULT_INTERFACE = "skipDefaultInterface"; public static final String REACTIVE = "reactive"; public static final String INTERFACE_ONLY = "interfaceOnly"; public static final String DELEGATE_PATTERN = "delegatePattern"; @@ -79,6 +80,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen private String serverPort = "8080"; private String title = "OpenAPI Kotlin Spring"; private boolean useBeanValidation = true; + private boolean skipDefaultInterface = false; private boolean exceptionHandler = true; private boolean gradleBuildFile = true; private boolean useSwaggerUI = true; @@ -153,6 +155,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen addSwitch(SERVICE_IMPLEMENTATION, "generate stub service implementations that extends service " + "interfaces. If this is set to true service interfaces will also be generated", serviceImplementation); addSwitch(USE_BEANVALIDATION, "Use BeanValidation API annotations to validate data types", useBeanValidation); + addSwitch(SKIP_DEFAULT_INTERFACE, "Whether to skip generation of default implementations for interfaces", skipDefaultInterface); addSwitch(REACTIVE, "use coroutines for reactive behavior", reactive); addSwitch(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.", interfaceOnly); addSwitch(DELEGATE_PATTERN, "Whether to generate the server files using the delegate pattern", delegatePattern); @@ -334,6 +337,10 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen this.useBeanValidation = useBeanValidation; } + public void setSkipDefaultInterface(boolean skipDefaultInterface) { + this.skipDefaultInterface = skipDefaultInterface; + } + public boolean isReactive() { return reactive; } @@ -492,6 +499,11 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen } writePropertyBack(USE_BEANVALIDATION, useBeanValidation); + if (additionalProperties.containsKey(SKIP_DEFAULT_INTERFACE)) { + this.setSkipDefaultInterface(convertPropertyToBoolean(SKIP_DEFAULT_INTERFACE)); + } + writePropertyBack(SKIP_DEFAULT_INTERFACE, skipDefaultInterface); + if (additionalProperties.containsKey(REACTIVE) && library.equals(SPRING_BOOT)) { this.setReactive(convertPropertyToBoolean(REACTIVE)); // spring webflux doesn't support @ControllerAdvice diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index 25c2fca6c56..3617cb42371 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -96,14 +96,14 @@ interface {{classname}} { produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): ResponseEntity<{{>returnTypes}}> { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): ResponseEntity<{{>returnTypes}}>{{^skipDefaultInterface}} { {{^isDelegate}} return {{>returnValue}} {{/isDelegate}} {{#isDelegate}} return getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) {{/isDelegate}} - } + }{{/skipDefaultInterface}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index c894c899c2b..87f8db53477 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -386,6 +386,28 @@ public class KotlinSpringServerCodegenTest { ); } + @Test(description = "test skip default interface") + public void skipDefaultInterface() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INTERFACE_ONLY, true); + codegen.additionalProperties().put(KotlinSpringServerCodegen.SKIP_DEFAULT_INTERFACE, true); + + new DefaultGenerator().opts(new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/skip-default-interface.yaml")) + .config(codegen)) + .generate(); + + assertFileNotContains( + Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PingApi.kt"), + "return " + ); + } + @Test(description = "use Spring boot 3 & jakarta extension") public void useSpringBoot3() throws Exception { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/skip-default-interface.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/skip-default-interface.yaml new file mode 100644 index 00000000000..7b9d60bac6e --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/skip-default-interface.yaml @@ -0,0 +1,13 @@ +openapi: "3.0.1" +info: + title: test + version: "1.0" + +paths: + + /ping: + get: + operationId: ping + responses: + 200: + description: OK From df58ee382932b7e9be9fdc7d7ab4ad38dbecdd54 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 13 Mar 2023 16:14:02 +0100 Subject: [PATCH 032/131] [Kotlin-Spring]: Dont't make readOnly properties nullable (#14509) Resolves #14280 --- .../src/main/resources/kotlin-spring/dataClassReqVar.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache index 400e0657600..3bcff990a7a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache @@ -1,4 +1,4 @@ {{#useBeanValidation}}{{>beanValidation}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}} @Schema({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{.}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}} @ApiModelProperty({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{.}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swagger1AnnotationLibrary}} - @get:JsonProperty("{{{baseName}}}", required = true){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInCamelCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}?{{/isReadOnly}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{#isReadOnly}}{{^defaultValue}} = null{{/defaultValue}}{{/isReadOnly}} \ No newline at end of file + @get:JsonProperty("{{{baseName}}}", required = true){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInCamelCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#defaultValue}} = {{{.}}}{{/defaultValue}} \ No newline at end of file From 59be28cc8a4018e4790a11473cbe4ff3fd28ddde Mon Sep 17 00:00:00 2001 From: Romain Bioteau Date: Mon, 13 Mar 2023 16:23:48 +0100 Subject: [PATCH 033/131] feat(password): add `isPassword` codegen property (#13982) Expose `isPassword` codegen property. This property can be used in the mustache templates to handle specific generation use case. _e.g._: * hiding the string value of password fields in generated toString() methods * use more specific types like `char[]` instead of `String` in [Java](https://stackoverflow.com/a/8881376) Closes https://github.com/OpenAPITools/openapi-generator/issues/9124 --- .../org/openapitools/codegen/CodegenParameter.java | 7 +++++-- .../org/openapitools/codegen/CodegenProperty.java | 5 ++++- .../org/openapitools/codegen/CodegenResponse.java | 5 ++++- .../java/org/openapitools/codegen/DefaultCodegen.java | 8 ++++++++ .../codegen/IJsonSchemaValidationProperties.java | 2 ++ .../org/openapitools/codegen/DefaultCodegenTest.java | 4 ++++ .../org/openapitools/codegen/java/JavaModelTest.java | 11 +++++++++++ 7 files changed, 38 insertions(+), 4 deletions(-) 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 ae723856989..53495455009 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 @@ -35,7 +35,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public String example; // example value (x-example) public String jsonSchema; public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, - isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isShort, isUnboundedInteger; + isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isPassword, isFreeFormObject, isAnyType, isShort, isUnboundedInteger; public boolean isArray, isMap; public boolean isFile; public boolean isEnum; @@ -229,6 +229,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { output.isUuid = this.isUuid; output.isUri = this.isUri; output.isEmail = this.isEmail; + output.isPassword = this.isPassword; output.isFreeFormObject = this.isFreeFormObject; output.isAnyType = this.isAnyType; output.isArray = this.isArray; @@ -244,7 +245,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, enumDefaultValue, enumName, style, isDeepObject, isAllowEmptyValue, 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, isDeprecated, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, isShort, isUnboundedInteger, hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, schema, content, requiredVarsMap, ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties); + return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumDefaultValue, enumName, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isPassword, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, isDeprecated, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, isShort, isUnboundedInteger, hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, schema, content, requiredVarsMap, ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties); } @Override @@ -281,6 +282,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { isUuid == that.isUuid && isUri == that.isUri && isEmail == that.isEmail && + isPassword == that.isPassword && isFreeFormObject == that.isFreeFormObject && isAnyType == that.isAnyType && isArray == that.isArray && @@ -394,6 +396,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { sb.append(", isUuid=").append(isUuid); sb.append(", isUri=").append(isUri); sb.append(", isEmail=").append(isEmail); + sb.append(", isPassword=").append(isPassword); sb.append(", isFreeFormObject=").append(isFreeFormObject); sb.append(", isAnyType=").append(isAnyType); sb.append(", isArray=").append(isArray); 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 6362fb93d80..0c7e171850e 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 @@ -134,6 +134,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti public boolean isUuid; public boolean isUri; public boolean isEmail; + public boolean isPassword; public boolean isNull; /** * The type is a free-form object, i.e. it is a map of string to values with no declared properties. @@ -1051,6 +1052,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti sb.append(", isUuid=").append(isUuid); sb.append(", isUri=").append(isUri); sb.append(", isEmail=").append(isEmail); + sb.append(", isPassword=").append(isPassword); sb.append(", isFreeFormObject=").append(isFreeFormObject); sb.append(", isArray=").append(isArray); sb.append(", isMap=").append(isMap); @@ -1142,6 +1144,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti isUuid == that.isUuid && isUri == that.isUri && isEmail == that.isEmail && + isPassword == that.isPassword && isFreeFormObject == that.isFreeFormObject && isArray == that.isArray && isMap == that.isMap && @@ -1231,7 +1234,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti exclusiveMinimum, exclusiveMaximum, required, deprecated, hasMoreNonReadOnly, isPrimitiveType, isModel, isContainer, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isFile, - isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, + isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isPassword, isFreeFormObject, isArray, isMap, isEnum, isInnerEnum, isEnumRef, isAnyType, isReadOnly, isWriteOnly, isNullable, isShort, isUnboundedInteger, isSelfReference, isCircularReference, isDiscriminator, isNew, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, 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 aa6b103b77c..edef0c709a3 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 @@ -50,6 +50,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { public boolean isDateTime; public boolean isUuid; public boolean isEmail; + public boolean isPassword; public boolean isModel; public boolean isFreeFormObject; public boolean isAnyType; @@ -98,7 +99,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { public int hashCode() { return Objects.hash(headers, code, message, examples, dataType, baseType, containerType, hasHeaders, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBoolean, isDate, - isDateTime, isUuid, isEmail, isModel, isFreeFormObject, isAnyType, isDefault, simpleType, primitiveType, + isDateTime, isUuid, isEmail, isPassword, isModel, isFreeFormObject, isAnyType, isDefault, simpleType, primitiveType, isMap, isArray, isBinary, isFile, schema, jsonSchema, vendorExtensions, items, additionalProperties, vars, requiredVars, isNull, hasValidation, isShort, isUnboundedInteger, getMaxProperties(), getMinProperties(), uniqueItems, getMaxItems(), getMinItems(), getMaxLength(), @@ -130,6 +131,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { isDateTime == that.isDateTime && isUuid == that.isUuid && isEmail == that.isEmail && + isPassword == that.isPassword && isModel == that.isModel && isFreeFormObject == that.isFreeFormObject && isAnyType == that.isAnyType && @@ -568,6 +570,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { sb.append(", isDateTime=").append(isDateTime); sb.append(", isUuid=").append(isUuid); sb.append(", isEmail=").append(isEmail); + sb.append(", isPassword=").append(isPassword); sb.append(", isModel=").append(isModel); sb.append(", isFreeFormObject=").append(isFreeFormObject); sb.append(", isAnyType=").append(isAnyType); 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 42d80759838..b4c77fffd37 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 @@ -3680,6 +3680,8 @@ public class DefaultCodegen implements CodegenConfig { property.isUri = true; } else if (ModelUtils.isEmailSchema(p)) { property.isEmail = true; + } else if (ModelUtils.isPasswordSchema(p)) { + property.isPassword = true; } else if (ModelUtils.isDateSchema(p)) { // date format property.setIsString(false); // for backward compatibility with 2.x property.isDate = true; @@ -4738,6 +4740,8 @@ public class DefaultCodegen implements CodegenConfig { } else if (ModelUtils.isStringSchema(responseSchema)) { if (ModelUtils.isEmailSchema(responseSchema)) { r.isEmail = true; + } else if (ModelUtils.isPasswordSchema(responseSchema)) { + r.isPassword = true; } else if (ModelUtils.isUUIDSchema(responseSchema)) { r.isUuid = true; } else if (ModelUtils.isByteArraySchema(responseSchema)) { @@ -6286,6 +6290,8 @@ public class DefaultCodegen implements CodegenConfig { } if (Boolean.TRUE.equals(property.isEmail) && Boolean.TRUE.equals(property.isString)) { parameter.isEmail = true; + } else if (Boolean.TRUE.equals(property.isPassword) && Boolean.TRUE.equals(property.isPassword)) { + parameter.isPassword = true; } else if (Boolean.TRUE.equals(property.isUuid) && Boolean.TRUE.equals(property.isString)) { parameter.isUuid = true; } else if (Boolean.TRUE.equals(property.isByteArray)) { @@ -6801,6 +6807,8 @@ public class DefaultCodegen implements CodegenConfig { } else if (ModelUtils.isStringSchema(ps)) { if (ModelUtils.isEmailSchema(ps)) { codegenParameter.isEmail = true; + } else if (ModelUtils.isPasswordSchema(ps)) { + codegenParameter.isPassword = true; } else if (ModelUtils.isUUIDSchema(ps)) { codegenParameter.isUuid = true; } else if (ModelUtils.isByteArraySchema(ps)) { 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 d5e8f7faa1f..55dbcbac3d5 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 @@ -247,6 +247,8 @@ public interface IJsonSchemaValidationProperties { ; } else if (ModelUtils.isEmailSchema(p)) { ; + } else if (ModelUtils.isPasswordSchema(p)) { + ; } else if (ModelUtils.isDateSchema(p)) { ; } else if (ModelUtils.isDateTimeSchema(p)) { 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 cd4a82d15f0..369b99f2c38 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 @@ -2473,6 +2473,10 @@ public class DefaultCodegenTest { assertTrue(names.contains("password")); assertTrue(names.contains("passwordConfirmation")); assertTrue(names.contains("oldPassword")); + + Optional passwordParameter = operation.formParams.stream().filter(p -> "password".equals(p.paramName)).findFirst(); + assertTrue(passwordParameter.isPresent()); + assertTrue(passwordParameter.get().isPassword); } @Test diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java index 224d10975fd..e0b97f867df 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java @@ -1125,6 +1125,17 @@ public class JavaModelTest { Assert.assertEquals(cp.maxLength, Integer.valueOf(10)); Assert.assertEquals(cp.pattern, "^[A-Z]+$"); } + + @Test(description = "convert string property with password format") + public void stringPropertyPasswordFormatTest() { + OpenAPI openAPI = TestUtils.createOpenAPI(); + final Schema property = new StringSchema().format("password"); + final DefaultCodegen codegen = new JavaClientCodegen(); + codegen.setOpenAPI(openAPI); + + final CodegenProperty cp = codegen.fromProperty("somePropertyWithPasswordFormat", property); + Assert.assertEquals(cp.isPassword, true); + } @Test(description = "convert string property in an object") public void stringPropertyInObjectTest() { From dbc6c82446cdaf89b74871839725e0c7ecc4922c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 13 Mar 2023 23:37:40 +0800 Subject: [PATCH 034/131] minor fix to isPassword (#14942) --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 2 +- .../java/org/openapitools/handler/PathHandlerInterface.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index b4c77fffd37..d03499b9916 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 @@ -6290,7 +6290,7 @@ public class DefaultCodegen implements CodegenConfig { } if (Boolean.TRUE.equals(property.isEmail) && Boolean.TRUE.equals(property.isString)) { parameter.isEmail = true; - } else if (Boolean.TRUE.equals(property.isPassword) && Boolean.TRUE.equals(property.isPassword)) { + } else if (Boolean.TRUE.equals(property.isPassword) && Boolean.TRUE.equals(property.isString)) { parameter.isPassword = true; } else if (Boolean.TRUE.equals(property.isUuid) && Boolean.TRUE.equals(property.isString)) { parameter.isUuid = true; diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java index d135549db32..e9c1b5b5893 100644 --- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java +++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java @@ -539,10 +539,10 @@ public interface PathHandlerInterface { *

          Response headers: [CodegenProperty{openApiType='integer', baseName='X-Rate-Limit', complexType='null', getter='getxRateLimit', setter='setxRateLimit', description='calls per hour allowed by the user', dataType='Integer', datatypeWithEnum='Integer', dataFormat='int32', name='xRateLimit', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Rate-Limit;', baseType='Integer', containerType='null', title='null', unescapedDescription='calls per hour allowed by the user', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "integer", "format" : "int32" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isShort=true, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isEnumRef=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, isNew=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false, format=int32, dependentRequired=null, contains=null}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when token expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when token expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isShort=true, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isPassword=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isEnumRef=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, isNew=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false, format=int32, dependentRequired=null, contains=null}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when token expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when token expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "string", "format" : "date-time" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isEnumRef=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, isNew=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false, format=date-time, dependentRequired=null, contains=null}]

          +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isPassword=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isEnumRef=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, isNew=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false, format=date-time, dependentRequired=null, contains=null}]

          * *

          Produces: [{mediaType=application/xml}, {mediaType=application/json}]

          *

          Returns: {@link String}

          From e52a9fd9613dda74559d8c81307f1892d15f5774 Mon Sep 17 00:00:00 2001 From: Mathias Dierickx Date: Mon, 13 Mar 2023 17:29:03 +0100 Subject: [PATCH 035/131] Add missing ConfigureAwaits for csharp-netcore generator (#13664) --- .../auth/OAuthAuthenticator.mustache | 4 ++-- .../libraries/httpclient/ApiClient.mustache | 24 +++++++++---------- .../Client/Auth/OAuthAuthenticator.cs | 4 ++-- .../src/Org.OpenAPITools/Client/ApiClient.cs | 24 +++++++++---------- .../Client/Auth/OAuthAuthenticator.cs | 4 ++-- .../Client/Auth/OAuthAuthenticator.cs | 4 ++-- .../Client/Auth/OAuthAuthenticator.cs | 4 ++-- .../Client/Auth/OAuthAuthenticator.cs | 4 ++-- .../Client/Auth/OAuthAuthenticator.cs | 4 ++-- .../Client/Auth/OAuthAuthenticator.cs | 4 ++-- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthAuthenticator.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthAuthenticator.mustache index cc0b3894a07..1f811bf2412 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthAuthenticator.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthAuthenticator.mustache @@ -63,7 +63,7 @@ namespace {{packageName}}.Client.Auth /// An authentication parameter. protected override async ValueTask GetAuthenticationParameter(string accessToken) { - var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token; + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; return new HeaderParameter(KnownHeaders.Authorization, token); } @@ -80,7 +80,7 @@ namespace {{packageName}}.Client.Auth .AddParameter("grant_type", _grantType) .AddParameter("client_id", _clientId) .AddParameter("client_secret", _clientSecret); - var response = await client.PostAsync(request); + var response = await client.PostAsync(request).ConfigureAwait(false); return $"{response.TokenType} {response.AccessToken}"; } } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache index bbc95b2bd5d..021fcb79a38 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache @@ -79,7 +79,7 @@ namespace {{packageName}}.Client public async Task Deserialize(HttpResponseMessage response) { - var result = (T) await Deserialize(response, typeof(T)); + var result = (T) await Deserialize(response, typeof(T)).ConfigureAwait(false); return result; } @@ -95,17 +95,17 @@ namespace {{packageName}}.Client if (type == typeof(byte[])) // return byte array { - return await response.Content.ReadAsByteArrayAsync(); + return await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false); } else if (type == typeof(FileParameter)) { - return new FileParameter(await response.Content.ReadAsStreamAsync()); + return new FileParameter(await response.Content.ReadAsStreamAsync().ConfigureAwait(false)); } // TODO: ? if (type.IsAssignableFrom(typeof(Stream))) if (type == typeof(Stream)) { - var bytes = await response.Content.ReadAsByteArrayAsync(); + var bytes = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false); if (headers != null) { var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath) @@ -129,18 +129,18 @@ namespace {{packageName}}.Client if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object { - return DateTime.Parse(await response.Content.ReadAsStringAsync(), null, System.Globalization.DateTimeStyles.RoundtripKind); + return DateTime.Parse(await response.Content.ReadAsStringAsync().ConfigureAwait(false), null, System.Globalization.DateTimeStyles.RoundtripKind); } if (type == typeof(string) || type.Name.StartsWith("System.Nullable")) // return primitive type { - return Convert.ChangeType(await response.Content.ReadAsStringAsync(), type); + return Convert.ChangeType(await response.Content.ReadAsStringAsync().ConfigureAwait(false), type); } // at this point, it must be a model (json) try { - return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync(), type, _serializerSettings); + return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync().ConfigureAwait(false), type, _serializerSettings); } catch (Exception e) { @@ -401,7 +401,7 @@ namespace {{packageName}}.Client private async Task> ToApiResponse(HttpResponseMessage response, object responseData, Uri uri) { T result = (T) responseData; - string rawContent = await response.Content.ReadAsStringAsync(); + string rawContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); var transformed = new ApiResponse(response.StatusCode, new Multimap({{#caseInsensitiveResponseHeaders}}StringComparer.OrdinalIgnoreCase{{/caseInsensitiveResponseHeaders}}), result, rawContent) { @@ -514,10 +514,10 @@ namespace {{packageName}}.Client if (!response.IsSuccessStatusCode) { - return await ToApiResponse(response, default(T), req.RequestUri); + return await ToApiResponse(response, default(T), req.RequestUri).ConfigureAwait(false); } - object responseData = await deserializer.Deserialize(response); + object responseData = await deserializer.Deserialize(response).ConfigureAwait(false); // if the response type is oneOf/anyOf, call FromJSON to deserialize the data if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) @@ -526,12 +526,12 @@ namespace {{packageName}}.Client } else if (typeof(T).Name == "Stream") // for binary response { - responseData = (T) (object) await response.Content.ReadAsStreamAsync(); + responseData = (T) (object) await response.Content.ReadAsStreamAsync().ConfigureAwait(false); } InterceptResponse(req, response); - return await ToApiResponse(response, responseData, req.RequestUri); + return await ToApiResponse(response, responseData, req.RequestUri).ConfigureAwait(false); } catch (OperationCanceledException original) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs index 8b0ba33499b..f64cfebe67d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Client.Auth /// An authentication parameter. protected override async ValueTask GetAuthenticationParameter(string accessToken) { - var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token; + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; return new HeaderParameter(KnownHeaders.Authorization, token); } @@ -88,7 +88,7 @@ namespace Org.OpenAPITools.Client.Auth .AddParameter("grant_type", _grantType) .AddParameter("client_id", _clientId) .AddParameter("client_secret", _clientSecret); - var response = await client.PostAsync(request); + var response = await client.PostAsync(request).ConfigureAwait(false); return $"{response.TokenType} {response.AccessToken}"; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs index 2c37082b956..f6e3372563a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs @@ -82,7 +82,7 @@ namespace Org.OpenAPITools.Client public async Task Deserialize(HttpResponseMessage response) { - var result = (T) await Deserialize(response, typeof(T)); + var result = (T) await Deserialize(response, typeof(T)).ConfigureAwait(false); return result; } @@ -98,17 +98,17 @@ namespace Org.OpenAPITools.Client if (type == typeof(byte[])) // return byte array { - return await response.Content.ReadAsByteArrayAsync(); + return await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false); } else if (type == typeof(FileParameter)) { - return new FileParameter(await response.Content.ReadAsStreamAsync()); + return new FileParameter(await response.Content.ReadAsStreamAsync().ConfigureAwait(false)); } // TODO: ? if (type.IsAssignableFrom(typeof(Stream))) if (type == typeof(Stream)) { - var bytes = await response.Content.ReadAsByteArrayAsync(); + var bytes = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false); if (headers != null) { var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath) @@ -132,18 +132,18 @@ namespace Org.OpenAPITools.Client if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object { - return DateTime.Parse(await response.Content.ReadAsStringAsync(), null, System.Globalization.DateTimeStyles.RoundtripKind); + return DateTime.Parse(await response.Content.ReadAsStringAsync().ConfigureAwait(false), null, System.Globalization.DateTimeStyles.RoundtripKind); } if (type == typeof(string) || type.Name.StartsWith("System.Nullable")) // return primitive type { - return Convert.ChangeType(await response.Content.ReadAsStringAsync(), type); + return Convert.ChangeType(await response.Content.ReadAsStringAsync().ConfigureAwait(false), type); } // at this point, it must be a model (json) try { - return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync(), type, _serializerSettings); + return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync().ConfigureAwait(false), type, _serializerSettings); } catch (Exception e) { @@ -402,7 +402,7 @@ namespace Org.OpenAPITools.Client private async Task> ToApiResponse(HttpResponseMessage response, object responseData, Uri uri) { T result = (T) responseData; - string rawContent = await response.Content.ReadAsStringAsync(); + string rawContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); var transformed = new ApiResponse(response.StatusCode, new Multimap(), result, rawContent) { @@ -511,10 +511,10 @@ namespace Org.OpenAPITools.Client if (!response.IsSuccessStatusCode) { - return await ToApiResponse(response, default(T), req.RequestUri); + return await ToApiResponse(response, default(T), req.RequestUri).ConfigureAwait(false); } - object responseData = await deserializer.Deserialize(response); + object responseData = await deserializer.Deserialize(response).ConfigureAwait(false); // if the response type is oneOf/anyOf, call FromJSON to deserialize the data if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) @@ -523,12 +523,12 @@ namespace Org.OpenAPITools.Client } else if (typeof(T).Name == "Stream") // for binary response { - responseData = (T) (object) await response.Content.ReadAsStreamAsync(); + responseData = (T) (object) await response.Content.ReadAsStreamAsync().ConfigureAwait(false); } InterceptResponse(req, response); - return await ToApiResponse(response, responseData, req.RequestUri); + return await ToApiResponse(response, responseData, req.RequestUri).ConfigureAwait(false); } catch (OperationCanceledException original) { diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs index 8b0ba33499b..f64cfebe67d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Client.Auth /// An authentication parameter. protected override async ValueTask GetAuthenticationParameter(string accessToken) { - var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token; + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; return new HeaderParameter(KnownHeaders.Authorization, token); } @@ -88,7 +88,7 @@ namespace Org.OpenAPITools.Client.Auth .AddParameter("grant_type", _grantType) .AddParameter("client_id", _clientId) .AddParameter("client_secret", _clientSecret); - var response = await client.PostAsync(request); + var response = await client.PostAsync(request).ConfigureAwait(false); return $"{response.TokenType} {response.AccessToken}"; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs index 8b0ba33499b..f64cfebe67d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Client.Auth /// An authentication parameter. protected override async ValueTask GetAuthenticationParameter(string accessToken) { - var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token; + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; return new HeaderParameter(KnownHeaders.Authorization, token); } @@ -88,7 +88,7 @@ namespace Org.OpenAPITools.Client.Auth .AddParameter("grant_type", _grantType) .AddParameter("client_id", _clientId) .AddParameter("client_secret", _clientSecret); - var response = await client.PostAsync(request); + var response = await client.PostAsync(request).ConfigureAwait(false); return $"{response.TokenType} {response.AccessToken}"; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs index 8b0ba33499b..f64cfebe67d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Client.Auth /// An authentication parameter. protected override async ValueTask GetAuthenticationParameter(string accessToken) { - var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token; + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; return new HeaderParameter(KnownHeaders.Authorization, token); } @@ -88,7 +88,7 @@ namespace Org.OpenAPITools.Client.Auth .AddParameter("grant_type", _grantType) .AddParameter("client_id", _clientId) .AddParameter("client_secret", _clientSecret); - var response = await client.PostAsync(request); + var response = await client.PostAsync(request).ConfigureAwait(false); return $"{response.TokenType} {response.AccessToken}"; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs index 8b0ba33499b..f64cfebe67d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Client.Auth /// An authentication parameter. protected override async ValueTask GetAuthenticationParameter(string accessToken) { - var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token; + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; return new HeaderParameter(KnownHeaders.Authorization, token); } @@ -88,7 +88,7 @@ namespace Org.OpenAPITools.Client.Auth .AddParameter("grant_type", _grantType) .AddParameter("client_id", _clientId) .AddParameter("client_secret", _clientSecret); - var response = await client.PostAsync(request); + var response = await client.PostAsync(request).ConfigureAwait(false); return $"{response.TokenType} {response.AccessToken}"; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs index 8b0ba33499b..f64cfebe67d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Client.Auth /// An authentication parameter. protected override async ValueTask GetAuthenticationParameter(string accessToken) { - var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token; + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; return new HeaderParameter(KnownHeaders.Authorization, token); } @@ -88,7 +88,7 @@ namespace Org.OpenAPITools.Client.Auth .AddParameter("grant_type", _grantType) .AddParameter("client_id", _clientId) .AddParameter("client_secret", _clientSecret); - var response = await client.PostAsync(request); + var response = await client.PostAsync(request).ConfigureAwait(false); return $"{response.TokenType} {response.AccessToken}"; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs index b657ec45f5a..893e777536b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs @@ -71,7 +71,7 @@ namespace Org.OpenAPITools.Client.Auth /// An authentication parameter. protected override async ValueTask GetAuthenticationParameter(string accessToken) { - var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token; + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; return new HeaderParameter(KnownHeaders.Authorization, token); } @@ -88,7 +88,7 @@ namespace Org.OpenAPITools.Client.Auth .AddParameter("grant_type", _grantType) .AddParameter("client_id", _clientId) .AddParameter("client_secret", _clientSecret); - var response = await client.PostAsync(request); + var response = await client.PostAsync(request).ConfigureAwait(false); return $"{response.TokenType} {response.AccessToken}"; } } From e53b6fa7fa882657b48bd04439885423b0ed93d9 Mon Sep 17 00:00:00 2001 From: Eskild Diderichsen Date: Mon, 13 Mar 2023 17:35:44 +0100 Subject: [PATCH 036/131] Setup GitHub Codespaces (#13533) * Setup GitHub Codespaces * updated devcontainer to new format --- .devcontainer/devcontainer.json | 47 +++++++++ openapi-generator.code-workspace | 161 ++++++++++++++++--------------- 2 files changed, 131 insertions(+), 77 deletions(-) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000000..aeb7cc5dc94 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,47 @@ +{ + "name": "OpenAPIGenerator", + "image": "mcr.microsoft.com/devcontainers/base:debian", + "features": { + "ghcr.io/devcontainers/features/java:1": { + "version": "11", + "installMaven": true + }, + "ghcr.io/devcontainers/features/node:1": { + "version": "lts" + }, + "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {} + }, + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + "java.configuration.runtimes": [ + { + "name": "JavaSE-11", + "path": "/usr/local/sdkman/candidates/java/11.0.16.1-ms", + "sources": "/usr/local/sdkman/candidates/java/11.0.16.1-ms/lib/src.zip", + "javadoc": "https://docs.oracle.com/en/java/javase/11/docs/api", + "default": true + } + ] + }, + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "vscjava.vscode-java-pack", + "attilabuti.mustache-syntax-vscode", + "formulahendry.code-runner", + "visualstudioexptteam.vscodeintellicode", + "42crunch.vscode-openapi", + "mermade.openapi-lint" + ] + } + }, + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "mvn clean package -DskipTests", + // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode" +} diff --git a/openapi-generator.code-workspace b/openapi-generator.code-workspace index 94b0864b5d8..e94e7c5c3eb 100644 --- a/openapi-generator.code-workspace +++ b/openapi-generator.code-workspace @@ -1,78 +1,85 @@ { - "folders": [ - { - "name": "openapi-generator", - "path": "." - }, - { - "name": "openapi-generator-cli", - "path": "modules/openapi-generator-cli" - }, - { - "name": "openapi-generator-core", - "path": "modules/openapi-generator-core" - }, - { - "name": "openapi-generator-gradle-plugin", - "path": "modules/openapi-generator-gradle-plugin" - }, - { - "name": "openapi-generator-maven-plugin", - "path": "modules/openapi-generator-maven-plugin" - }, - { - "name": "openapi-generator-online", - "path": "modules/openapi-generator-online" - }, - ], - "settings": { - "editor.formatOnType": true, - "editor.linkedEditing": true, - "editor.tabCompletion": "on", - "editor.tabSize": 4, - "editor.renderWhitespace": "boundary", - "editor.suggest.shareSuggestSelections": true, - "editor.suggestSelection": "first", - "editor.semanticHighlighting.enabled": true, - "explorer.confirmDelete": true, - - "files.autoSave": "onFocusChange", - "files.exclude": { - "**/.classpath": true, - "**/.factorypath": true, - "**/.project": true, - "**/.settings": true - }, - "files.trimFinalNewlines": false, - "files.trimTrailingWhitespace": true, - - "task.saveBeforeRun": "always", - - "java.autobuild.enabled": false, - "java.completion.enabled": true, - "java.completion.guessMethodArguments": true, - "java.completion.maxResults": 5, - "java.format.onType.enabled": true, - - "java.referencesCodeLens.enabled": true, - "java.saveActions.organizeImports": true, - "java.showBuildStatusOnStart.enabled": true, - - "java.dependency.autoRefresh": true, - "java.dependency.refreshDelay": 3000, - "java.format.enabled": true, - - "maven.pomfile.autoUpdateEffectivePOM": true, - }, - "extensions": { - "recommendations": [ - "vscjava.vscode-java-pack", - "attilabuti.mustache-syntax-vscode", - "formulahendry.code-runner", - "visualstudioexptteam.vscodeintellicode", - "42crunch.vscode-openapi", - "mermade.openapi-lint" - - ] - } -} \ No newline at end of file + "folders": [ + { + "name": "openapi-generator", + "path": "." + }, + { + "name": "openapi-generator-cli", + "path": "modules/openapi-generator-cli" + }, + { + "name": "openapi-generator-core", + "path": "modules/openapi-generator-core" + }, + { + "name": "openapi-generator-gradle-plugin", + "path": "modules/openapi-generator-gradle-plugin" + }, + { + "name": "openapi-generator-maven-plugin", + "path": "modules/openapi-generator-maven-plugin" + }, + { + "name": "openapi-generator-online", + "path": "modules/openapi-generator-online" + } + ], + "settings": { + "editor.formatOnType": true, + "editor.linkedEditing": true, + "editor.tabCompletion": "on", + "editor.tabSize": 4, + "editor.renderWhitespace": "boundary", + "editor.suggest.shareSuggestSelections": true, + "editor.suggestSelection": "first", + "editor.semanticHighlighting.enabled": true, + "explorer.confirmDelete": true, + "files.autoSave": "onFocusChange", + "files.exclude": { + "**/.classpath": true, + "**/.factorypath": true, + "**/.project": true, + "**/.settings": true, + "modules/openapi-generator-cli": true, + "modules/openapi-generator-core": true, + "modules/openapi-generator-gradle-plugin": true, + "modules/openapi-generator-maven-plugin": true, + "modules/openapi-generator-online": true, + }, + "files.trimFinalNewlines": false, + "files.trimTrailingWhitespace": true, + "task.saveBeforeRun": "always", + "java.autobuild.enabled": false, + "java.completion.enabled": true, + "java.completion.guessMethodArguments": true, + "java.completion.maxResults": 5, + "java.format.onType.enabled": true, + "java.referencesCodeLens.enabled": true, + "java.saveActions.organizeImports": true, + "java.showBuildStatusOnStart.enabled": true, + "java.dependency.autoRefresh": true, + "java.dependency.refreshDelay": 3000, + "java.format.enabled": true, + "java.configuration.updateBuildConfiguration": "disabled", + "maven.pomfile.autoUpdateEffectivePOM": true, + "maven.excludedFolders": [ + "**/.*", + "**/node_modules", + "**/target", + "**/bin", + "**/archetype-resources", + "samples" + ] + }, + "extensions": { + "recommendations": [ + "vscjava.vscode-java-pack", + "attilabuti.mustache-syntax-vscode", + "formulahendry.code-runner", + "visualstudioexptteam.vscodeintellicode", + "42crunch.vscode-openapi", + "mermade.openapi-lint" + ] + } +} From ecd28b2090942102db8d4f60488922be04dd03d5 Mon Sep 17 00:00:00 2001 From: Yannick Wiesner Date: Mon, 13 Mar 2023 17:39:31 +0100 Subject: [PATCH 037/131] JAX-RS Spec: Stop generating @NotNull Validation for required & optional properties (#12575) * Stop generating @NotNull Validation for required & optional properties * correct linebreak and add tests * add samples in a separate folder --- ...s-spec-required-and-readonly-property.yaml | 10 + .../JavaJaxRS/spec/beanValidation.mustache | 6 +- .../jaxrs/JavaJAXRSSpecServerCodegenTest.java | 41 ++++ .../3_0/required-and-readonly-property.yaml | 38 ++++ .../.openapi-generator-ignore | 23 ++ .../.openapi-generator/FILES | 7 + .../.openapi-generator/VERSION | 1 + .../README.md | 27 +++ .../pom.xml | 139 ++++++++++++ .../org/openapitools/api/RestApplication.java | 9 + .../java/org/openapitools/api/UserApi.java | 30 +++ .../model/ReadonlyAndRequiredProperties.java | 200 ++++++++++++++++++ .../src/main/openapi/openapi.yaml | 41 ++++ 13 files changed, 568 insertions(+), 4 deletions(-) create mode 100644 bin/configs/jaxrs-spec-required-and-readonly-property.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/required-and-readonly-property.yaml create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator-ignore create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/FILES create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/README.md create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/pom.xml create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestApplication.java create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/UserApi.java create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/main/openapi/openapi.yaml diff --git a/bin/configs/jaxrs-spec-required-and-readonly-property.yaml b/bin/configs/jaxrs-spec-required-and-readonly-property.yaml new file mode 100644 index 00000000000..c6a1f257385 --- /dev/null +++ b/bin/configs/jaxrs-spec-required-and-readonly-property.yaml @@ -0,0 +1,10 @@ +generatorName: jaxrs-spec +outputDir: samples/server/petstore/jaxrs-spec-required-and-readonly-property +inputSpec: modules/openapi-generator/src/test/resources/3_0/required-and-readonly-property.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec +additionalProperties: + artifactId: jaxrs-spec-petstore-server + serializableModel: "true" + hideGenerationTimestamp: "true" + implicitHeadersRegex: (api_key|enum_header_string) + generateBuilders: "true" diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache index c8c6946fef6..6bed33003cb 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache @@ -1,4 +1,2 @@ -{{#required}} - @NotNull -{{/required}} -{{>beanValidationCore}} \ No newline at end of file +{{#required}}{{^isReadOnly}} @NotNull +{{/isReadOnly}}{{/required}}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index c9b9e27a4c7..d196bf25766 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java @@ -6,6 +6,7 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.parser.core.models.ParseOptions; +import org.assertj.core.condition.AllOf; import org.openapitools.codegen.*; import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.java.assertions.JavaFileAssert; @@ -754,4 +755,44 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { "@GZIP\n" ); } + + @Test + public void testHandleRequiredAndReadOnlyPropertiesCorrectly() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/required-and-readonly-property.yaml", null, new ParseOptions()).getOpenAPI(); + + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput() + .openAPI(openAPI) + .config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + Map files = generator.opts(input).generate().stream() + .collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("ReadonlyAndRequiredProperties.java")) + .hasProperty("requiredYesReadonlyYes") + .toType() + .assertMethod("getRequiredYesReadonlyYes") + .assertMethodAnnotations() + .hasSize(2) + .containsWithNameAndAttributes("ApiModelProperty", ImmutableMap.of("required", "true")) + // Mysteriously, but we need to surround the value with quotes if the Annotation only contains a single value + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"requiredYesReadonlyYes\"")) + .toMethod() + .toFileAssert() + .hasProperty("requiredYesReadonlyNo") + .toType() + .assertMethod("getRequiredYesReadonlyNo") + .assertMethodAnnotations() + .hasSize(3) + .containsWithNameAndAttributes("ApiModelProperty", ImmutableMap.of("required", "true")) + // Mysteriously, but we need to surround the value with quotes if the Annotation only contains a single value + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"requiredYesReadonlyNo\"")) + .containsWithName("NotNull"); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/required-and-readonly-property.yaml b/modules/openapi-generator/src/test/resources/3_0/required-and-readonly-property.yaml new file mode 100644 index 00000000000..25c43f7d202 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/required-and-readonly-property.yaml @@ -0,0 +1,38 @@ +openapi: 3.0.3 +info: + title: Title + description: Title + version: 1.0.0 +servers: + - url: 'https' +paths: + '/user': + get: + responses: + 200: + description: "success" + content: + application/json: + schema: + $ref: '#/components/schemas/ReadonlyAndRequiredProperties' + +components: + schemas: + ReadonlyAndRequiredProperties: + type: object + required: + - requiredYesReadonlyYes + - requiredYesReadonlyNo + properties: + requiredYesReadonlyYes: + type: string + readOnly: true + requiredYesReadonlyNo: + type: string + requiredNoReadonlyYes: + type: string + readOnly: true + requiredNoReadonlyNo: + type: string + + diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator-ignore b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/FILES b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/FILES new file mode 100644 index 00000000000..14bd2cb5106 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/FILES @@ -0,0 +1,7 @@ +.openapi-generator-ignore +README.md +pom.xml +src/gen/java/org/openapitools/api/RestApplication.java +src/gen/java/org/openapitools/api/UserApi.java +src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java +src/main/openapi/openapi.yaml diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION new file mode 100644 index 00000000000..89648de3311 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION @@ -0,0 +1 @@ +6.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/README.md b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/README.md new file mode 100644 index 00000000000..0f7a255fe52 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/README.md @@ -0,0 +1,27 @@ +# JAX-RS server with OpenAPI + +## Overview +This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using an +[OpenAPI-Spec](https://openapis.org), you can easily generate a server stub. + +This is an example of building a OpenAPI-enabled JAX-RS server. +This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework. + + +The JAX-RS implementation needs to be provided by the application server you are deploying on. + +To run the server from the command line, you can use maven to provision an start a TomEE Server. +Please execute the following: + +``` +mvn -Dtomee-embedded-plugin.http=8080 package org.apache.tomee.maven:tomee-embedded-maven-plugin:7.0.5:run +``` + +You can then call your server endpoints under: + +``` +http://localhost:8080/ +``` + +Note that if you have configured the `host` to be something other than localhost, the calls through +swagger-ui will be directed to that host and not localhost! diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/pom.xml b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/pom.xml new file mode 100644 index 00000000000..6bcd26f49ad --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/pom.xml @@ -0,0 +1,139 @@ + + 4.0.0 + org.openapitools + jaxrs-spec-petstore-server + war + jaxrs-spec-petstore-server + 1.0.0 + + + + src/main/java + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/gen/java + + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 + + false + + + + maven-failsafe-plugin + 2.6 + + + + integration-test + verify + + + + + + + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-version} + provided + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-version} + + + joda-time + joda-time + ${joda-version} + + + javax.annotation + javax.annotation-api + ${javax.annotation-api-version} + + + io.swagger + swagger-annotations + provided + 1.5.3 + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + junit + junit + ${junit-version} + test + + + org.testng + testng + 6.8.8 + test + + + junit + junit + + + snakeyaml + org.yaml + + + bsh + org.beanshell + + + + + + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} + provided + + + + 1.8 + ${java.version} + ${java.version} + UTF-8 + 2.9.9 + 4.13.2 + 2.10.13 + 1.3.2 + 2.0.2 + 2.1.6 + + diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestApplication.java new file mode 100644 index 00000000000..b85041070e9 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestApplication.java @@ -0,0 +1,9 @@ +package org.openapitools.api; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("") +public class RestApplication extends Application { + +} diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/UserApi.java new file mode 100644 index 00000000000..d7cc59f0ee5 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/UserApi.java @@ -0,0 +1,30 @@ +package org.openapitools.api; + +import org.openapitools.model.ReadonlyAndRequiredProperties; + +import javax.ws.rs.*; +import javax.ws.rs.core.Response; + +import io.swagger.annotations.*; + +import java.io.InputStream; +import java.util.Map; +import java.util.List; +import javax.validation.constraints.*; +import javax.validation.Valid; + +@Path("/user") +@Api(description = "the user API") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class UserApi { + + @GET + @Produces({ "application/json" }) + @ApiOperation(value = "", notes = "", response = ReadonlyAndRequiredProperties.class, tags={ }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "success", response = ReadonlyAndRequiredProperties.class) + }) + public Response userGet() { + return Response.ok().entity("magic!").build(); + } +} diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java new file mode 100644 index 00000000000..41eb7aa571a --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java @@ -0,0 +1,200 @@ +package org.openapitools.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import javax.validation.constraints.*; +import javax.validation.Valid; + +import io.swagger.annotations.*; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonTypeName; + + + +@JsonTypeName("ReadonlyAndRequiredProperties") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ReadonlyAndRequiredProperties implements Serializable { + + private @Valid String requiredYesReadonlyYes; + private @Valid String requiredYesReadonlyNo; + private @Valid String requiredNoReadonlyYes; + private @Valid String requiredNoReadonlyNo; + + protected ReadonlyAndRequiredProperties(ReadonlyAndRequiredPropertiesBuilder b) { + this.requiredYesReadonlyYes = b.requiredYesReadonlyYes;this.requiredYesReadonlyNo = b.requiredYesReadonlyNo;this.requiredNoReadonlyYes = b.requiredNoReadonlyYes;this.requiredNoReadonlyNo = b.requiredNoReadonlyNo; + } + + public ReadonlyAndRequiredProperties() { } + + /** + **/ + public ReadonlyAndRequiredProperties requiredYesReadonlyYes(String requiredYesReadonlyYes) { + this.requiredYesReadonlyYes = requiredYesReadonlyYes; + return this; + } + + + @ApiModelProperty(required = true, value = "") + @JsonProperty("requiredYesReadonlyYes") + public String getRequiredYesReadonlyYes() { + return requiredYesReadonlyYes; + } + + @JsonProperty("requiredYesReadonlyYes") + public void setRequiredYesReadonlyYes(String requiredYesReadonlyYes) { + this.requiredYesReadonlyYes = requiredYesReadonlyYes; + } + +/** + **/ + public ReadonlyAndRequiredProperties requiredYesReadonlyNo(String requiredYesReadonlyNo) { + this.requiredYesReadonlyNo = requiredYesReadonlyNo; + return this; + } + + + @ApiModelProperty(required = true, value = "") + @JsonProperty("requiredYesReadonlyNo") + @NotNull + public String getRequiredYesReadonlyNo() { + return requiredYesReadonlyNo; + } + + @JsonProperty("requiredYesReadonlyNo") + public void setRequiredYesReadonlyNo(String requiredYesReadonlyNo) { + this.requiredYesReadonlyNo = requiredYesReadonlyNo; + } + +/** + **/ + public ReadonlyAndRequiredProperties requiredNoReadonlyYes(String requiredNoReadonlyYes) { + this.requiredNoReadonlyYes = requiredNoReadonlyYes; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("requiredNoReadonlyYes") + public String getRequiredNoReadonlyYes() { + return requiredNoReadonlyYes; + } + + @JsonProperty("requiredNoReadonlyYes") + public void setRequiredNoReadonlyYes(String requiredNoReadonlyYes) { + this.requiredNoReadonlyYes = requiredNoReadonlyYes; + } + +/** + **/ + public ReadonlyAndRequiredProperties requiredNoReadonlyNo(String requiredNoReadonlyNo) { + this.requiredNoReadonlyNo = requiredNoReadonlyNo; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("requiredNoReadonlyNo") + public String getRequiredNoReadonlyNo() { + return requiredNoReadonlyNo; + } + + @JsonProperty("requiredNoReadonlyNo") + public void setRequiredNoReadonlyNo(String requiredNoReadonlyNo) { + this.requiredNoReadonlyNo = requiredNoReadonlyNo; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ReadonlyAndRequiredProperties readonlyAndRequiredProperties = (ReadonlyAndRequiredProperties) o; + return Objects.equals(this.requiredYesReadonlyYes, readonlyAndRequiredProperties.requiredYesReadonlyYes) && + Objects.equals(this.requiredYesReadonlyNo, readonlyAndRequiredProperties.requiredYesReadonlyNo) && + Objects.equals(this.requiredNoReadonlyYes, readonlyAndRequiredProperties.requiredNoReadonlyYes) && + Objects.equals(this.requiredNoReadonlyNo, readonlyAndRequiredProperties.requiredNoReadonlyNo); + } + + @Override + public int hashCode() { + return Objects.hash(requiredYesReadonlyYes, requiredYesReadonlyNo, requiredNoReadonlyYes, requiredNoReadonlyNo); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ReadonlyAndRequiredProperties {\n"); + + sb.append(" requiredYesReadonlyYes: ").append(toIndentedString(requiredYesReadonlyYes)).append("\n"); + sb.append(" requiredYesReadonlyNo: ").append(toIndentedString(requiredYesReadonlyNo)).append("\n"); + sb.append(" requiredNoReadonlyYes: ").append(toIndentedString(requiredNoReadonlyYes)).append("\n"); + sb.append(" requiredNoReadonlyNo: ").append(toIndentedString(requiredNoReadonlyNo)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + + public static ReadonlyAndRequiredPropertiesBuilder builder() { + return new ReadonlyAndRequiredPropertiesBuilderImpl(); + } + + private static final class ReadonlyAndRequiredPropertiesBuilderImpl extends ReadonlyAndRequiredPropertiesBuilder { + + @Override + protected ReadonlyAndRequiredPropertiesBuilderImpl self() { + return this; + } + + @Override + public ReadonlyAndRequiredProperties build() { + return new ReadonlyAndRequiredProperties(this); + } + } + + public static abstract class ReadonlyAndRequiredPropertiesBuilder> { + private String requiredYesReadonlyYes; + private String requiredYesReadonlyNo; + private String requiredNoReadonlyYes; + private String requiredNoReadonlyNo; + protected abstract B self(); + + public abstract C build(); + + public B requiredYesReadonlyYes(String requiredYesReadonlyYes) { + this.requiredYesReadonlyYes = requiredYesReadonlyYes; + return self(); + } + public B requiredYesReadonlyNo(String requiredYesReadonlyNo) { + this.requiredYesReadonlyNo = requiredYesReadonlyNo; + return self(); + } + public B requiredNoReadonlyYes(String requiredNoReadonlyYes) { + this.requiredNoReadonlyYes = requiredNoReadonlyYes; + return self(); + } + public B requiredNoReadonlyNo(String requiredNoReadonlyNo) { + this.requiredNoReadonlyNo = requiredNoReadonlyNo; + return self(); + } + } +} + diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/main/openapi/openapi.yaml new file mode 100644 index 00000000000..e3afb081034 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/main/openapi/openapi.yaml @@ -0,0 +1,41 @@ +openapi: 3.0.3 +info: + description: Title + title: Title + version: 1.0.0 +servers: +- url: https +paths: + /user: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ReadonlyAndRequiredProperties' + description: success + x-accepts: application/json +components: + schemas: + ReadonlyAndRequiredProperties: + example: + requiredYesReadonlyYes: requiredYesReadonlyYes + requiredNoReadonlyYes: requiredNoReadonlyYes + requiredYesReadonlyNo: requiredYesReadonlyNo + requiredNoReadonlyNo: requiredNoReadonlyNo + properties: + requiredYesReadonlyYes: + readOnly: true + type: string + requiredYesReadonlyNo: + type: string + requiredNoReadonlyYes: + readOnly: true + type: string + requiredNoReadonlyNo: + type: string + required: + - requiredYesReadonlyNo + - requiredYesReadonlyYes + type: object From f5d31c5214cad5f73c29c8fa54f595c709e1daac Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Tue, 14 Mar 2023 04:16:18 +0100 Subject: [PATCH 038/131] Log Warn Messages for ineffective Schema Validations, updated (#14759) * Implement WARN messages for ineffective schema validation constraints * Implement tests String, Number, Object schema validations * Implement HashSet to store Validations for different types * Revert Validation Helper functions; Add Test cases for Any and Boolean * Implement Unit Test for Array with inffective schema validations * Reformat Code; Optimize Imports * Add assertions to ineffective validation tests * Add Test case for Null Schema Validations * Adjust log level and message * Merge commit ... into issue-6491 --------- Co-authored-by: Chidu Nadig --- modules/openapi-generator/pom.xml | 6 + .../openapitools/codegen/DefaultCodegen.java | 50 +- .../codegen/utils/ModelUtils.java | 425 ++++++++++------ .../codegen/DefaultCodegenTest.java | 458 ++++++++++++++---- .../src/test/resources/3_0/issue6491.yaml | 124 +++++ .../src/test/resources/logback.xml | 11 + pom.xml | 7 +- 7 files changed, 805 insertions(+), 276 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/issue6491.yaml create mode 100644 modules/openapi-generator/src/test/resources/logback.xml diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 2627d347ff2..7645217c8b3 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -272,6 +272,12 @@ commons-io ${commons-io.version} + + ch.qos.logback + logback-classic + 1.2.11 + test + org.slf4j slf4j-ext 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 d03499b9916..758ea86e33e 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 @@ -25,11 +25,27 @@ import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache.Compiler; import com.samskivert.mustache.Mustache.Lambda; - +import io.swagger.v3.core.util.Json; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.PathItem; +import io.swagger.v3.oas.models.callbacks.Callback; +import io.swagger.v3.oas.models.examples.Example; +import io.swagger.v3.oas.models.headers.Header; +import io.swagger.v3.oas.models.media.*; +import io.swagger.v3.oas.models.parameters.*; +import io.swagger.v3.oas.models.responses.ApiResponse; +import io.swagger.v3.oas.models.responses.ApiResponses; +import io.swagger.v3.oas.models.security.OAuthFlow; +import io.swagger.v3.oas.models.security.OAuthFlows; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import io.swagger.v3.oas.models.servers.ServerVariable; +import io.swagger.v3.parser.util.SchemaTypeUtil; import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.text.StringEscapeUtils; import org.openapitools.codegen.CodegenDiscriminator.MappedModel; import org.openapitools.codegen.api.TemplatingEngineAdapter; import org.openapitools.codegen.config.GlobalSettings; @@ -634,7 +650,7 @@ public class DefaultCodegen implements CodegenConfig { parent.hasChildren = true; Schema parentSchema = this.openAPI.getComponents().getSchemas().get(parent.name); if (parentSchema == null) { - throw new NullPointerException(parent.name+" in "+this.openAPI.getComponents().getSchemas()); + throw new NullPointerException(parent.name + " in " + this.openAPI.getComponents().getSchemas()); } if (parentSchema.getDiscriminator() == null) { parent = allModels.get(parent.getParent()); @@ -2064,7 +2080,7 @@ public class DefaultCodegen implements CodegenConfig { if (encoding != null) { boolean styleGiven = true; Encoding.StyleEnum style = encoding.getStyle(); - if(style == null || style == Encoding.StyleEnum.FORM) { + if (style == null || style == Encoding.StyleEnum.FORM) { // (Unfortunately, swagger-parser-v3 will always provide 'form' // when style is not specified, so we can't detect that) style = Encoding.StyleEnum.FORM; @@ -2072,12 +2088,12 @@ public class DefaultCodegen implements CodegenConfig { } boolean explodeGiven = true; Boolean explode = encoding.getExplode(); - if(explode == null) { + if (explode == null) { explode = style == Encoding.StyleEnum.FORM; // Default to True when form, False otherwise explodeGiven = false; } - if(!styleGiven && !explodeGiven) { + if (!styleGiven && !explodeGiven) { // Ignore contentType if style or explode are specified. codegenParameter.contentType = encoding.getContentType(); } @@ -2085,7 +2101,7 @@ public class DefaultCodegen implements CodegenConfig { codegenParameter.style = style.toString(); codegenParameter.isDeepObject = Encoding.StyleEnum.DEEP_OBJECT == style; - if(codegenParameter.isContainer) { + if (codegenParameter.isContainer) { codegenParameter.isExplode = explode; String collectionFormat = getCollectionFormat(codegenParameter); codegenParameter.collectionFormat = StringUtils.isEmpty(collectionFormat) ? "csv" : collectionFormat; @@ -3032,7 +3048,6 @@ public class DefaultCodegen implements CodegenConfig { // referenced models here, component that refs another component which is a model // if a component references a schema which is not a generated model, the refed schema will be loaded into // schema by unaliasSchema and one of the above code paths will be taken - ; } if (schema.get$ref() != null) { m.setRef(schema.get$ref()); @@ -3942,7 +3957,7 @@ public class DefaultCodegen implements CodegenConfig { } property.baseType = getSchemaType(p); if (p.getXml() != null) { - property.isXmlWrapped = p.getXml().getWrapped() == null ? false : p.getXml().getWrapped(); + property.isXmlWrapped = p.getXml().getWrapped() != null && p.getXml().getWrapped(); property.xmlPrefix = p.getXml().getPrefix(); property.xmlNamespace = p.getXml().getNamespace(); property.xmlName = p.getXml().getName(); @@ -5052,7 +5067,7 @@ public class DefaultCodegen implements CodegenConfig { // the default value is false // https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#user-content-parameterexplode - codegenParameter.isExplode = parameter.getExplode() == null ? false : parameter.getExplode(); + codegenParameter.isExplode = parameter.getExplode() != null && parameter.getExplode(); // TODO revise collectionFormat, default collection format in OAS 3 appears to multi at least for query parameters // https://swagger.io/docs/specification/serialization/ @@ -5081,7 +5096,6 @@ public class DefaultCodegen implements CodegenConfig { if (ModelUtils.isShortSchema(parameterSchema)) { // int32/short format codegenParameter.isShort = true; } else { // unbounded integer - ; } } } else if (ModelUtils.isTypeObjectSchema(parameterSchema)) { @@ -5093,7 +5107,6 @@ public class DefaultCodegen implements CodegenConfig { } addVarsRequiredVarsAdditionalProps(parameterSchema, codegenParameter); } else if (ModelUtils.isNullType(parameterSchema)) { - ; } else if (ModelUtils.isAnyType(parameterSchema)) { // any schema with no type set, composed schemas often do this if (ModelUtils.isMapSchema(parameterSchema)) { // for map parameter @@ -5121,7 +5134,6 @@ public class DefaultCodegen implements CodegenConfig { } } else { // referenced schemas - ; } CodegenProperty codegenProperty = fromProperty(parameter.getName(), parameterSchema, false); @@ -6853,7 +6865,6 @@ public class DefaultCodegen implements CodegenConfig { if (ModelUtils.isShortSchema(ps)) { // int32/short format codegenParameter.isShort = true; } else { // unbounded integer - ; } } } else if (ModelUtils.isTypeObjectSchema(ps)) { @@ -6861,10 +6872,8 @@ public class DefaultCodegen implements CodegenConfig { codegenParameter.isFreeFormObject = true; } } else if (ModelUtils.isNullType(ps)) { - ; } else if (ModelUtils.isAnyType(ps)) { // any schema with no type set, composed schemas often do this - ; } else if (ModelUtils.isArraySchema(ps)) { Schema inner = getSchemaItems((ArraySchema) ps); CodegenProperty arrayInnerProperty = fromProperty("inner", inner, false); @@ -6905,7 +6914,6 @@ public class DefaultCodegen implements CodegenConfig { } } else { // referenced schemas - ; } if (Boolean.TRUE.equals(codegenProperty.isModel)) { @@ -7809,9 +7817,9 @@ public class DefaultCodegen implements CodegenConfig { return exceptions; } - private String name; - private String removeCharRegEx; - private List exceptions; + private final String name; + private final String removeCharRegEx; + private final List exceptions; @Override public boolean equals(Object o) { @@ -7983,7 +7991,7 @@ public class DefaultCodegen implements CodegenConfig { } private CodegenComposedSchemas getComposedSchemas(Schema schema) { - if (!(schema instanceof ComposedSchema) && schema.getNot()==null) { + if (!(schema instanceof ComposedSchema) && schema.getNot() == null) { return null; } Schema notSchema = schema.getNot(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 150bdc6a04e..c28a0a6a214 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -28,11 +28,12 @@ import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.responses.ApiResponse; +import io.swagger.v3.parser.ObjectMapperFactory; import io.swagger.v3.parser.core.models.AuthorizationValue; import io.swagger.v3.parser.util.ClasspathHelper; -import io.swagger.v3.parser.ObjectMapperFactory; import io.swagger.v3.parser.util.RemoteUrl; import io.swagger.v3.parser.util.SchemaTypeUtil; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.IJsonSchemaValidationProperties; @@ -41,18 +42,17 @@ import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.ModelsMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.commons.io.FileUtils; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.net.URI; import java.net.URLDecoder; -import java.util.*; -import java.util.Map.Entry; -import java.util.stream.Collectors; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.*; +import java.util.Map.Entry; +import java.util.stream.Collectors; import static org.openapitools.codegen.utils.OnceLogger.once; @@ -71,29 +71,30 @@ public class ModelUtils { private static final String freeFormExplicit = "x-is-free-form"; - private static ObjectMapper JSON_MAPPER, YAML_MAPPER; + private static final ObjectMapper JSON_MAPPER; + private static final ObjectMapper YAML_MAPPER; static { JSON_MAPPER = ObjectMapperFactory.createJson(); YAML_MAPPER = ObjectMapperFactory.createYaml(); } - public static void setDisallowAdditionalPropertiesIfNotPresent(boolean value) { - GlobalSettings.setProperty(disallowAdditionalPropertiesIfNotPresent, Boolean.toString(value)); - } - public static boolean isDisallowAdditionalPropertiesIfNotPresent() { return Boolean.parseBoolean(GlobalSettings.getProperty(disallowAdditionalPropertiesIfNotPresent, "true")); } - public static void setGenerateAliasAsModel(boolean value) { - GlobalSettings.setProperty(generateAliasAsModelKey, Boolean.toString(value)); + public static void setDisallowAdditionalPropertiesIfNotPresent(boolean value) { + GlobalSettings.setProperty(disallowAdditionalPropertiesIfNotPresent, Boolean.toString(value)); } public static boolean isGenerateAliasAsModel() { return Boolean.parseBoolean(GlobalSettings.getProperty(generateAliasAsModelKey, "false")); } + public static void setGenerateAliasAsModel(boolean value) { + GlobalSettings.setProperty(generateAliasAsModelKey, Boolean.toString(value)); + } + public static boolean isGenerateAliasAsModel(Schema schema) { return isGenerateAliasAsModel() || (schema.getExtensions() != null && schema.getExtensions().getOrDefault("x-generate-alias-as-model", false).equals(true)); } @@ -371,12 +372,6 @@ public class ModelUtils { } } - @FunctionalInterface - private static interface OpenAPISchemaVisitor { - - public void visit(Schema schema, String mimeType); - } - public static String getSimpleRef(String ref) { if (ref == null) { once(LOGGER).warn("Failed to get the schema name: null"); @@ -456,10 +451,7 @@ public class ModelUtils { } // must have at least one property - if (schema.getType() == null && schema.getProperties() != null && !schema.getProperties().isEmpty()) { - return true; - } - return false; + return schema.getType() == null && schema.getProperties() != null && !schema.getProperties().isEmpty(); } /** @@ -560,11 +552,7 @@ public class ModelUtils { return true; } - if (schema.getAdditionalProperties() instanceof Boolean && (Boolean) schema.getAdditionalProperties()) { - return true; - } - - return false; + return schema.getAdditionalProperties() instanceof Boolean && (Boolean) schema.getAdditionalProperties(); } /** @@ -582,28 +570,20 @@ public class ModelUtils { } public static boolean isStringSchema(Schema schema) { - if (schema instanceof StringSchema || SchemaTypeUtil.STRING_TYPE.equals(schema.getType())) { - return true; - } - return false; + return schema instanceof StringSchema || SchemaTypeUtil.STRING_TYPE.equals(schema.getType()); } public static boolean isIntegerSchema(Schema schema) { if (schema instanceof IntegerSchema) { return true; } - if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType())) { - return true; - } - return false; + return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()); } public static boolean isShortSchema(Schema schema) { - if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer - && SchemaTypeUtil.INTEGER32_FORMAT.equals(schema.getFormat())) { // format: short (int32) - return true; - } - return false; + // format: short (int32) + return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer + && SchemaTypeUtil.INTEGER32_FORMAT.equals(schema.getFormat()); } public static boolean isUnsignedIntegerSchema(Schema schema) { @@ -616,11 +596,9 @@ public class ModelUtils { } public static boolean isLongSchema(Schema schema) { - if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer - && SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat())) { // format: long (int64) - return true; - } - return false; + // format: long (int64) + return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer + && SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat()); } public static boolean isUnsignedLongSchema(Schema schema) { @@ -636,36 +614,26 @@ public class ModelUtils { if (schema instanceof BooleanSchema) { return true; } - if (SchemaTypeUtil.BOOLEAN_TYPE.equals(schema.getType())) { - return true; - } - return false; + return SchemaTypeUtil.BOOLEAN_TYPE.equals(schema.getType()); } public static boolean isNumberSchema(Schema schema) { if (schema instanceof NumberSchema) { return true; } - if (SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType())) { - return true; - } - return false; + return SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType()); } public static boolean isFloatSchema(Schema schema) { - if (SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType()) - && SchemaTypeUtil.FLOAT_FORMAT.equals(schema.getFormat())) { // format: float - return true; - } - return false; + // format: float + return SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType()) + && SchemaTypeUtil.FLOAT_FORMAT.equals(schema.getFormat()); } public static boolean isDoubleSchema(Schema schema) { - if (SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType()) - && SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat())) { // format: double - return true; - } - return false; + // format: double + return SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType()) + && SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat()); } public static boolean isDateSchema(Schema schema) { @@ -673,55 +641,45 @@ public class ModelUtils { return true; } - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.DATE_FORMAT.equals(schema.getFormat())) { // format: date - return true; - } - return false; + // format: date + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.DATE_FORMAT.equals(schema.getFormat()); } public static boolean isDateTimeSchema(Schema schema) { if (schema instanceof DateTimeSchema) { return true; } - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.DATE_TIME_FORMAT.equals(schema.getFormat())) { // format: date-time - return true; - } - return false; + // format: date-time + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.DATE_TIME_FORMAT.equals(schema.getFormat()); } public static boolean isPasswordSchema(Schema schema) { if (schema instanceof PasswordSchema) { return true; } - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.PASSWORD_FORMAT.equals(schema.getFormat())) { // double - return true; - } - return false; + // double + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.PASSWORD_FORMAT.equals(schema.getFormat()); } public static boolean isByteArraySchema(Schema schema) { if (schema instanceof ByteArraySchema) { return true; } - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.BYTE_FORMAT.equals(schema.getFormat())) { // format: byte - return true; - } - return false; + // format: byte + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.BYTE_FORMAT.equals(schema.getFormat()); } public static boolean isBinarySchema(Schema schema) { if (schema instanceof BinarySchema) { return true; } - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.BINARY_FORMAT.equals(schema.getFormat())) { // format: binary - return true; - } - return false; + // format: binary + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.BINARY_FORMAT.equals(schema.getFormat()); } public static boolean isFileSchema(Schema schema) { @@ -736,38 +694,30 @@ public class ModelUtils { if (schema instanceof UUIDSchema) { return true; } - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.UUID_FORMAT.equals(schema.getFormat())) { // format: uuid - return true; - } - return false; + // format: uuid + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.UUID_FORMAT.equals(schema.getFormat()); } public static boolean isURISchema(Schema schema) { - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && URI_FORMAT.equals(schema.getFormat())) { // format: uri - return true; - } - return false; + // format: uri + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && URI_FORMAT.equals(schema.getFormat()); } public static boolean isEmailSchema(Schema schema) { if (schema instanceof EmailSchema) { return true; } - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.EMAIL_FORMAT.equals(schema.getFormat())) { // format: email - return true; - } - return false; + // format: email + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.EMAIL_FORMAT.equals(schema.getFormat()); } public static boolean isDecimalSchema(Schema schema) { - if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) // type: string - && "number".equals(schema.getFormat())) { // format: number - return true; - } - return false; + // format: number + return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) // type: string + && "number".equals(schema.getFormat()); } /** @@ -896,14 +846,10 @@ public class ModelUtils { if (addlProps instanceof ObjectSchema) { ObjectSchema objSchema = (ObjectSchema) addlProps; // additionalProperties defined as {} - if (objSchema.getProperties() == null || objSchema.getProperties().isEmpty()) { - return true; - } + return objSchema.getProperties() == null || objSchema.getProperties().isEmpty(); } else if (addlProps instanceof Schema) { // additionalProperties defined as {} - if (addlProps.getType() == null && addlProps.get$ref() == null && (addlProps.getProperties() == null || addlProps.getProperties().isEmpty())) { - return true; - } + return addlProps.getType() == null && addlProps.get$ref() == null && (addlProps.getProperties() == null || addlProps.getProperties().isEmpty()); } } } @@ -1412,7 +1358,6 @@ public class ModelUtils { .collect(Collectors.toMap(entry -> entry.getKey(), entry -> entry.getValue().stream().map(e -> e.getKey()).collect(Collectors.toList()))); } - /** * Get the interfaces from the schema (composed) * @@ -1683,18 +1628,15 @@ public class ModelUtils { * either be null or a specified type: *

          * OptionalOrder: - * oneOf: - * - type: 'null' - * - $ref: '#/components/schemas/Order' + * oneOf: + * - type: 'null' + * - $ref: '#/components/schemas/Order' * * @param schema the OpenAPI schema * @return true if the schema is the 'null' type */ public static boolean isNullType(Schema schema) { - if ("null".equals(schema.getType())) { - return true; - } - return false; + return "null".equals(schema.getType()); } /** @@ -1715,47 +1657,90 @@ public class ModelUtils { public static void syncValidationProperties(Schema schema, IJsonSchemaValidationProperties target) { // TODO move this method to IJsonSchemaValidationProperties - if (schema != null && target != null) { - if (isNullType(schema) || schema.get$ref() != null || isBooleanSchema(schema)) { - return; - } - Integer minItems = schema.getMinItems(); - Integer maxItems = schema.getMaxItems(); - Boolean uniqueItems = schema.getUniqueItems(); - Integer minProperties = schema.getMinProperties(); - Integer maxProperties = schema.getMaxProperties(); - Integer minLength = schema.getMinLength(); - Integer maxLength = schema.getMaxLength(); - String pattern = schema.getPattern(); - BigDecimal multipleOf = schema.getMultipleOf(); - BigDecimal minimum = schema.getMinimum(); - BigDecimal maximum = schema.getMaximum(); - Boolean exclusiveMinimum = schema.getExclusiveMinimum(); - Boolean exclusiveMaximum = schema.getExclusiveMaximum(); + if (schema == null || + target == null || + schema.get$ref() != null) + return; + SchemaValidations.ValidationSetBuilder vSB = new SchemaValidations.ValidationSetBuilder(); - if (isArraySchema(schema)) { + Integer minItems = schema.getMinItems(); + if (minItems != null) vSB.withMinItems(); + + Integer maxItems = schema.getMaxItems(); + if (maxItems != null) vSB.withMaxItems(); + + Boolean uniqueItems = schema.getUniqueItems(); + if (uniqueItems != null) vSB.withUniqueItems(); + + Integer minProperties = schema.getMinProperties(); + if (minProperties != null) vSB.withMinProperties(); + + Integer maxProperties = schema.getMaxProperties(); + if (maxProperties != null) vSB.withMaxProperties(); + + Integer minLength = schema.getMinLength(); + if (minLength != null) vSB.withMinLength(); + + Integer maxLength = schema.getMaxLength(); + if (maxLength != null) vSB.withMaxLength(); + + String pattern = schema.getPattern(); + if (pattern != null) vSB.withPattern(); + + BigDecimal multipleOf = schema.getMultipleOf(); + if (multipleOf != null) vSB.withMultipleOf(); + + BigDecimal minimum = schema.getMinimum(); + if (minimum != null) vSB.withMinimum(); + + BigDecimal maximum = schema.getMaximum(); + if (maximum != null) vSB.withMaximum(); + + Boolean exclusiveMinimum = schema.getExclusiveMinimum(); + if (exclusiveMinimum != null) vSB.withExclusiveMinimum(); + + Boolean exclusiveMaximum = schema.getExclusiveMaximum(); + if (exclusiveMaximum != null) vSB.withExclusiveMaximum(); + + LinkedHashSet setValidations = vSB.build(); + + if (isBooleanSchema(schema) || isNullType(schema)) { + logWarnMessagesForIneffectiveValidations(setValidations, schema, new HashSet<>()); + } else if (isArraySchema(schema)) { + if (minItems != null || maxItems != null || uniqueItems != null) setArrayValidations(minItems, maxItems, uniqueItems, target); - } else if (isTypeObjectSchema(schema)) { + logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, SchemaValidations.ARRAY_VALIDATIONS); + } else if (isTypeObjectSchema(schema)) { + if (minProperties != null || maxProperties != null) setObjectValidations(minProperties, maxProperties, target); - } else if (isStringSchema(schema)) { + logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, SchemaValidations.OBJECT_VALIDATIONS); + } else if (isStringSchema(schema)) { + if (minLength != null || maxLength != null || pattern != null) setStringValidations(minLength, maxLength, pattern, target); - if (isDecimalSchema(schema)) { + if (isDecimalSchema(schema)) { + if (multipleOf != null || minimum != null || maximum != null || exclusiveMinimum != null || exclusiveMaximum != null) setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target); - } - } else if (isNumberSchema(schema) || isIntegerSchema(schema)) { - setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target); - } else if (isAnyType(schema)) { - // anyType can have any validations set on it - setArrayValidations(minItems, maxItems, uniqueItems, target); - setObjectValidations(minProperties, maxProperties, target); - setStringValidations(minLength, maxLength, pattern, target); - setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target); - } - if (maxItems != null || minItems != null || minProperties != null || maxProperties != null || minLength != null || maxLength != null || multipleOf != null || pattern != null || minimum != null || maximum != null || exclusiveMinimum != null || exclusiveMaximum != null || uniqueItems != null) { - target.setHasValidation(true); - } + Set stringAndNumericValidations = new HashSet<>(SchemaValidations.STRING_VALIDATIONS); + stringAndNumericValidations.addAll(SchemaValidations.NUMERIC_VALIDATIONS); + logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, stringAndNumericValidations); + } else + logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, SchemaValidations.STRING_VALIDATIONS); + + } else if (isNumberSchema(schema) || isIntegerSchema(schema)) { + if (multipleOf != null || minimum != null || maximum != null || exclusiveMinimum != null || exclusiveMaximum != null) + setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target); + logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, SchemaValidations.NUMERIC_VALIDATIONS); + } else if (isAnyType(schema)) { + // anyType can have any validations set on it + setArrayValidations(minItems, maxItems, uniqueItems, target); + setObjectValidations(minProperties, maxProperties, target); + setStringValidations(minLength, maxLength, pattern, target); + setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target); } + + if (!setValidations.isEmpty()) + target.setHasValidation(true); } private static void setArrayValidations(Integer minItems, Integer maxItems, Boolean uniqueItems, IJsonSchemaValidationProperties target) { @@ -1796,6 +1781,13 @@ public class ModelUtils { } } + private static void logWarnMessagesForIneffectiveValidations(Set setValidations, Schema schema, Set effectiveValidations) { + setValidations.removeAll(effectiveValidations); + setValidations.stream().forEach(validation -> { + LOGGER.warn("Validation '" + validation + "' has no effect on schema '"+ schema.getType() +"'. Ignoring!"); + }); + } + private static ObjectMapper getRightMapper(String data) { ObjectMapper mapper; if (data.trim().startsWith("{")) { @@ -1986,4 +1978,125 @@ public class ModelUtils { return false; } + + @FunctionalInterface + private interface OpenAPISchemaVisitor { + + void visit(Schema schema, String mimeType); + } + + private static final class SchemaValidations { + + public static Set ARRAY_VALIDATIONS = new ValidationSetBuilder() + .withMinItems() + .withMaxItems() + .withUniqueItems() + .build(); + public static Set OBJECT_VALIDATIONS = new ValidationSetBuilder() + .withMinProperties() + .withMaxProperties() + .build(); + public static Set STRING_VALIDATIONS = new ValidationSetBuilder() + .withMinLength() + .withMaxLength() + .withPattern() + .build(); + public static Set NUMERIC_VALIDATIONS = new ValidationSetBuilder() + .withMultipleOf() + .withMinimum() + .withMaximum() + .withExclusiveMinimum() + .withExclusiveMaximum() + .build(); + + public static Set ALL_VALIDATIONS; + + static { + ALL_VALIDATIONS = new HashSet<>(ARRAY_VALIDATIONS); + ALL_VALIDATIONS.addAll(OBJECT_VALIDATIONS); + ALL_VALIDATIONS.addAll(STRING_VALIDATIONS); + ALL_VALIDATIONS.addAll(NUMERIC_VALIDATIONS); + } + + SchemaValidations() { + } + + + public static class ValidationSetBuilder { + LinkedHashSet validationSet; + + ValidationSetBuilder() { + this.validationSet = new LinkedHashSet(); + } + + public ValidationSetBuilder withMinItems() { + this.validationSet.add("minItems"); + return this; + } + + public ValidationSetBuilder withMaxItems() { + this.validationSet.add("maxItems"); + return this; + } + + public ValidationSetBuilder withUniqueItems() { + this.validationSet.add("uniqueItems"); + return this; + } + + public ValidationSetBuilder withMinProperties() { + this.validationSet.add("minProperties"); + return this; + } + + public ValidationSetBuilder withMaxProperties() { + this.validationSet.add("maxProperties"); + return this; + } + + public ValidationSetBuilder withMinLength() { + this.validationSet.add("minLength"); + return this; + } + + public ValidationSetBuilder withMaxLength() { + this.validationSet.add("maxLength"); + return this; + } + + public ValidationSetBuilder withPattern() { + this.validationSet.add("pattern"); + return this; + } + + public ValidationSetBuilder withMultipleOf() { + this.validationSet.add("multipleOf"); + return this; + } + + public ValidationSetBuilder withMinimum() { + this.validationSet.add("minimum"); + return this; + } + + public ValidationSetBuilder withMaximum() { + this.validationSet.add("maximum"); + return this; + } + + public ValidationSetBuilder withExclusiveMinimum() { + this.validationSet.add("exclusiveMinimum"); + return this; + } + + public ValidationSetBuilder withExclusiveMaximum() { + this.validationSet.add("exclusiveMaximum"); + return this; + } + + public LinkedHashSet build() { + return this.validationSet; + } + } + } } 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 369b99f2c38..107fd4e72c4 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 @@ -17,9 +17,13 @@ package org.openapitools.codegen; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.read.ListAppender; import com.google.common.collect.Sets; import com.samskivert.mustache.Mustache.Lambda; - import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -33,18 +37,14 @@ import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.parser.core.models.ParseOptions; - import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.config.GlobalSettings; import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.ModelsMap; -import org.openapitools.codegen.templating.mustache.CamelCaseLambda; -import org.openapitools.codegen.templating.mustache.IndentedLambda; -import org.openapitools.codegen.templating.mustache.LowercaseLambda; -import org.openapitools.codegen.templating.mustache.TitlecaseLambda; -import org.openapitools.codegen.templating.mustache.UppercaseLambda; +import org.openapitools.codegen.templating.mustache.*; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.SemVer; +import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Ignore; import org.testng.annotations.Test; @@ -54,10 +54,13 @@ import java.nio.file.Files; import java.util.*; import java.util.stream.Collectors; +import static junit.framework.Assert.assertEquals; import static org.testng.Assert.*; public class DefaultCodegenTest { + private static final Logger testLogger = (Logger) LoggerFactory.getLogger(ModelUtils.class); + @Test public void testDeeplyNestedAdditionalPropertiesImports() { final DefaultCodegen codegen = new DefaultCodegen(); @@ -667,7 +670,6 @@ public class DefaultCodegenTest { Assert.assertTrue(colorSeen); } - @Test public void testEscapeText() { final DefaultCodegen codegen = new DefaultCodegen(); @@ -1591,7 +1593,6 @@ public class DefaultCodegenTest { assertEquals(cm.discriminator, discriminator); } - @Test public void testAllOfSingleRefNoOwnProps() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/composed-allof.yaml"); @@ -1605,14 +1606,6 @@ public class DefaultCodegenTest { Assert.assertNull(model.allParents); } - class CodegenWithMultipleInheritance extends DefaultCodegen { - public CodegenWithMultipleInheritance() { - super(); - supportsInheritance = true; - supportsMultipleInheritance = true; - } - } - @Test public void testAllOfParent() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf-required-parent.yaml"); @@ -2238,83 +2231,6 @@ public class DefaultCodegenTest { assertEquals(codegen.toApiName(""), "DefaultApi"); } - public static class FromParameter { - private CodegenParameter codegenParameter(String path) { - final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/fromParameter.yaml"); - new InlineModelResolver().flatten(openAPI); - final DefaultCodegen codegen = new DefaultCodegen(); - codegen.setOpenAPI(openAPI); - - return codegen - .fromParameter( - openAPI - .getPaths() - .get(path) - .getGet() - .getParameters() - .get(0), - new HashSet<>() - ); - } - - @Test - public void setStyle() { - CodegenParameter parameter = codegenParameter("/set_style"); - assertEquals(parameter.style, "form"); - } - - @Test - public void setShouldExplode() { - CodegenParameter parameter = codegenParameter("/set_should_explode"); - assertTrue(parameter.isExplode); - } - - @Test - public void testConvertPropertyToBooleanAndWriteBack_Boolean_true() { - final DefaultCodegen codegen = new DefaultCodegen(); - Map additionalProperties = codegen.additionalProperties(); - additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, true); - boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); - Assert.assertTrue(result); - } - - @Test - public void testConvertPropertyToBooleanAndWriteBack_Boolean_false() { - final DefaultCodegen codegen = new DefaultCodegen(); - Map additionalProperties = codegen.additionalProperties(); - additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, false); - boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); - Assert.assertFalse(result); - } - - @Test - public void testConvertPropertyToBooleanAndWriteBack_String_true() { - final DefaultCodegen codegen = new DefaultCodegen(); - Map additionalProperties = codegen.additionalProperties(); - additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "true"); - boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); - Assert.assertTrue(result); - } - - @Test - public void testConvertPropertyToBooleanAndWriteBack_String_false() { - final DefaultCodegen codegen = new DefaultCodegen(); - Map additionalProperties = codegen.additionalProperties(); - additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "false"); - boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); - Assert.assertFalse(result); - } - - @Test - public void testConvertPropertyToBooleanAndWriteBack_String_blibb() { - final DefaultCodegen codegen = new DefaultCodegen(); - Map additionalProperties = codegen.additionalProperties(); - additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "blibb"); - boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); - Assert.assertFalse(result); - } - } - @Test public void testCircularReferencesDetection() { // given @@ -2464,7 +2380,7 @@ public class DefaultCodegenTest { "post", path.getPost(), path.getServers()); - assertEquals(operation.formParams.size(), 3, + Assert.assertEquals(operation.formParams.size(), 3, "The list of parameters should include inherited type"); final List names = operation.formParams.stream() @@ -3750,7 +3666,7 @@ public class DefaultCodegenTest { modelName = "ObjectWithComposedProperties"; CodegenModel m = codegen.fromModel(modelName, openAPI.getComponents().getSchemas().get(modelName)); /* TODO inline allOf schema are created as separate models and the following assumptions that - the properties are non-model are no longer valid and need to be revised + the properties are non-model are no longer valid and need to be revised assertTrue(m.vars.get(0).getIsMap()); assertTrue(m.vars.get(1).getIsNumber()); assertTrue(m.vars.get(2).getIsUnboundedInteger()); @@ -4242,6 +4158,356 @@ public class DefaultCodegenTest { Assert.assertEquals(codegenParameter.getSchema(), null); } + @Test + public void testArraySchemaWithIneffectiveConstraints() { + + ListAppender listAppender = new ListAppender<>(); + listAppender.start(); + + // add the appender to the logger + testLogger.addAppender(listAppender); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + + String modelName = "ArrayWithIneffectiveValidations"; + Schema sc = openAPI.getComponents().getSchemas().get(modelName); + CodegenModel cm = codegen.fromModel(modelName, sc); + + + List logsList = listAppender.list; + + // JUnit assertions + assertEquals(16, logsList.size()); + assertEquals("Validation 'minProperties' has no effect on schema 'array'. Ignoring!", logsList.get(0) + .getMessage()); + assertEquals("Validation 'maxProperties' has no effect on schema 'array'. Ignoring!", logsList.get(1) + .getMessage()); + assertEquals("Validation 'minLength' has no effect on schema 'array'. Ignoring!", logsList.get(2) + .getMessage()); + assertEquals("Validation 'maxLength' has no effect on schema 'array'. Ignoring!", logsList.get(3) + .getMessage()); + assertEquals("Validation 'pattern' has no effect on schema 'array'. Ignoring!", logsList.get(4) + .getMessage()); + assertEquals("Validation 'multipleOf' has no effect on schema 'array'. Ignoring!", logsList.get(5) + .getMessage()); + assertEquals("Validation 'minimum' has no effect on schema 'array'. Ignoring!", logsList.get(6) + .getMessage()); + assertEquals("Validation 'maximum' has no effect on schema 'array'. Ignoring!", logsList.get(7) + .getMessage()); + + // Assert all logged messages are WARN messages + logsList.stream().limit(8).forEach(log -> assertEquals(Level.WARN, log.getLevel())); + } + + @Test + public void testObjectSchemaWithIneffectiveConstraints() { + + ListAppender listAppender = new ListAppender<>(); + listAppender.start(); + + // add the appender to the logger + testLogger.addAppender(listAppender); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + + String modelName = "ObjectWithIneffectiveValidations"; + Schema sc = openAPI.getComponents().getSchemas().get(modelName); + CodegenModel cm = codegen.fromModel(modelName, sc); + + List logsList = listAppender.list; + + // JUnit assertions + assertEquals(9, logsList.size()); + assertEquals("Validation 'minItems' has no effect on schema 'object'. Ignoring!", logsList.get(0) + .getMessage()); + assertEquals("Validation 'maxItems' has no effect on schema 'object'. Ignoring!", logsList.get(1) + .getMessage()); + assertEquals("Validation 'uniqueItems' has no effect on schema 'object'. Ignoring!", logsList.get(2) + .getMessage()); + assertEquals("Validation 'minLength' has no effect on schema 'object'. Ignoring!", logsList.get(3) + .getMessage()); + assertEquals("Validation 'maxLength' has no effect on schema 'object'. Ignoring!", logsList.get(4) + .getMessage()); + assertEquals("Validation 'pattern' has no effect on schema 'object'. Ignoring!", logsList.get(5) + .getMessage()); + assertEquals("Validation 'multipleOf' has no effect on schema 'object'. Ignoring!", logsList.get(6) + .getMessage()); + assertEquals("Validation 'minimum' has no effect on schema 'object'. Ignoring!", logsList.get(7) + .getMessage()); + assertEquals("Validation 'maximum' has no effect on schema 'object'. Ignoring!", logsList.get(8) + .getMessage()); + + // Assert all logged messages are WARN messages + logsList.stream().forEach(log -> assertEquals(Level.WARN, log.getLevel())); + } + + @Test + public void testStringSchemaWithIneffectiveConstraints() { + + ListAppender listAppender = new ListAppender<>(); + listAppender.start(); + + // add the appender to the logger + testLogger.addAppender(listAppender); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + + String modelName = "StringWithIneffectiveValidations"; + Schema sc = openAPI.getComponents().getSchemas().get(modelName); + CodegenModel cm = codegen.fromModel(modelName, sc); + + List logsList = listAppender.list; + + // JUnit assertions + assertEquals(8, logsList.size()); + assertEquals("Validation 'minItems' has no effect on schema 'string'. Ignoring!", logsList.get(0) + .getMessage()); + assertEquals("Validation 'maxItems' has no effect on schema 'string'. Ignoring!", logsList.get(1) + .getMessage()); + assertEquals("Validation 'uniqueItems' has no effect on schema 'string'. Ignoring!", logsList.get(2) + .getMessage()); + assertEquals("Validation 'minProperties' has no effect on schema 'string'. Ignoring!", logsList.get(3) + .getMessage()); + assertEquals("Validation 'maxProperties' has no effect on schema 'string'. Ignoring!", logsList.get(4) + .getMessage()); + assertEquals("Validation 'multipleOf' has no effect on schema 'string'. Ignoring!", logsList.get(5) + .getMessage()); + assertEquals("Validation 'minimum' has no effect on schema 'string'. Ignoring!", logsList.get(6) + .getMessage()); + assertEquals("Validation 'maximum' has no effect on schema 'string'. Ignoring!", logsList.get(7) + .getMessage()); + + // Assert all logged messages are WARN messages + logsList.stream().forEach(log -> assertEquals(Level.WARN, log.getLevel())); + } + + @Test + public void testIntegerSchemaWithIneffectiveConstraints() { + + ListAppender listAppender = new ListAppender<>(); + listAppender.start(); + + // add the appender to the logger + testLogger.addAppender(listAppender); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + + String modelName = "IntegerWithIneffectiveValidations"; + Schema sc = openAPI.getComponents().getSchemas().get(modelName); + CodegenModel cm = codegen.fromModel(modelName, sc); + + List logsList = listAppender.list; + + // JUnit assertions + assertEquals(8, logsList.size()); + assertEquals("Validation 'minItems' has no effect on schema 'integer'. Ignoring!", logsList.get(0) + .getMessage()); + assertEquals("Validation 'maxItems' has no effect on schema 'integer'. Ignoring!", logsList.get(1) + .getMessage()); + assertEquals("Validation 'uniqueItems' has no effect on schema 'integer'. Ignoring!", logsList.get(2) + .getMessage()); + assertEquals("Validation 'minProperties' has no effect on schema 'integer'. Ignoring!", logsList.get(3) + .getMessage()); + assertEquals("Validation 'maxProperties' has no effect on schema 'integer'. Ignoring!", logsList.get(4) + .getMessage()); + assertEquals("Validation 'minLength' has no effect on schema 'integer'. Ignoring!", logsList.get(5) + .getMessage()); + assertEquals("Validation 'maxLength' has no effect on schema 'integer'. Ignoring!", logsList.get(6) + .getMessage()); + assertEquals("Validation 'pattern' has no effect on schema 'integer'. Ignoring!", logsList.get(7) + .getMessage()); + + // Assert all logged messages are WARN messages + logsList.stream().forEach(log -> assertEquals(Level.WARN, log.getLevel())); + } + + @Test + public void testAnySchemaWithIneffectiveConstraints() { + + ListAppender listAppender = new ListAppender<>(); + listAppender.start(); + + // add the appender to the logger + testLogger.addAppender(listAppender); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + + String modelName = "AnyTypeWithIneffectiveValidations"; + Schema sc = openAPI.getComponents().getSchemas().get(modelName); + CodegenModel cm = codegen.fromModel(modelName, sc); + + List logsList = listAppender.list; + + // JUnit assertions + assertEquals(0, logsList.size()); + } + + @Test + public void testBooleanSchemaWithIneffectiveConstraints() { + + ListAppender listAppender = new ListAppender<>(); + listAppender.start(); + + // add the appender to the logger + testLogger.addAppender(listAppender); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + + String modelName = "BooleanWithIneffectiveValidations"; + Schema sc = openAPI.getComponents().getSchemas().get(modelName); + CodegenModel cm = codegen.fromModel(modelName, sc); + + List logsList = listAppender.list; + + // JUnit assertions + assertEquals(11, logsList.size()); + assertEquals("Validation 'minItems' has no effect on schema 'boolean'. Ignoring!", logsList.get(0) + .getMessage()); + assertEquals("Validation 'maxItems' has no effect on schema 'boolean'. Ignoring!", logsList.get(1) + .getMessage()); + assertEquals("Validation 'uniqueItems' has no effect on schema 'boolean'. Ignoring!", logsList.get(2) + .getMessage()); + assertEquals("Validation 'minProperties' has no effect on schema 'boolean'. Ignoring!", logsList.get(3) + .getMessage()); + assertEquals("Validation 'maxProperties' has no effect on schema 'boolean'. Ignoring!", logsList.get(4) + .getMessage()); + assertEquals("Validation 'minLength' has no effect on schema 'boolean'. Ignoring!", logsList.get(5) + .getMessage()); + assertEquals("Validation 'maxLength' has no effect on schema 'boolean'. Ignoring!", logsList.get(6) + .getMessage()); + assertEquals("Validation 'pattern' has no effect on schema 'boolean'. Ignoring!", logsList.get(7) + .getMessage()); + assertEquals("Validation 'multipleOf' has no effect on schema 'boolean'. Ignoring!", logsList.get(8) + .getMessage()); + assertEquals("Validation 'minimum' has no effect on schema 'boolean'. Ignoring!", logsList.get(9) + .getMessage()); + assertEquals("Validation 'maximum' has no effect on schema 'boolean'. Ignoring!", logsList.get(10) + .getMessage()); + + // Assert all logged messages are WARN messages + logsList.stream().forEach(log -> assertEquals(Level.WARN, log.getLevel())); + } + + @Test + public void testNullSchemaWithIneffectiveConstraints() { + + ListAppender listAppender = new ListAppender<>(); + listAppender.start(); + + // add the appender to the logger + testLogger.addAppender(listAppender); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + + String modelName = "NullWithIneffectiveValidations"; + Schema sc = openAPI.getComponents().getSchemas().get(modelName); + CodegenModel cm = codegen.fromModel(modelName, sc); + + List logsList = listAppender.list; + + // JUnit assertions + assertEquals(0, logsList.size()); + } + + public static class FromParameter { + private CodegenParameter codegenParameter(String path) { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/fromParameter.yaml"); + new InlineModelResolver().flatten(openAPI); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + + return codegen + .fromParameter( + openAPI + .getPaths() + .get(path) + .getGet() + .getParameters() + .get(0), + new HashSet<>() + ); + } + + @Test + public void setStyle() { + CodegenParameter parameter = codegenParameter("/set_style"); + assertEquals(parameter.style, "form"); + } + + @Test + public void setShouldExplode() { + CodegenParameter parameter = codegenParameter("/set_should_explode"); + assertTrue(parameter.isExplode); + } + + @Test + public void testConvertPropertyToBooleanAndWriteBack_Boolean_true() { + final DefaultCodegen codegen = new DefaultCodegen(); + Map additionalProperties = codegen.additionalProperties(); + additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, true); + boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); + Assert.assertTrue(result); + } + + @Test + public void testConvertPropertyToBooleanAndWriteBack_Boolean_false() { + final DefaultCodegen codegen = new DefaultCodegen(); + Map additionalProperties = codegen.additionalProperties(); + additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, false); + boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); + Assert.assertFalse(result); + } + + @Test + public void testConvertPropertyToBooleanAndWriteBack_String_true() { + final DefaultCodegen codegen = new DefaultCodegen(); + Map additionalProperties = codegen.additionalProperties(); + additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "true"); + boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); + Assert.assertTrue(result); + } + + @Test + public void testConvertPropertyToBooleanAndWriteBack_String_false() { + final DefaultCodegen codegen = new DefaultCodegen(); + Map additionalProperties = codegen.additionalProperties(); + additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "false"); + boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); + Assert.assertFalse(result); + } + + @Test + public void testConvertPropertyToBooleanAndWriteBack_String_blibb() { + final DefaultCodegen codegen = new DefaultCodegen(); + Map additionalProperties = codegen.additionalProperties(); + additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "blibb"); + boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); + Assert.assertFalse(result); + } + } + + class CodegenWithMultipleInheritance extends DefaultCodegen { + public CodegenWithMultipleInheritance() { + super(); + supportsInheritance = true; + supportsMultipleInheritance = true; + } + } + @Test public void testFromPropertyRequiredAndOptional() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_12857.yaml"); diff --git a/modules/openapi-generator/src/test/resources/3_0/issue6491.yaml b/modules/openapi-generator/src/test/resources/3_0/issue6491.yaml new file mode 100644 index 00000000000..a0076559ff2 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/issue6491.yaml @@ -0,0 +1,124 @@ +openapi: 3.0.1 +info: + title: My title + description: API under test + version: 1.0.7 +servers: + - url: https://localhost:9999/root +paths: + /location: + get: + operationId: getLocation + responses: + '200': + description: Success + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayWithIneffectiveValidations' +components: + schemas: + ArrayWithIneffectiveValidations: + type: array + items: {} + minProperties: 1 + maxProperties: 5 + minLength: 1 + maxLength: 5 + pattern: 'abcde' + multipleOf: 3 + minimum: 1 + maximum: 10 + exclusiveMinimum: 0 + exclusiveMaximum: 100 + + ObjectWithIneffectiveValidations: + type: object + properties: + id: + type: integer + name: + type: string + minItems: 1 + maxItems: 5 + uniqueItems: true + minLength: 1 + maxLength: 10 + pattern: 'abcde' + multipleOf: 3 + minimum: 1 + maximum: 10 + exclusiveMinimum: 1 + exclusiveMaximum: 10 + + + StringWithIneffectiveValidations: + type: string + minItems: 1 + maxItems: 5 + uniqueItems: true + minProperties: 1 + maxProperties: 5 + multipleOf: 3 + minimum: 1 + maximum: 10 + exclusiveMinimum: 0 + exclusiveMaximum: 100 + + IntegerWithIneffectiveValidations: + type: integer + minItems: 1 + maxItems: 5 + uniqueItems: true + minProperties: 1 + maxProperties: 5 + minLength: 1 + maxLength: 10 + pattern: 'abcde' + + AnyTypeWithIneffectiveValidations: + minItems: 1 + maxItems: 5 + uniqueItems: true + minProperties: 1 + maxProperties: 5 + minLength: 1 + maxLength: 10 + pattern: 'abcde' + multipleOf: 4 + minimum: 1 + maximum: 99 + exclusiveMinimum: 0 + exclusiveMaximum: 100 + + BooleanWithIneffectiveValidations: + type: boolean + minItems: 1 + maxItems: 5 + uniqueItems: true + minProperties: 1 + maxProperties: 5 + minLength: 1 + maxLength: 10 + pattern: 'abcde' + multipleOf: 4 + minimum: 1 + maximum: 99 + exclusiveMinimum: 0 + exclusiveMaximum: 100 + + NullWithIneffectiveValidations: + type: null + minItems: 1 + maxItems: 5 + uniqueItems: true + minProperties: 1 + maxProperties: 5 + minLength: 1 + maxLength: 10 + pattern: 'abcde' + multipleOf: 4 + minimum: 1 + maximum: 99 + exclusiveMinimum: 0 + exclusiveMaximum: 100 diff --git a/modules/openapi-generator/src/test/resources/logback.xml b/modules/openapi-generator/src/test/resources/logback.xml new file mode 100644 index 00000000000..dc582c2c8c6 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/logback.xml @@ -0,0 +1,11 @@ + + + + [%thread] %-5level %logger - %msg%n + + + + + + + diff --git a/pom.xml b/pom.xml index e7449a7c8a8..5bd7b38f536 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,11 @@ - + + org.sonatype.oss oss-parent 5 - + + 4.0.0 org.openapitools From 9fd989e2978b4240bcc83b39f1678d95b7cafbc7 Mon Sep 17 00:00:00 2001 From: Guillaume Turri Date: Tue, 14 Mar 2023 04:17:34 +0100 Subject: [PATCH 039/131] [PHP-Symfony] Fixes #14930 (#14933) * [PHP-Symfony] fixes validation of date-time parameter This fixes parts of #14930. Without this patch a parameter declared as date-time is validated against Symfony's "DateTime" constraint, which always fails. Because this constraint expects a string with format "Y-m-d H:i:s". It fails because the generated code performs the check after the deserialization, so the variable checked is not a string anymore. Besides this, even if we performed that validation on the string, that would not work well because OpenApi specification expects date-time to conform to RFC 3339 and that "Y-m-d H:i:s" would reject RFC 3339 compliant dates. With this change we ensure that the string provided by the web user could be parsed by PHP to DateTime, which solves both issues. (Note however that it means that it now accepts more formats than just RFC 3339 compliant ones for those parameters (it would accept all formats accepted by PHP DateTime). That being said it's compliant with the guideline ""be conservative in what you send, be liberal in what you accept") * [PHP-Symfony] Fix handling of null date-time parameter This fixes one of the issue described on #14930, namely that the deserializeString method of the generated class JsmSerializer returns null for other types of string, but not for date-time. Instead it returns a DateTime which represents "now" (because that what `new DateTime(null)` does). Consequently when an API declares a date-time parameter as non-required and when that endpoint is called without that parameters, then the user code would end up having "now" instead of "null" for this parameter. --- .../main/resources/php-symfony/api_input_validation.mustache | 2 +- .../resources/php-symfony/serialization/JmsSerializer.mustache | 2 +- .../php-symfony/SymfonyBundle-php/Service/JmsSerializer.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache index 299b64cd764..3cda7622c71 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache @@ -30,7 +30,7 @@ $asserts[] = new Assert\Date(); {{/isDate}} {{#isDateTime}} - $asserts[] = new Assert\DateTime(); + $asserts[] = new Assert\Type("DateTime"); {{/isDateTime}} {{^isDate}} {{^isDateTime}} diff --git a/modules/openapi-generator/src/main/resources/php-symfony/serialization/JmsSerializer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/serialization/JmsSerializer.mustache index 0cd5d36ca5c..444eef6760e 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/serialization/JmsSerializer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/serialization/JmsSerializer.mustache @@ -95,7 +95,7 @@ class JmsSerializer implements SerializerInterface break; case 'DateTime': case '\DateTime': - return new DateTime($data); + return is_null($data) ? null :new DateTime($data); default: throw new RuntimeException(sprintf("Type %s is unsupported", $type)); } diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Service/JmsSerializer.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Service/JmsSerializer.php index 2beafc6fa2d..379e7faf32a 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Service/JmsSerializer.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Service/JmsSerializer.php @@ -95,7 +95,7 @@ class JmsSerializer implements SerializerInterface break; case 'DateTime': case '\DateTime': - return new DateTime($data); + return is_null($data) ? null :new DateTime($data); default: throw new RuntimeException(sprintf("Type %s is unsupported", $type)); } From de35cbd01067c377cafa96df8eb30eb6127929fc Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 14 Mar 2023 11:36:17 +0800 Subject: [PATCH 040/131] update samples --- .../.openapi-generator/FILES | 2 +- .../.openapi-generator/VERSION | 2 +- .../README.md | 2 +- .../org/openapitools/api/RestApplication.java | 2 +- .../model/ReadonlyAndRequiredProperties.java | 15 +++++++++------ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/FILES b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/FILES index 14bd2cb5106..5bfc5850a3d 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/FILES +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/FILES @@ -1,7 +1,7 @@ -.openapi-generator-ignore README.md pom.xml src/gen/java/org/openapitools/api/RestApplication.java +src/gen/java/org/openapitools/api/RestResourceRoot.java src/gen/java/org/openapitools/api/UserApi.java src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java src/main/openapi/openapi.yaml diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION index 89648de3311..7f4d792ec2c 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION @@ -1 +1 @@ -6.0.1-SNAPSHOT \ No newline at end of file +6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/README.md b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/README.md index 0f7a255fe52..b9d190efc44 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/README.md +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/README.md @@ -10,7 +10,7 @@ This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework. The JAX-RS implementation needs to be provided by the application server you are deploying on. -To run the server from the command line, you can use maven to provision an start a TomEE Server. +To run the server from the command line, you can use maven to provision and start a TomEE Server. Please execute the following: ``` diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestApplication.java index b85041070e9..7df2d0fe333 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestApplication.java @@ -3,7 +3,7 @@ package org.openapitools.api; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("") +@ApplicationPath(RestResourceRoot.APPLICATION_PATH) public class RestApplication extends Application { } diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java index 41eb7aa571a..cf06a949cae 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/model/ReadonlyAndRequiredProperties.java @@ -18,17 +18,20 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ReadonlyAndRequiredProperties") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ReadonlyAndRequiredProperties implements Serializable { - private @Valid String requiredYesReadonlyYes; private @Valid String requiredYesReadonlyNo; private @Valid String requiredNoReadonlyYes; private @Valid String requiredNoReadonlyNo; protected ReadonlyAndRequiredProperties(ReadonlyAndRequiredPropertiesBuilder b) { - this.requiredYesReadonlyYes = b.requiredYesReadonlyYes;this.requiredYesReadonlyNo = b.requiredYesReadonlyNo;this.requiredNoReadonlyYes = b.requiredNoReadonlyYes;this.requiredNoReadonlyNo = b.requiredNoReadonlyNo; + this.requiredYesReadonlyYes = b.requiredYesReadonlyYes; + this.requiredYesReadonlyNo = b.requiredYesReadonlyNo; + this.requiredNoReadonlyYes = b.requiredNoReadonlyYes; + this.requiredNoReadonlyNo = b.requiredNoReadonlyNo; } - public ReadonlyAndRequiredProperties() { } + public ReadonlyAndRequiredProperties() { + } /** **/ @@ -49,7 +52,7 @@ public class ReadonlyAndRequiredProperties implements Serializable { this.requiredYesReadonlyYes = requiredYesReadonlyYes; } -/** + /** **/ public ReadonlyAndRequiredProperties requiredYesReadonlyNo(String requiredYesReadonlyNo) { this.requiredYesReadonlyNo = requiredYesReadonlyNo; @@ -69,7 +72,7 @@ public class ReadonlyAndRequiredProperties implements Serializable { this.requiredYesReadonlyNo = requiredYesReadonlyNo; } -/** + /** **/ public ReadonlyAndRequiredProperties requiredNoReadonlyYes(String requiredNoReadonlyYes) { this.requiredNoReadonlyYes = requiredNoReadonlyYes; @@ -88,7 +91,7 @@ public class ReadonlyAndRequiredProperties implements Serializable { this.requiredNoReadonlyYes = requiredNoReadonlyYes; } -/** + /** **/ public ReadonlyAndRequiredProperties requiredNoReadonlyNo(String requiredNoReadonlyNo) { this.requiredNoReadonlyNo = requiredNoReadonlyNo; From dc1386c1344bde346c0dd410612c47526bce9559 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Mon, 13 Mar 2023 23:40:40 -0400 Subject: [PATCH 041/131] better deserialization (#14945) --- .../languages/AbstractCSharpCodegen.java | 5 ++ .../generichost/JsonConverter.mustache | 59 ++++++++++++++----- .../src/Org.OpenAPITools/Model/Activity.cs | 3 +- .../ActivityOutputElementRepresentation.cs | 3 +- .../Model/AdditionalPropertiesClass.cs | 24 +++++--- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 3 +- .../src/Org.OpenAPITools/Model/AppleReq.cs | 3 +- .../Model/ArrayOfArrayOfNumberOnly.cs | 3 +- .../Model/ArrayOfNumberOnly.cs | 3 +- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 9 ++- .../src/Org.OpenAPITools/Model/Banana.cs | 3 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 6 +- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 3 +- .../src/Org.OpenAPITools/Model/Category.cs | 3 +- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 3 +- .../src/Org.OpenAPITools/Model/Drawing.cs | 12 ++-- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 3 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 18 +++++- .../Model/FileSchemaTestClass.cs | 6 +- .../Model/FooGetDefaultResponse.cs | 3 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 45 +++++++++----- .../src/Org.OpenAPITools/Model/MapTest.cs | 12 ++-- ...dPropertiesAndAdditionalPropertiesClass.cs | 12 ++-- .../Model/Model200Response.cs | 3 +- .../src/Org.OpenAPITools/Model/Name.cs | 9 ++- .../Org.OpenAPITools/Model/NullableClass.cs | 37 ++++++++---- .../Model/NullableGuidClass.cs | 6 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 3 +- .../Model/ObjectWithDeprecatedFields.cs | 9 ++- .../src/Org.OpenAPITools/Model/Order.cs | 15 +++-- .../Org.OpenAPITools/Model/OuterComposite.cs | 6 +- .../src/Org.OpenAPITools/Model/Pet.cs | 12 ++-- .../src/Org.OpenAPITools/Model/Return.cs | 3 +- .../Model/SpecialModelName.cs | 3 +- .../src/Org.OpenAPITools/Model/Tag.cs | 3 +- .../src/Org.OpenAPITools/Model/User.cs | 18 ++++-- .../src/Org.OpenAPITools/Model/Whale.cs | 6 +- .../src/Org.OpenAPITools/Model/Activity.cs | 3 +- .../ActivityOutputElementRepresentation.cs | 3 +- .../Model/AdditionalPropertiesClass.cs | 24 +++++--- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 3 +- .../src/Org.OpenAPITools/Model/AppleReq.cs | 3 +- .../Model/ArrayOfArrayOfNumberOnly.cs | 3 +- .../Model/ArrayOfNumberOnly.cs | 3 +- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 9 ++- .../src/Org.OpenAPITools/Model/Banana.cs | 3 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 6 +- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 3 +- .../src/Org.OpenAPITools/Model/Category.cs | 3 +- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 3 +- .../src/Org.OpenAPITools/Model/Drawing.cs | 12 ++-- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 3 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 18 +++++- .../Model/FileSchemaTestClass.cs | 6 +- .../Model/FooGetDefaultResponse.cs | 3 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 45 +++++++++----- .../src/Org.OpenAPITools/Model/MapTest.cs | 12 ++-- ...dPropertiesAndAdditionalPropertiesClass.cs | 12 ++-- .../Model/Model200Response.cs | 3 +- .../src/Org.OpenAPITools/Model/Name.cs | 9 ++- .../Org.OpenAPITools/Model/NullableClass.cs | 37 ++++++++---- .../Model/NullableGuidClass.cs | 6 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 3 +- .../Model/ObjectWithDeprecatedFields.cs | 9 ++- .../src/Org.OpenAPITools/Model/Order.cs | 15 +++-- .../Org.OpenAPITools/Model/OuterComposite.cs | 6 +- .../src/Org.OpenAPITools/Model/Pet.cs | 12 ++-- .../src/Org.OpenAPITools/Model/Return.cs | 3 +- .../Model/SpecialModelName.cs | 3 +- .../src/Org.OpenAPITools/Model/Tag.cs | 3 +- .../src/Org.OpenAPITools/Model/User.cs | 18 ++++-- .../src/Org.OpenAPITools/Model/Whale.cs | 6 +- .../src/Org.OpenAPITools/Model/AdultAllOf.cs | 3 +- .../src/Org.OpenAPITools/Model/Child.cs | 3 +- .../src/Org.OpenAPITools/Model/ChildAllOf.cs | 3 +- .../src/Org.OpenAPITools/Model/Banana.cs | 3 +- .../src/Org.OpenAPITools/Model/Banana.cs | 3 +- .../src/Org.OpenAPITools/Model/Activity.cs | 3 +- .../ActivityOutputElementRepresentation.cs | 3 +- .../Model/AdditionalPropertiesClass.cs | 24 +++++--- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 3 +- .../src/Org.OpenAPITools/Model/AppleReq.cs | 3 +- .../Model/ArrayOfArrayOfNumberOnly.cs | 3 +- .../Model/ArrayOfNumberOnly.cs | 3 +- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 9 ++- .../src/Org.OpenAPITools/Model/Banana.cs | 3 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 6 +- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 3 +- .../src/Org.OpenAPITools/Model/Category.cs | 3 +- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 3 +- .../src/Org.OpenAPITools/Model/Drawing.cs | 12 ++-- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 3 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 18 +++++- .../Model/FileSchemaTestClass.cs | 6 +- .../Model/FooGetDefaultResponse.cs | 3 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 45 +++++++++----- .../src/Org.OpenAPITools/Model/MapTest.cs | 12 ++-- ...dPropertiesAndAdditionalPropertiesClass.cs | 12 ++-- .../Model/Model200Response.cs | 3 +- .../src/Org.OpenAPITools/Model/Name.cs | 9 ++- .../Org.OpenAPITools/Model/NullableClass.cs | 37 ++++++++---- .../Model/NullableGuidClass.cs | 6 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 3 +- .../Model/ObjectWithDeprecatedFields.cs | 9 ++- .../src/Org.OpenAPITools/Model/Order.cs | 15 +++-- .../Org.OpenAPITools/Model/OuterComposite.cs | 6 +- .../src/Org.OpenAPITools/Model/Pet.cs | 12 ++-- .../src/Org.OpenAPITools/Model/Return.cs | 3 +- .../Model/SpecialModelName.cs | 3 +- .../src/Org.OpenAPITools/Model/Tag.cs | 3 +- .../src/Org.OpenAPITools/Model/User.cs | 18 ++++-- .../src/Org.OpenAPITools/Model/Whale.cs | 6 +- 112 files changed, 703 insertions(+), 315 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index f5329c992c8..36c56dc08fa 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -560,6 +560,11 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co property.datatypeWithEnum = property.datatypeWithEnum.replace("Dictionary>", property.items.datatypeWithEnum + ">"); property.dataType = property.datatypeWithEnum; } + + // HOTFIX: https://github.com/OpenAPITools/openapi-generator/issues/14944 + if (property.datatypeWithEnum.equals("decimal")) { + property.isDecimal = true; + } } /** Mitigates https://github.com/OpenAPITools/openapi-generator/issues/13709 */ diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache index 30f898e5481..f89022a166e 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache @@ -84,33 +84,44 @@ {{/isMap}} {{/isString}} {{#isBoolean}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetBoolean(); {{/isBoolean}} {{#isNumeric}} {{^isEnum}} {{#isDouble}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetDouble(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDouble(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); {{/isDouble}} {{#isDecimal}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetDecimal(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); {{/isDecimal}} {{#isFloat}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = (float)utf8JsonReader.GetDouble(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetDouble(out double {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = (float){{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result; + } {{/isFloat}} {{#isLong}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGet{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int64(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); {{/isLong}} {{^isLong}} {{^isFloat}} {{^isDecimal}} {{^isDouble}} - {{#isNullable}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(); - {{/isNullable}} - {{^isNullable}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(); - {{/isNullable}} + {{#isNullable}} + { + utf8JsonReader.TryGet{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(out {{#vendorExtensions.x-unsigned}}u{{/vendorExtensions.x-unsigned}}int {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result; + } + {{/isNullable}} + {{^isNullable}} + utf8JsonReader.TryGet{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); + {{/isNullable}} {{/isDouble}} {{/isDecimal}} {{/isFloat}} @@ -118,15 +129,21 @@ {{/isEnum}} {{/isNumeric}} {{#isDate}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); {{/isDate}} {{#isDateTime}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); {{/isDateTime}} {{#isEnum}} {{^isMap}} {{#isNumeric}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = ({{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}) utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGet{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(out {{#vendorExtensions.x-unsigned}}u{{/vendorExtensions.x-unsigned}}int {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = ({{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}){{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result; + } {{/isNumeric}} {{^isNumeric}} string {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue = utf8JsonReader.GetString(); @@ -140,7 +157,16 @@ {{/isMap}} {{/isEnum}} {{#isUuid}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + {{#isNullable}} + { + utf8JsonReader.TryGetGuid(out Guid {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result; + } + {{/isNullable}} + {{^isNullable}} + utf8JsonReader.TryGetGuid(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); + {{/isNullable}} {{/isUuid}} {{^isUuid}} {{^isEnum}} @@ -149,7 +175,8 @@ {{^isNumeric}} {{^isDate}} {{^isDateTime}} - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = JsonSerializer.Deserialize<{{{datatypeWithEnum}}}>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = JsonSerializer.Deserialize<{{{datatypeWithEnum}}}>(ref utf8JsonReader, jsonSerializerOptions); {{/isDateTime}} {{/isDate}} {{/isNumeric}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs index adfde11e807..dda45f9146c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "activity_outputs": - activityOutputs = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + activityOutputs = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index e1dc7b48ed1..242dedc5ea9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -141,7 +141,8 @@ namespace Org.OpenAPITools.Model prop1 = utf8JsonReader.GetString(); break; case "prop2": - prop2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + prop2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 855558ff890..50309f75441 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -214,28 +214,36 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "empty_map": - emptyMap = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + emptyMap = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_of_map_property": - mapOfMapProperty = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapOfMapProperty = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_property": - mapProperty = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapProperty = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_1": - mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_2": - mapWithUndeclaredPropertiesAnytype2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_3": - mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_string": - mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "anytype_1": - anytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs index 3d8432fe462..d60aa4487db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -151,7 +151,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "code": - code = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out code); break; case "message": message = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs index 352169dc60a..d1df77d776d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs @@ -134,7 +134,8 @@ namespace Org.OpenAPITools.Model cultivar = utf8JsonReader.GetString(); break; case "mealy": - mealy = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mealy = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 1d20521b20e..cbae88b5dc6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "ArrayArrayNumber": - arrayArrayNumber = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayNumber = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 2a3bfde63f3..703cdfac70a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "ArrayNumber": - arrayNumber = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayNumber = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs index 275cbe9514d..b8bbf687904 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -151,13 +151,16 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_array_of_integer": - arrayArrayOfInteger = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayOfInteger = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_array_of_model": - arrayArrayOfModel = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayOfModel = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_of_string": - arrayOfString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayOfString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs index 6b0800e2c0f..2662d8e166b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "lengthCm": - lengthCm = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out lengthCm); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs index 2c3af06b69d..13acd032c19 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs @@ -131,10 +131,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "lengthCm": - lengthCm = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out lengthCm); break; case "sweet": - sweet = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + sweet = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs index e5c54bbf47b..45f9fec45a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "declawed": - declawed = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + declawed = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs index 40760ae96fc..c5d8e8bd619 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs @@ -138,7 +138,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 6ab28150ceb..1ebc2f27b17 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -131,7 +131,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "dateOnlyProperty": - dateOnlyProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateOnlyProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs index 59da7b09ba9..1f024faf986 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs @@ -155,16 +155,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "mainShape": - mainShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mainShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "shapeOrNull": - shapeOrNull = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shapeOrNull = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "shapes": - shapes = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shapes = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "nullableShape": - nullableShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + nullableShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs index 8fbd4d1f573..aae49437300 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -238,7 +238,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_enum": - arrayEnum = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayEnum = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs index 8bc6e269703..e589516e041 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs @@ -486,13 +486,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "enum_integer": - enumInteger = (EnumTest.EnumIntegerEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumIntegerResult); + enumInteger = (EnumTest.EnumIntegerEnum)enumIntegerResult; + } break; case "enum_integer_only": - enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumIntegerOnlyResult); + enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)enumIntegerOnlyResult; + } break; case "enum_number": - enumNumber = (EnumTest.EnumNumberEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumNumberResult); + enumNumber = (EnumTest.EnumNumberEnum)enumNumberResult; + } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 8b420dd5dc2..a23a340595c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -138,10 +138,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "file": - file = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + file = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "files": - files = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + files = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 31e72dfb686..89584fbdd35 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "string": - stringProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + stringProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index fbc9ea8d776..2ec01bd02a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -466,37 +466,51 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "binary": - binary = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + binary = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "byte": - byteProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + byteProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "date": - date = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + date = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "dateTime": - dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "decimal": - decimalProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + decimalProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "double": - doubleProperty = utf8JsonReader.GetDouble(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDouble(out doubleProperty); break; case "float": - floatProperty = (float)utf8JsonReader.GetDouble(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetDouble(out double floatPropertyResult); + floatProperty = (float)floatPropertyResult; + } break; case "int32": - int32 = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out int32); break; case "int64": - int64 = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out int64); break; case "integer": - integer = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out integer); break; case "number": - number = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out number); break; case "password": password = utf8JsonReader.GetString(); @@ -511,13 +525,16 @@ namespace Org.OpenAPITools.Model stringProperty = utf8JsonReader.GetString(); break; case "unsigned_integer": - unsignedInteger = utf8JsonReader.GetUInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetUInt32(out unsignedInteger); break; case "unsigned_long": - unsignedLong = utf8JsonReader.GetUInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetUInt64(out unsignedLong); break; case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuid); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs index c2e43608be8..0341d1338b9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs @@ -214,16 +214,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "direct_map": - directMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + directMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "indirect_map": - indirectMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + indirectMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_map_of_string": - mapMapOfString = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapMapOfString = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_of_enum_string": - mapOfEnumString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapOfEnumString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 2b338b9ac91..a4fcf52ae21 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -176,16 +176,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "dateTime": - dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map": - map = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + map = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuid); break; case "uuid_with_pattern": - uuidWithPattern = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuidWithPattern); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs index 99b8a6384a6..1af87fa790b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs @@ -141,7 +141,8 @@ namespace Org.OpenAPITools.Model classProperty = utf8JsonReader.GetString(); break; case "name": - name = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out name); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs index 131673578ad..d3937718893 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs @@ -201,16 +201,19 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "name": - nameProperty = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out nameProperty); break; case "property": property = utf8JsonReader.GetString(); break; case "snake_case": - snakeCase = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out snakeCase); break; case "123Number": - _123number = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out _123number); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs index c6f757d9bc3..6fa35f45630 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs @@ -242,39 +242,54 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_items_nullable": - arrayItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "object_items_nullable": - objectItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_and_items_nullable_prop": - arrayAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_nullable_prop": - arrayNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "boolean_prop": - booleanProp = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + booleanProp = utf8JsonReader.GetBoolean(); break; case "date_prop": - dateProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "datetime_prop": - datetimeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + datetimeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "integer_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - integerProp = utf8JsonReader.GetInt32(); + { + utf8JsonReader.TryGetInt32(out int integerPropResult); + integerProp = integerPropResult; + } break; case "number_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - numberProp = utf8JsonReader.GetInt32(); + { + utf8JsonReader.TryGetInt32(out int numberPropResult); + numberProp = numberPropResult; + } break; case "object_and_items_nullable_prop": - objectAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "object_nullable_prop": - objectNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "string_prop": stringProp = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 1b46f198ea7..dc139201768 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -117,7 +117,11 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetGuid(out Guid uuidResult); + uuid = uuidResult; + } break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs index a3367a63838..fe22e8c1313 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "JustNumber": - justNumber = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out justNumber); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 04be00dfbd7..dea9b8289db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -167,13 +167,16 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "bars": - bars = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + bars = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "deprecatedRef": - deprecatedRef = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + deprecatedRef = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "id": - id = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out id); break; case "uuid": uuid = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs index b85615474d6..dcccaeabf94 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs @@ -259,23 +259,28 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "petId": - petId = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out petId); break; case "quantity": - quantity = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out quantity); break; case "shipDate": - shipDate = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shipDate = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "status": string statusRawValue = utf8JsonReader.GetString(); status = Order.StatusEnumFromString(statusRawValue); break; case "complete": - complete = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + complete = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs index 41d50368e58..535be6ceddd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -151,10 +151,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "my_boolean": - myBoolean = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + myBoolean = utf8JsonReader.GetBoolean(); break; case "my_number": - myNumber = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out myNumber); break; case "my_string": myString = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs index a0e0d27b08a..bf7c51d54da 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs @@ -254,23 +254,27 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "category": - category = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + category = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); break; case "photoUrls": - photoUrls = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + photoUrls = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "status": string statusRawValue = utf8JsonReader.GetString(); status = Pet.StatusEnumFromString(statusRawValue); break; case "tags": - tags = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + tags = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs index e9160910e9e..78afa02e1d0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "return": - returnProperty = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out returnProperty); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs index b47b7e5f2c2..4c13346b687 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -141,7 +141,8 @@ namespace Org.OpenAPITools.Model specialModelNameProperty = utf8JsonReader.GetString(); break; case "$special[property.name]": - specialPropertyName = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out specialPropertyName); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs index 88c2b135e05..ddf32452506 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs @@ -138,7 +138,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs index fcbca57865a..70d72c32914 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs @@ -270,13 +270,15 @@ namespace Org.OpenAPITools.Model firstName = utf8JsonReader.GetString(); break; case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "lastName": lastName = utf8JsonReader.GetString(); break; case "objectWithNoDeclaredProps": - objectWithNoDeclaredProps = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectWithNoDeclaredProps = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "password": password = utf8JsonReader.GetString(); @@ -285,19 +287,23 @@ namespace Org.OpenAPITools.Model phone = utf8JsonReader.GetString(); break; case "userStatus": - userStatus = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out userStatus); break; case "username": username = utf8JsonReader.GetString(); break; case "anyTypeProp": - anyTypeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anyTypeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "anyTypePropNullable": - anyTypePropNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anyTypePropNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "objectWithNoDeclaredPropsNullable": - objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs index 3744d329ad8..ce96f67fe2b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs @@ -154,10 +154,12 @@ namespace Org.OpenAPITools.Model className = utf8JsonReader.GetString(); break; case "hasBaleen": - hasBaleen = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + hasBaleen = utf8JsonReader.GetBoolean(); break; case "hasTeeth": - hasTeeth = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + hasTeeth = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs index e58d07d5482..2ee79b7ba3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "activity_outputs": - activityOutputs = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + activityOutputs = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 6de49983524..46998f231ec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -139,7 +139,8 @@ namespace Org.OpenAPITools.Model prop1 = utf8JsonReader.GetString(); break; case "prop2": - prop2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + prop2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 23560a4f3d6..141b010799e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -212,28 +212,36 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "empty_map": - emptyMap = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + emptyMap = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_of_map_property": - mapOfMapProperty = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapOfMapProperty = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_property": - mapProperty = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapProperty = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_1": - mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_2": - mapWithUndeclaredPropertiesAnytype2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_3": - mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_string": - mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "anytype_1": - anytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs index 94585e0fdc6..6939e72722f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -149,7 +149,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "code": - code = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out code); break; case "message": message = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs index 4ba2c5c5373..eec8d8b0cfe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs @@ -132,7 +132,8 @@ namespace Org.OpenAPITools.Model cultivar = utf8JsonReader.GetString(); break; case "mealy": - mealy = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mealy = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 1ed9c093bcd..47f7b46aa5f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "ArrayArrayNumber": - arrayArrayNumber = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayNumber = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 3ebd18816b2..08732c44004 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "ArrayNumber": - arrayNumber = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayNumber = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs index d555055c30e..eaaa692fd01 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -149,13 +149,16 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_array_of_integer": - arrayArrayOfInteger = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayOfInteger = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_array_of_model": - arrayArrayOfModel = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayOfModel = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_of_string": - arrayOfString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayOfString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs index 1bd23879706..4867e1d15d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "lengthCm": - lengthCm = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out lengthCm); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs index b185004e078..3ce324ab17f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -129,10 +129,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "lengthCm": - lengthCm = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out lengthCm); break; case "sweet": - sweet = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + sweet = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs index 83d03521f6f..30b468956aa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "declawed": - declawed = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + declawed = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs index d165237197e..622e22f76ae 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs @@ -136,7 +136,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 254822262fc..0b71684d282 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -129,7 +129,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "dateOnlyProperty": - dateOnlyProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateOnlyProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs index 819790eab36..372a5816a6d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs @@ -153,16 +153,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "mainShape": - mainShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mainShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "shapeOrNull": - shapeOrNull = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shapeOrNull = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "shapes": - shapes = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shapes = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "nullableShape": - nullableShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + nullableShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 41c69ce3b0e..29be901e753 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -236,7 +236,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_enum": - arrayEnum = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayEnum = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs index 67fdded75f6..15ad700c0c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -484,13 +484,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "enum_integer": - enumInteger = (EnumTest.EnumIntegerEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumIntegerResult); + enumInteger = (EnumTest.EnumIntegerEnum)enumIntegerResult; + } break; case "enum_integer_only": - enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumIntegerOnlyResult); + enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)enumIntegerOnlyResult; + } break; case "enum_number": - enumNumber = (EnumTest.EnumNumberEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumNumberResult); + enumNumber = (EnumTest.EnumNumberEnum)enumNumberResult; + } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 900d8f285f2..4b3824ae2b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -136,10 +136,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "file": - file = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + file = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "files": - files = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + files = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index f2b8c70df21..39a182f0530 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "string": - stringProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + stringProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index 6165ffc9fe8..7bcac920ca8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -464,37 +464,51 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "binary": - binary = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + binary = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "byte": - byteProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + byteProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "date": - date = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + date = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "dateTime": - dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "decimal": - decimalProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + decimalProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "double": - doubleProperty = utf8JsonReader.GetDouble(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDouble(out doubleProperty); break; case "float": - floatProperty = (float)utf8JsonReader.GetDouble(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetDouble(out double floatPropertyResult); + floatProperty = (float)floatPropertyResult; + } break; case "int32": - int32 = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out int32); break; case "int64": - int64 = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out int64); break; case "integer": - integer = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out integer); break; case "number": - number = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out number); break; case "password": password = utf8JsonReader.GetString(); @@ -509,13 +523,16 @@ namespace Org.OpenAPITools.Model stringProperty = utf8JsonReader.GetString(); break; case "unsigned_integer": - unsignedInteger = utf8JsonReader.GetUInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetUInt32(out unsignedInteger); break; case "unsigned_long": - unsignedLong = utf8JsonReader.GetUInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetUInt64(out unsignedLong); break; case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuid); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs index 7e701c9b9a3..3982af38911 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs @@ -212,16 +212,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "direct_map": - directMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + directMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "indirect_map": - indirectMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + indirectMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_map_of_string": - mapMapOfString = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapMapOfString = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_of_enum_string": - mapOfEnumString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapOfEnumString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 30821d80580..ceb8333b869 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -174,16 +174,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "dateTime": - dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map": - map = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + map = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuid); break; case "uuid_with_pattern": - uuidWithPattern = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuidWithPattern); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs index 1ea81633836..4273d24015e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -139,7 +139,8 @@ namespace Org.OpenAPITools.Model classProperty = utf8JsonReader.GetString(); break; case "name": - name = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out name); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs index 93864f5241c..a6e8e011688 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs @@ -199,16 +199,19 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "name": - nameProperty = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out nameProperty); break; case "property": property = utf8JsonReader.GetString(); break; case "snake_case": - snakeCase = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out snakeCase); break; case "123Number": - _123number = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out _123number); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs index 4736c82a1d6..304f1fd78c2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -240,39 +240,54 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_items_nullable": - arrayItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "object_items_nullable": - objectItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_and_items_nullable_prop": - arrayAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_nullable_prop": - arrayNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "boolean_prop": - booleanProp = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + booleanProp = utf8JsonReader.GetBoolean(); break; case "date_prop": - dateProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "datetime_prop": - datetimeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + datetimeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "integer_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - integerProp = utf8JsonReader.GetInt32(); + { + utf8JsonReader.TryGetInt32(out int integerPropResult); + integerProp = integerPropResult; + } break; case "number_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - numberProp = utf8JsonReader.GetInt32(); + { + utf8JsonReader.TryGetInt32(out int numberPropResult); + numberProp = numberPropResult; + } break; case "object_and_items_nullable_prop": - objectAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "object_nullable_prop": - objectNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "string_prop": stringProp = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index d1826f727a3..e774aa7d9f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -115,7 +115,11 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetGuid(out Guid uuidResult); + uuid = uuidResult; + } break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs index 91a11d39e08..dce27e3cf23 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "JustNumber": - justNumber = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out justNumber); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index ac3f6e116b3..d8a0bca8ef7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -165,13 +165,16 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "bars": - bars = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + bars = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "deprecatedRef": - deprecatedRef = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + deprecatedRef = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "id": - id = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out id); break; case "uuid": uuid = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs index 7f1a141dc2e..582e2b327f6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs @@ -257,23 +257,28 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "petId": - petId = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out petId); break; case "quantity": - quantity = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out quantity); break; case "shipDate": - shipDate = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shipDate = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "status": string statusRawValue = utf8JsonReader.GetString(); status = Order.StatusEnumFromString(statusRawValue); break; case "complete": - complete = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + complete = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 0d88d627848..7d6bd307050 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -149,10 +149,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "my_boolean": - myBoolean = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + myBoolean = utf8JsonReader.GetBoolean(); break; case "my_number": - myNumber = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out myNumber); break; case "my_string": myString = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs index 5cf45b423c2..205a01a0b70 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs @@ -252,23 +252,27 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "category": - category = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + category = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); break; case "photoUrls": - photoUrls = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + photoUrls = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "status": string statusRawValue = utf8JsonReader.GetString(); status = Pet.StatusEnumFromString(statusRawValue); break; case "tags": - tags = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + tags = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs index 23704ea0a86..503c768fe6d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "return": - returnProperty = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out returnProperty); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 4af7567d283..07bd694c8f8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -139,7 +139,8 @@ namespace Org.OpenAPITools.Model specialModelNameProperty = utf8JsonReader.GetString(); break; case "$special[property.name]": - specialPropertyName = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out specialPropertyName); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs index a2f0590c288..afe218563b8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs @@ -136,7 +136,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs index 875cebefe8b..b0ffe3a0e2c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs @@ -268,13 +268,15 @@ namespace Org.OpenAPITools.Model firstName = utf8JsonReader.GetString(); break; case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "lastName": lastName = utf8JsonReader.GetString(); break; case "objectWithNoDeclaredProps": - objectWithNoDeclaredProps = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectWithNoDeclaredProps = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "password": password = utf8JsonReader.GetString(); @@ -283,19 +285,23 @@ namespace Org.OpenAPITools.Model phone = utf8JsonReader.GetString(); break; case "userStatus": - userStatus = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out userStatus); break; case "username": username = utf8JsonReader.GetString(); break; case "anyTypeProp": - anyTypeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anyTypeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "anyTypePropNullable": - anyTypePropNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anyTypePropNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "objectWithNoDeclaredPropsNullable": - objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs index 0129208c866..33a71620e48 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs @@ -152,10 +152,12 @@ namespace Org.OpenAPITools.Model className = utf8JsonReader.GetString(); break; case "hasBaleen": - hasBaleen = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + hasBaleen = utf8JsonReader.GetBoolean(); break; case "hasTeeth": - hasTeeth = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + hasTeeth = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs index 6e21ecc55f6..21c383f25f8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "children": - children = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + children = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs index 639726c2156..4c287bde61e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs @@ -126,7 +126,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "boosterSeat": - boosterSeat = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + boosterSeat = utf8JsonReader.GetBoolean(); break; case "firstName": firstName = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs index 3ad283bd7cb..324296ba1ce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "age": - age = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out age); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs index 0d62b6d948a..a1f7f944583 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "count": - count = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out count); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs index 0d62b6d948a..a1f7f944583 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs @@ -125,7 +125,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "count": - count = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out count); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs index e58d07d5482..2ee79b7ba3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "activity_outputs": - activityOutputs = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + activityOutputs = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 6de49983524..46998f231ec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -139,7 +139,8 @@ namespace Org.OpenAPITools.Model prop1 = utf8JsonReader.GetString(); break; case "prop2": - prop2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + prop2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 23560a4f3d6..141b010799e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -212,28 +212,36 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "empty_map": - emptyMap = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + emptyMap = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_of_map_property": - mapOfMapProperty = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapOfMapProperty = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_property": - mapProperty = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapProperty = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_1": - mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_2": - mapWithUndeclaredPropertiesAnytype2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype2 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_anytype_3": - mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_with_undeclared_properties_string": - mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "anytype_1": - anytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anytype1 = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs index 94585e0fdc6..6939e72722f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -149,7 +149,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "code": - code = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out code); break; case "message": message = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs index 4ba2c5c5373..eec8d8b0cfe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs @@ -132,7 +132,8 @@ namespace Org.OpenAPITools.Model cultivar = utf8JsonReader.GetString(); break; case "mealy": - mealy = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mealy = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 1ed9c093bcd..47f7b46aa5f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "ArrayArrayNumber": - arrayArrayNumber = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayNumber = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 3ebd18816b2..08732c44004 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "ArrayNumber": - arrayNumber = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayNumber = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs index d555055c30e..eaaa692fd01 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -149,13 +149,16 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_array_of_integer": - arrayArrayOfInteger = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayOfInteger = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_array_of_model": - arrayArrayOfModel = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayArrayOfModel = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_of_string": - arrayOfString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayOfString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs index 1bd23879706..4867e1d15d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "lengthCm": - lengthCm = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out lengthCm); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs index b185004e078..3ce324ab17f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -129,10 +129,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "lengthCm": - lengthCm = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out lengthCm); break; case "sweet": - sweet = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + sweet = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs index 83d03521f6f..30b468956aa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "declawed": - declawed = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + declawed = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs index d165237197e..622e22f76ae 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs @@ -136,7 +136,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 254822262fc..0b71684d282 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -129,7 +129,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "dateOnlyProperty": - dateOnlyProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateOnlyProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs index 819790eab36..372a5816a6d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs @@ -153,16 +153,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "mainShape": - mainShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mainShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "shapeOrNull": - shapeOrNull = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shapeOrNull = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "shapes": - shapes = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shapes = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "nullableShape": - nullableShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + nullableShape = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 41c69ce3b0e..29be901e753 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -236,7 +236,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_enum": - arrayEnum = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayEnum = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs index 67fdded75f6..15ad700c0c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -484,13 +484,25 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "enum_integer": - enumInteger = (EnumTest.EnumIntegerEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumIntegerResult); + enumInteger = (EnumTest.EnumIntegerEnum)enumIntegerResult; + } break; case "enum_integer_only": - enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumIntegerOnlyResult); + enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)enumIntegerOnlyResult; + } break; case "enum_number": - enumNumber = (EnumTest.EnumNumberEnum) utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetInt32(out int enumNumberResult); + enumNumber = (EnumTest.EnumNumberEnum)enumNumberResult; + } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 900d8f285f2..4b3824ae2b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -136,10 +136,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "file": - file = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + file = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "files": - files = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + files = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index f2b8c70df21..39a182f0530 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "string": - stringProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + stringProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index 6165ffc9fe8..7bcac920ca8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -464,37 +464,51 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "binary": - binary = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + binary = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "byte": - byteProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + byteProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "date": - date = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + date = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "dateTime": - dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "decimal": - decimalProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + decimalProperty = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "double": - doubleProperty = utf8JsonReader.GetDouble(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDouble(out doubleProperty); break; case "float": - floatProperty = (float)utf8JsonReader.GetDouble(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetDouble(out double floatPropertyResult); + floatProperty = (float)floatPropertyResult; + } break; case "int32": - int32 = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out int32); break; case "int64": - int64 = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out int64); break; case "integer": - integer = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out integer); break; case "number": - number = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out number); break; case "password": password = utf8JsonReader.GetString(); @@ -509,13 +523,16 @@ namespace Org.OpenAPITools.Model stringProperty = utf8JsonReader.GetString(); break; case "unsigned_integer": - unsignedInteger = utf8JsonReader.GetUInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetUInt32(out unsignedInteger); break; case "unsigned_long": - unsignedLong = utf8JsonReader.GetUInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetUInt64(out unsignedLong); break; case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuid); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs index 7e701c9b9a3..3982af38911 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs @@ -212,16 +212,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "direct_map": - directMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + directMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "indirect_map": - indirectMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + indirectMap = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_map_of_string": - mapMapOfString = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapMapOfString = JsonSerializer.Deserialize>>(ref utf8JsonReader, jsonSerializerOptions); break; case "map_of_enum_string": - mapOfEnumString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + mapOfEnumString = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 30821d80580..ceb8333b869 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -174,16 +174,20 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "dateTime": - dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateTime = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "map": - map = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + map = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuid); break; case "uuid_with_pattern": - uuidWithPattern = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetGuid(out uuidWithPattern); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs index 1ea81633836..4273d24015e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -139,7 +139,8 @@ namespace Org.OpenAPITools.Model classProperty = utf8JsonReader.GetString(); break; case "name": - name = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out name); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs index 93864f5241c..a6e8e011688 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs @@ -199,16 +199,19 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "name": - nameProperty = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out nameProperty); break; case "property": property = utf8JsonReader.GetString(); break; case "snake_case": - snakeCase = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out snakeCase); break; case "123Number": - _123number = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out _123number); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs index 4736c82a1d6..304f1fd78c2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -240,39 +240,54 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "array_items_nullable": - arrayItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "object_items_nullable": - objectItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectItemsNullable = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_and_items_nullable_prop": - arrayAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "array_nullable_prop": - arrayNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + arrayNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "boolean_prop": - booleanProp = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + booleanProp = utf8JsonReader.GetBoolean(); break; case "date_prop": - dateProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + dateProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "datetime_prop": - datetimeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + datetimeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "integer_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - integerProp = utf8JsonReader.GetInt32(); + { + utf8JsonReader.TryGetInt32(out int integerPropResult); + integerProp = integerPropResult; + } break; case "number_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - numberProp = utf8JsonReader.GetInt32(); + { + utf8JsonReader.TryGetInt32(out int numberPropResult); + numberProp = numberPropResult; + } break; case "object_and_items_nullable_prop": - objectAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectAndItemsNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "object_nullable_prop": - objectNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectNullableProp = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "string_prop": stringProp = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index d1826f727a3..e774aa7d9f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -115,7 +115,11 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "uuid": - uuid = utf8JsonReader.GetGuid(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + { + utf8JsonReader.TryGetGuid(out Guid uuidResult); + uuid = uuidResult; + } break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs index 91a11d39e08..dce27e3cf23 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "JustNumber": - justNumber = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out justNumber); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index ac3f6e116b3..d8a0bca8ef7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -165,13 +165,16 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "bars": - bars = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + bars = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "deprecatedRef": - deprecatedRef = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + deprecatedRef = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "id": - id = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out id); break; case "uuid": uuid = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs index 7f1a141dc2e..582e2b327f6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs @@ -257,23 +257,28 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "petId": - petId = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out petId); break; case "quantity": - quantity = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out quantity); break; case "shipDate": - shipDate = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + shipDate = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "status": string statusRawValue = utf8JsonReader.GetString(); status = Order.StatusEnumFromString(statusRawValue); break; case "complete": - complete = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + complete = utf8JsonReader.GetBoolean(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 0d88d627848..7d6bd307050 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -149,10 +149,12 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "my_boolean": - myBoolean = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + myBoolean = utf8JsonReader.GetBoolean(); break; case "my_number": - myNumber = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetDecimal(out myNumber); break; case "my_string": myString = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs index 5cf45b423c2..205a01a0b70 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs @@ -252,23 +252,27 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "category": - category = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + category = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); break; case "photoUrls": - photoUrls = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + photoUrls = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; case "status": string statusRawValue = utf8JsonReader.GetString(); status = Pet.StatusEnumFromString(statusRawValue); break; case "tags": - tags = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + tags = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs index 23704ea0a86..503c768fe6d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs @@ -123,7 +123,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "return": - returnProperty = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out returnProperty); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 4af7567d283..07bd694c8f8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -139,7 +139,8 @@ namespace Org.OpenAPITools.Model specialModelNameProperty = utf8JsonReader.GetString(); break; case "$special[property.name]": - specialPropertyName = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out specialPropertyName); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs index a2f0590c288..afe218563b8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs @@ -136,7 +136,8 @@ namespace Org.OpenAPITools.Model switch (propertyName) { case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs index 875cebefe8b..b0ffe3a0e2c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs @@ -268,13 +268,15 @@ namespace Org.OpenAPITools.Model firstName = utf8JsonReader.GetString(); break; case "id": - id = utf8JsonReader.GetInt64(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt64(out id); break; case "lastName": lastName = utf8JsonReader.GetString(); break; case "objectWithNoDeclaredProps": - objectWithNoDeclaredProps = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectWithNoDeclaredProps = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "password": password = utf8JsonReader.GetString(); @@ -283,19 +285,23 @@ namespace Org.OpenAPITools.Model phone = utf8JsonReader.GetString(); break; case "userStatus": - userStatus = utf8JsonReader.GetInt32(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + utf8JsonReader.TryGetInt32(out userStatus); break; case "username": username = utf8JsonReader.GetString(); break; case "anyTypeProp": - anyTypeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anyTypeProp = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "anyTypePropNullable": - anyTypePropNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + anyTypePropNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; case "objectWithNoDeclaredPropsNullable": - objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs index 0129208c866..33a71620e48 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs @@ -152,10 +152,12 @@ namespace Org.OpenAPITools.Model className = utf8JsonReader.GetString(); break; case "hasBaleen": - hasBaleen = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + hasBaleen = utf8JsonReader.GetBoolean(); break; case "hasTeeth": - hasTeeth = utf8JsonReader.GetBoolean(); + if (utf8JsonReader.TokenType != JsonTokenType.Null) + hasTeeth = utf8JsonReader.GetBoolean(); break; default: break; From 644bccfd92a6094ff3d8ec59b66243fe08048267 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 14 Mar 2023 12:40:37 +0800 Subject: [PATCH 042/131] Reduce log level to avoid Travis CI build failure (#14946) * reduce log level to avoid travis build failure * add new file --- .travis.yml | 4 ++-- .../src/gen/java/org/openapitools/api/RestResourceRoot.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestResourceRoot.java diff --git a/.travis.yml b/.travis.yml index 3598d19172d..775da6a597d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -157,7 +157,7 @@ after_success: - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then echo "Publishing from branch $TRAVIS_BRANCH"; - mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml; + mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error; echo "Finished mvn clean deploy for $TRAVIS_BRANCH"; pushd .; cd modules/openapi-generator-gradle-plugin; @@ -166,7 +166,7 @@ after_success: popd; elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then echo "Publishing from branch $TRAVIS_BRANCH"; - mvn clean deploy --settings CI/settings.xml; + mvn clean deploy --settings CI/settings.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error; echo "Finished mvn clean deploy for $TRAVIS_BRANCH"; pushd .; cd modules/openapi-generator-gradle-plugin; diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestResourceRoot.java b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestResourceRoot.java new file mode 100644 index 00000000000..727f0dfe3fb --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/gen/java/org/openapitools/api/RestResourceRoot.java @@ -0,0 +1,5 @@ +package org.openapitools.api; + +public class RestResourceRoot { + public static final String APPLICATION_PATH = ""; +} From 3d12510e1fb77d5a09c7fe9551852dd025d15b73 Mon Sep 17 00:00:00 2001 From: Cameron Mackenzie <29843733+CameronMackenzie99@users.noreply.github.com> Date: Tue, 14 Mar 2023 08:28:03 +0000 Subject: [PATCH 043/131] Update README Angular compatible version (#14947) Update version to 2.x-15.x in README to match latest version in docs: https://openapi-generator.tech/docs/generators/typescript-angular --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d51150914ab..5256e23d8ac 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se | | Languages/Frameworks | | -------------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 13.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) | +| **API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 15.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) | | **Server stubs** | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Julia**, **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra) | | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML** | | **Configuration files** | [**Apache2**](https://httpd.apache.org/) | From bda2501455f40c2dd8e177f1fddad10d94a93d37 Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Tue, 14 Mar 2023 10:39:58 +0200 Subject: [PATCH 044/131] [Java][Spring] option whether to generate required args constructor (#14941) (fix #14934) --- bin/configs/spring-cloud-oas3-fakeapi.yaml | 1 + bin/configs/spring-http-interface.yaml | 1 + docs/generators/java-camel.md | 1 + docs/generators/spring.md | 1 + .../codegen/languages/SpringCodegen.java | 10 +++++++++ .../main/resources/JavaSpring/pojo.mustache | 2 ++ .../org/openapitools/model/AnimalDto.java | 16 -------------- .../org/openapitools/model/BigCatDto.java | 16 -------------- .../java/org/openapitools/model/CatDto.java | 16 -------------- .../org/openapitools/model/CategoryDto.java | 16 -------------- .../java/org/openapitools/model/DogDto.java | 16 -------------- .../org/openapitools/model/EnumTestDto.java | 16 -------------- .../org/openapitools/model/FormatTestDto.java | 19 ----------------- .../java/org/openapitools/model/NameDto.java | 16 -------------- .../java/org/openapitools/model/PetDto.java | 17 --------------- .../model/TypeHolderDefaultDto.java | 20 ------------------ .../model/TypeHolderExampleDto.java | 21 ------------------- .../java/org/openapitools/model/Animal.java | 16 -------------- .../java/org/openapitools/model/BigCat.java | 16 -------------- .../main/java/org/openapitools/model/Cat.java | 16 -------------- .../java/org/openapitools/model/Category.java | 16 -------------- .../main/java/org/openapitools/model/Dog.java | 16 -------------- .../java/org/openapitools/model/EnumTest.java | 16 -------------- .../org/openapitools/model/FormatTest.java | 19 ----------------- .../java/org/openapitools/model/Name.java | 16 -------------- .../main/java/org/openapitools/model/Pet.java | 17 --------------- .../openapitools/model/TypeHolderDefault.java | 20 ------------------ .../openapitools/model/TypeHolderExample.java | 21 ------------------- 28 files changed, 16 insertions(+), 378 deletions(-) diff --git a/bin/configs/spring-cloud-oas3-fakeapi.yaml b/bin/configs/spring-cloud-oas3-fakeapi.yaml index 3f4e3c8ba3a..5d919d03f24 100644 --- a/bin/configs/spring-cloud-oas3-fakeapi.yaml +++ b/bin/configs/spring-cloud-oas3-fakeapi.yaml @@ -10,3 +10,4 @@ additionalProperties: interfaceOnly: "true" singleContentTypes: "true" hideGenerationTimestamp: "true" + generatedConstructorWithRequiredArgs: "false" diff --git a/bin/configs/spring-http-interface.yaml b/bin/configs/spring-http-interface.yaml index a5cf6c2d7cc..9c92a629592 100644 --- a/bin/configs/spring-http-interface.yaml +++ b/bin/configs/spring-http-interface.yaml @@ -8,3 +8,4 @@ additionalProperties: snapshotVersion: "true" hideGenerationTimestamp: "true" modelNameSuffix: 'Dto' + generatedConstructorWithRequiredArgs: "false" diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index f61b5630e83..394bf13dd54 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false| +|generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| |groupId|groupId in generated pom.xml| |org.openapitools| |hateoas|Use Spring HATEOAS library to allow adding HATEOAS links| |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index c7380546a78..e8bfdbc0e04 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -49,6 +49,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false| +|generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| |groupId|groupId in generated pom.xml| |org.openapitools| |hateoas|Use Spring HATEOAS library to allow adding HATEOAS links| |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index 6f4ba5b519e..2c909e8c8d6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -96,6 +96,7 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String SINGLE_CONTENT_TYPES = "singleContentTypes"; public static final String VIRTUAL_SERVICE = "virtualService"; public static final String SKIP_DEFAULT_INTERFACE = "skipDefaultInterface"; + public static final String GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS = "generatedConstructorWithRequiredArgs"; public static final String ASYNC = "async"; public static final String REACTIVE = "reactive"; @@ -157,6 +158,7 @@ public class SpringCodegen extends AbstractJavaCodegen protected boolean useSpringController = false; protected boolean useSwaggerUI = true; protected boolean useSpringBoot3 = false; + protected boolean generatedConstructorWithRequiredArgs = true; protected RequestMappingMode requestMappingMode = RequestMappingMode.controller; public SpringCodegen() { @@ -248,6 +250,9 @@ public class SpringCodegen extends AbstractJavaCodegen cliOptions.add(CliOption.newBoolean(USE_SPRING_BOOT3, "Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.", useSpringBoot3)); + cliOptions.add(CliOption.newBoolean(GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS, + "Whether to generate constructors with required args for models", + generatedConstructorWithRequiredArgs)); supportedLibraries.put(SPRING_BOOT, "Spring-boot Server application."); supportedLibraries.put(SPRING_CLOUD_LIBRARY, @@ -457,6 +462,11 @@ public class SpringCodegen extends AbstractJavaCodegen } writePropertyBack(SPRING_CONTROLLER, useSpringController); + if (additionalProperties.containsKey(GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS)) { + this.generatedConstructorWithRequiredArgs = convertPropertyToBoolean(GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS); + } + writePropertyBack(GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS, generatedConstructorWithRequiredArgs); + if (additionalProperties.containsKey(RETURN_SUCCESS_CODE)) { this.setReturnSuccessCode(Boolean.parseBoolean(additionalProperties.get(RETURN_SUCCESS_CODE).toString())); } diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 45c9c96dcd4..5d1e340e754 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -80,6 +80,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/openApiNullable}} {{/isContainer}} {{/vars}} + {{#generatedConstructorWithRequiredArgs}} {{#hasRequired}} /** @@ -110,6 +111,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/vars}} } {{/hasRequired}} + {{/generatedConstructorWithRequiredArgs}} {{#vars}} {{! begin feature: fluent setter methods }} diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java index 98943e769c2..c17b0385407 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java @@ -43,22 +43,6 @@ public class AnimalDto { @JsonProperty("color") private String color = "red"; - /** - * Default constructor - * @deprecated Use {@link AnimalDto#AnimalDto(String)} - */ - @Deprecated - public AnimalDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public AnimalDto(String className) { - this.className = className; - } - public AnimalDto className(String className) { this.className = className; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java index 6608ecfa7a4..4277020c8dc 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java @@ -69,22 +69,6 @@ public class BigCatDto extends CatDto { @JsonProperty("kind") private KindEnum kind; - /** - * Default constructor - * @deprecated Use {@link BigCatDto#BigCatDto(String)} - */ - @Deprecated - public BigCatDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public BigCatDto(String className) { - super(className); - } - public BigCatDto kind(KindEnum kind) { this.kind = kind; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java index c350847bb89..61f8bc958e6 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java @@ -37,22 +37,6 @@ public class CatDto extends AnimalDto { @JsonProperty("declawed") private Boolean declawed; - /** - * Default constructor - * @deprecated Use {@link CatDto#CatDto(String)} - */ - @Deprecated - public CatDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public CatDto(String className) { - super(className); - } - public CatDto declawed(Boolean declawed) { this.declawed = declawed; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java index 5936031e79c..b3aebedbe87 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java @@ -27,22 +27,6 @@ public class CategoryDto { @JsonProperty("name") private String name = "default-name"; - /** - * Default constructor - * @deprecated Use {@link CategoryDto#CategoryDto(String)} - */ - @Deprecated - public CategoryDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public CategoryDto(String name) { - this.name = name; - } - public CategoryDto id(Long id) { this.id = id; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java index 19f8d6d95c6..3cd4ba41e44 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java @@ -29,22 +29,6 @@ public class DogDto extends AnimalDto { @JsonProperty("breed") private String breed; - /** - * Default constructor - * @deprecated Use {@link DogDto#DogDto(String)} - */ - @Deprecated - public DogDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public DogDto(String className) { - super(className); - } - public DogDto breed(String breed) { this.breed = breed; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java index f825319a573..f799473c14f 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java @@ -182,22 +182,6 @@ public class EnumTestDto { @JsonProperty("outerEnum") private OuterEnumDto outerEnum; - /** - * Default constructor - * @deprecated Use {@link EnumTestDto#EnumTestDto(EnumStringRequiredEnum)} - */ - @Deprecated - public EnumTestDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public EnumTestDto(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - public EnumTestDto enumString(EnumStringEnum enumString) { this.enumString = enumString; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java index 77f950cdef4..c3f24d344c5 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java @@ -71,25 +71,6 @@ public class FormatTestDto { @JsonProperty("BigDecimal") private BigDecimal bigDecimal; - /** - * Default constructor - * @deprecated Use {@link FormatTestDto#FormatTestDto(BigDecimal, byte[], LocalDate, String)} - */ - @Deprecated - public FormatTestDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public FormatTestDto(BigDecimal number, byte[] _byte, LocalDate date, String password) { - this.number = number; - this._byte = _byte; - this.date = date; - this.password = password; - } - public FormatTestDto integer(Integer integer) { this.integer = integer; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java index ba75b859251..d560dd759ec 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java @@ -33,22 +33,6 @@ public class NameDto { @JsonProperty("123Number") private Integer _123number; - /** - * Default constructor - * @deprecated Use {@link NameDto#NameDto(Integer)} - */ - @Deprecated - public NameDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public NameDto(Integer name) { - this.name = name; - } - public NameDto name(Integer name) { this.name = name; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java index 95ec99c34d5..4cb33158086 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java @@ -86,23 +86,6 @@ public class PetDto { @JsonProperty("status") private StatusEnum status; - /** - * Default constructor - * @deprecated Use {@link PetDto#PetDto(String, Set)} - */ - @Deprecated - public PetDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public PetDto(String name, Set photoUrls) { - this.name = name; - this.photoUrls = photoUrls; - } - public PetDto id(Long id) { this.id = id; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 70b2a2cebac..37047d9a2e2 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -40,26 +40,6 @@ public class TypeHolderDefaultDto { private List arrayItem = new ArrayList<>(); - /** - * Default constructor - * @deprecated Use {@link TypeHolderDefaultDto#TypeHolderDefaultDto(String, BigDecimal, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderDefaultDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderDefaultDto(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - public TypeHolderDefaultDto stringItem(String stringItem) { this.stringItem = stringItem; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 31e61fbd0e6..6ca0eb07b4e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -43,27 +43,6 @@ public class TypeHolderExampleDto { private List arrayItem = new ArrayList<>(); - /** - * Default constructor - * @deprecated Use {@link TypeHolderExampleDto#TypeHolderExampleDto(String, BigDecimal, Float, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderExampleDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderExampleDto(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.floatItem = floatItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - public TypeHolderExampleDto stringItem(String stringItem) { this.stringItem = stringItem; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java index 1ecf10efc5c..079192f597a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java @@ -44,22 +44,6 @@ public class Animal { @JsonProperty("color") private String color = "red"; - /** - * Default constructor - * @deprecated Use {@link Animal#Animal(String)} - */ - @Deprecated - public Animal() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Animal(String className) { - this.className = className; - } - public Animal className(String className) { this.className = className; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java index 8c5453c4a5b..1b367854915 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java @@ -69,22 +69,6 @@ public class BigCat extends Cat { @JsonProperty("kind") private KindEnum kind; - /** - * Default constructor - * @deprecated Use {@link BigCat#BigCat(String)} - */ - @Deprecated - public BigCat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public BigCat(String className) { - super(className); - } - public BigCat kind(KindEnum kind) { this.kind = kind; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java index a2feece8de8..41d9863046f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java @@ -38,22 +38,6 @@ public class Cat extends Animal { @JsonProperty("declawed") private Boolean declawed; - /** - * Default constructor - * @deprecated Use {@link Cat#Cat(String)} - */ - @Deprecated - public Cat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Cat(String className) { - super(className); - } - public Cat declawed(Boolean declawed) { this.declawed = declawed; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java index 7ee1fde0646..980faf6cbc2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java @@ -27,22 +27,6 @@ public class Category { @JsonProperty("name") private String name = "default-name"; - /** - * Default constructor - * @deprecated Use {@link Category#Category(String)} - */ - @Deprecated - public Category() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Category(String name) { - this.name = name; - } - public Category id(Long id) { this.id = id; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java index 1bb3d6b5102..e39fe3fdab2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java @@ -29,22 +29,6 @@ public class Dog extends Animal { @JsonProperty("breed") private String breed; - /** - * Default constructor - * @deprecated Use {@link Dog#Dog(String)} - */ - @Deprecated - public Dog() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Dog(String className) { - super(className); - } - public Dog breed(String breed) { this.breed = breed; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java index 6f08d4ee9fb..a92050b09f5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java @@ -184,22 +184,6 @@ public class EnumTest { @JsonProperty("outerEnum") private OuterEnum outerEnum; - /** - * Default constructor - * @deprecated Use {@link EnumTest#EnumTest(EnumStringRequiredEnum)} - */ - @Deprecated - public EnumTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public EnumTest(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java index 06e9dde8e89..23130acbb76 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java @@ -73,25 +73,6 @@ public class FormatTest { @JsonProperty("BigDecimal") private BigDecimal bigDecimal; - /** - * Default constructor - * @deprecated Use {@link FormatTest#FormatTest(BigDecimal, byte[], LocalDate, String)} - */ - @Deprecated - public FormatTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { - this.number = number; - this._byte = _byte; - this.date = date; - this.password = password; - } - public FormatTest integer(Integer integer) { this.integer = integer; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java index d6dcb665651..708b0b90b01 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java @@ -34,22 +34,6 @@ public class Name { @JsonProperty("123Number") private Integer _123number; - /** - * Default constructor - * @deprecated Use {@link Name#Name(Integer)} - */ - @Deprecated - public Name() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Name(Integer name) { - this.name = name; - } - public Name name(Integer name) { this.name = name; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java index 6adaaba97d7..acb7ce6b37b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java @@ -86,23 +86,6 @@ public class Pet { @JsonProperty("status") private StatusEnum status; - /** - * Default constructor - * @deprecated Use {@link Pet#Pet(String, Set)} - */ - @Deprecated - public Pet() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Pet(String name, Set photoUrls) { - this.name = name; - this.photoUrls = photoUrls; - } - public Pet id(Long id) { this.id = id; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java index 67ef036857d..e37caaf5784 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -40,26 +40,6 @@ public class TypeHolderDefault { @Valid private List arrayItem = new ArrayList<>(); - /** - * Default constructor - * @deprecated Use {@link TypeHolderDefault#TypeHolderDefault(String, BigDecimal, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderDefault() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderDefault(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - public TypeHolderDefault stringItem(String stringItem) { this.stringItem = stringItem; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java index 5b77bee14c1..c821c0257d2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -43,27 +43,6 @@ public class TypeHolderExample { @Valid private List arrayItem = new ArrayList<>(); - /** - * Default constructor - * @deprecated Use {@link TypeHolderExample#TypeHolderExample(String, BigDecimal, Float, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderExample() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderExample(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.floatItem = floatItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - public TypeHolderExample stringItem(String stringItem) { this.stringItem = stringItem; return this; From 3826d712add51960bec5885fa841f0818c2ec0e4 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 14 Mar 2023 17:24:13 +0800 Subject: [PATCH 045/131] show error only in travis build to reduce log size --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 775da6a597d..43975266388 100644 --- a/.travis.yml +++ b/.travis.yml @@ -150,7 +150,8 @@ script: - docker buildx version # run integration tests defined in maven pom.xml # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet. - - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error + # show "error" only to reduce the log size + - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error 2>&1 | grep -i error #- mvn -e --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error after_success: # push to maven repo From 85ff3de157ab8bfabc8bd4d8dd93312a3fd4bdf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=B6sl?= Date: Tue, 14 Mar 2023 16:57:08 +0100 Subject: [PATCH 046/131] [java][webclient/resttemplate] fix dependencies for gradle with jakarta (#14925) --- .../workflows/samples-java-client-jdk17.yaml | 5 ++- .../resttemplate/build.gradle.mustache | 28 +++++++++++-- .../libraries/webclient/build.gradle.mustache | 40 +++++++++++++++---- .../java/resttemplate-jakarta/build.gradle | 18 ++++----- .../java/resttemplate-jakarta/gradlew | 0 .../java/resttemplate-swagger1/build.gradle | 6 +-- .../java/resttemplate-withXml/build.gradle | 8 ++-- .../petstore/java/resttemplate/build.gradle | 8 ++-- .../java/webclient-jakarta/build.gradle | 27 ++++++------- .../petstore/java/webclient-jakarta/gradlew | 0 .../webclient-nullable-arrays/build.gradle | 17 ++++---- .../petstore/java/webclient/build.gradle | 17 ++++---- 12 files changed, 105 insertions(+), 69 deletions(-) mode change 100644 => 100755 samples/client/petstore/java/resttemplate-jakarta/gradlew mode change 100644 => 100755 samples/client/petstore/java/webclient-jakarta/gradlew diff --git a/.github/workflows/samples-java-client-jdk17.yaml b/.github/workflows/samples-java-client-jdk17.yaml index cb439e97603..0e4bbf2c3ae 100644 --- a/.github/workflows/samples-java-client-jdk17.yaml +++ b/.github/workflows/samples-java-client-jdk17.yaml @@ -34,6 +34,9 @@ jobs: path: | ~/.m2 key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - - name: Build + - name: Build with Maven working-directory: ${{ matrix.sample }} run: mvn clean package + - name: Build with Gradle + working-directory: ${{ matrix.sample }} + run: gradle clean build 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 7ec8edd1fe9..2b586ef0c03 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 @@ -32,8 +32,14 @@ if(hasProperty('target') && target == 'android') { targetSdkVersion 22 } compileOptions { + {{#useJakartaEe}} + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + {{/useJakartaEe}} + {{^useJakartaEe}} sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 + {{/useJakartaEe}} } // Rename the aar correctly @@ -66,7 +72,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -78,8 +84,14 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'java' apply plugin: 'maven-publish' + {{#useJakartaEe}} + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + {{/useJakartaEe}} + {{^useJakartaEe}} sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 + {{/useJakartaEe}} publishing { publications { @@ -91,26 +103,36 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } } ext { + {{#swagger1AnnotationLibrary}} swagger_annotations_version = "1.6.9" + {{/swagger1AnnotationLibrary}} jackson_version = "2.14.1" jackson_databind_version = "2.14.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.6" {{/openApiNullable}} - jakarta_annotation_version = "1.3.5" + {{#useJakartaEe}} + spring_web_version = "6.0.3" + jakarta_annotation_version = "2.1.1" + {{/useJakartaEe}} + {{^useJakartaEe}} spring_web_version = "5.3.24" + jakarta_annotation_version = "1.3.5" + {{/useJakartaEe}} jodatime_version = "2.9.9" junit_version = "4.13.2" } dependencies { + {{#swagger1AnnotationLibrary}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swagger1AnnotationLibrary}} 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" 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 0e21e620f24..0d29af88fb9 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 @@ -32,8 +32,14 @@ if(hasProperty('target') && target == 'android') { } compileOptions { + {{#useJakartaEe}} + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + {{/useJakartaEe}} + {{^useJakartaEe}} sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 + {{/useJakartaEe}} } // Rename the aar correctly @@ -66,7 +72,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -78,8 +84,14 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'java' apply plugin: 'maven-publish' + {{#useJakartaEe}} + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + {{/useJakartaEe}} + {{^useJakartaEe}} sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 + {{/useJakartaEe}} publishing { publications { @@ -91,17 +103,17 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } @@ -112,22 +124,36 @@ if(hasProperty('target') && target == 'android') { } ext { + {{#swagger1AnnotationLibrary}} swagger_annotations_version = "1.6.3" + {{/swagger1AnnotationLibrary}} + {{#useJakartaEe}} + spring_boot_version = "3.0.1" + jakarta_annotation_version = "2.1.1" + reactor_version = "3.5.1" + reactor_netty_version = "1.1.1" + {{/useJakartaEe}} + {{^useJakartaEe}} spring_boot_version = "2.6.6" + jakarta_annotation_version = "1.3.5" + reactor_version = "3.4.3" + reactor_netty_version = "1.0.4" + {{/useJakartaEe}} jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.6" {{/openApiNullable}} - jakarta_annotation_version = "1.3.5" - reactor_version = "3.4.3" - reactor_netty_version = "1.0.4" + {{#joda}} jodatime_version = "2.9.9" + {{/joda}} junit_version = "4.13.2" } dependencies { + {{#swagger1AnnotationLibrary}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swagger1AnnotationLibrary}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "io.projectreactor:reactor-core:$reactor_version" implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version" diff --git a/samples/client/petstore/java/resttemplate-jakarta/build.gradle b/samples/client/petstore/java/resttemplate-jakarta/build.gradle index 46db68d6e80..04779860a1e 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/build.gradle +++ b/samples/client/petstore/java/resttemplate-jakarta/build.gradle @@ -32,8 +32,8 @@ if(hasProperty('target') && target == 'android') { targetSdkVersion 22 } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } // Rename the aar correctly @@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'java' apply plugin: 'maven-publish' - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 publishing { publications { @@ -91,24 +91,22 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } } ext { - swagger_annotations_version = "1.6.9" jackson_version = "2.14.1" jackson_databind_version = "2.14.1" jackson_databind_nullable_version = "0.2.6" - jakarta_annotation_version = "1.3.5" - spring_web_version = "5.3.24" + spring_web_version = "6.0.3" + jakarta_annotation_version = "2.1.1" jodatime_version = "2.9.9" junit_version = "4.13.2" } dependencies { - 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" diff --git a/samples/client/petstore/java/resttemplate-jakarta/gradlew b/samples/client/petstore/java/resttemplate-jakarta/gradlew old mode 100644 new mode 100755 diff --git a/samples/client/petstore/java/resttemplate-swagger1/build.gradle b/samples/client/petstore/java/resttemplate-swagger1/build.gradle index 46db68d6e80..96b3d8f412e 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/build.gradle +++ b/samples/client/petstore/java/resttemplate-swagger1/build.gradle @@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -91,7 +91,7 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } } @@ -101,8 +101,8 @@ ext { jackson_version = "2.14.1" jackson_databind_version = "2.14.1" jackson_databind_nullable_version = "0.2.6" - jakarta_annotation_version = "1.3.5" spring_web_version = "5.3.24" + jakarta_annotation_version = "1.3.5" jodatime_version = "2.9.9" junit_version = "4.13.2" } diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index 6882fdc04a2..52ead24bbae 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -91,24 +91,22 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } } ext { - swagger_annotations_version = "1.6.9" jackson_version = "2.14.1" jackson_databind_version = "2.14.1" jackson_databind_nullable_version = "0.2.6" - jakarta_annotation_version = "1.3.5" spring_web_version = "5.3.24" + jakarta_annotation_version = "1.3.5" jodatime_version = "2.9.9" junit_version = "4.13.2" } dependencies { - 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" diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index 46db68d6e80..c97d101a7c4 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -91,24 +91,22 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } } ext { - swagger_annotations_version = "1.6.9" jackson_version = "2.14.1" jackson_databind_version = "2.14.1" jackson_databind_nullable_version = "0.2.6" - jakarta_annotation_version = "1.3.5" spring_web_version = "5.3.24" + jakarta_annotation_version = "1.3.5" jodatime_version = "2.9.9" junit_version = "4.13.2" } dependencies { - 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" diff --git a/samples/client/petstore/java/webclient-jakarta/build.gradle b/samples/client/petstore/java/webclient-jakarta/build.gradle index 43c4dcb03aa..fe5ded3028d 100644 --- a/samples/client/petstore/java/webclient-jakarta/build.gradle +++ b/samples/client/petstore/java/webclient-jakarta/build.gradle @@ -32,8 +32,8 @@ if(hasProperty('target') && target == 'android') { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } // Rename the aar correctly @@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'java' apply plugin: 'maven-publish' - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 publishing { publications { @@ -91,17 +91,17 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } @@ -112,20 +112,17 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.6.3" - spring_boot_version = "2.6.6" + spring_boot_version = "3.0.1" + jakarta_annotation_version = "2.1.1" + reactor_version = "3.5.1" + reactor_netty_version = "1.1.1" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" jackson_databind_nullable_version = "0.2.6" - jakarta_annotation_version = "1.3.5" - reactor_version = "3.4.3" - reactor_netty_version = "1.0.4" - jodatime_version = "2.9.9" junit_version = "4.13.2" } dependencies { - 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.boot:spring-boot-starter-webflux:$spring_boot_version" diff --git a/samples/client/petstore/java/webclient-jakarta/gradlew b/samples/client/petstore/java/webclient-jakarta/gradlew old mode 100644 new mode 100755 diff --git a/samples/client/petstore/java/webclient-nullable-arrays/build.gradle b/samples/client/petstore/java/webclient-nullable-arrays/build.gradle index 1b9e9ec6eeb..c3d61a33bed 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/build.gradle +++ b/samples/client/petstore/java/webclient-nullable-arrays/build.gradle @@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -91,17 +91,17 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } @@ -112,20 +112,17 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.6.3" spring_boot_version = "2.6.6" - jackson_version = "2.13.4" - jackson_databind_version = "2.13.4.2" - jackson_databind_nullable_version = "0.2.6" jakarta_annotation_version = "1.3.5" reactor_version = "3.4.3" reactor_netty_version = "1.0.4" - jodatime_version = "2.9.9" + jackson_version = "2.13.4" + jackson_databind_version = "2.13.4.2" + jackson_databind_nullable_version = "0.2.6" junit_version = "4.13.2" } dependencies { - 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.boot:spring-boot-starter-webflux:$spring_boot_version" diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle index 43c4dcb03aa..254584ee323 100644 --- a/samples/client/petstore/java/webclient/build.gradle +++ b/samples/client/petstore/java/webclient/build.gradle @@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -91,17 +91,17 @@ if(hasProperty('target') && target == 'android') { } task execute(type:JavaExec) { - main = System.getProperty('mainClass') + mainClass = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } @@ -112,20 +112,17 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.6.3" spring_boot_version = "2.6.6" - jackson_version = "2.13.4" - jackson_databind_version = "2.13.4.2" - jackson_databind_nullable_version = "0.2.6" jakarta_annotation_version = "1.3.5" reactor_version = "3.4.3" reactor_netty_version = "1.0.4" - jodatime_version = "2.9.9" + jackson_version = "2.13.4" + jackson_databind_version = "2.13.4.2" + jackson_databind_nullable_version = "0.2.6" junit_version = "4.13.2" } dependencies { - 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.boot:spring-boot-starter-webflux:$spring_boot_version" From b172f622b9e1784a730750de4039c5886934a04b Mon Sep 17 00:00:00 2001 From: igokoro Date: Tue, 14 Mar 2023 12:47:15 -0400 Subject: [PATCH 047/131] Do not use default locale in kotlin generated code (#14668) Using default locale for non-user visible text transformations is not safe and can result in bugs, in particular with Turkish locale. More details in https://mattryall.net/blog/the-infamous-turkish-locale-bug Closes #14667 --- .../libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- .../org/openapitools/client/infrastructure/ApiClient.kt | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache index 3c1a0b156fd..ea711753abd 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache @@ -357,7 +357,7 @@ import com.squareup.moshi.adapter val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -392,7 +392,7 @@ import com.squareup.moshi.adapter val response = client.newCall(request).execute() {{/useCoroutines}} - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed1..ea4b7b65935 100644 --- a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 90aff170761..047c68d10ce 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -170,7 +170,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -189,7 +189,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed1..ea4b7b65935 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed1..ea4b7b65935 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-default-values-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 90aff170761..047c68d10ce 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -170,7 +170,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -189,7 +189,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed1..ea4b7b65935 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 757080d7ed1..ea4b7b65935 100644 --- a/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 150ae2c96a1..0f1ca0fcb9c 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -190,7 +190,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -209,7 +209,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 40f766cd0a3..5eb13189410 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -190,7 +190,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -209,7 +209,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index cfa514eddfa..235c92379b5 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -196,7 +196,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -215,7 +215,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index de295015574..67676016c1f 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -193,7 +193,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -223,7 +223,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie }) } - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 9101fb150a8..81f05a77af3 100644 --- a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -210,7 +210,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 9101fb150a8..81f05a77af3 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -210,7 +210,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 504d6920a4f..16c2bf9bc65 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -191,7 +191,7 @@ internal open class ApiClient(val baseUrl: String, val client: OkHttpClient = de val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -210,7 +210,7 @@ internal open class ApiClient(val baseUrl: String, val client: OkHttpClient = de val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 9101fb150a8..81f05a77af3 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -210,7 +210,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 6985de61199..34db45767ad 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -189,7 +189,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -208,7 +208,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 9101fb150a8..81f05a77af3 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -210,7 +210,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index d26ef5fe23f..2592a3baad3 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -210,7 +210,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index ca3a9037de5..6459e6aff54 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -172,7 +172,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 9101fb150a8..81f05a77af3 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -191,7 +191,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val contentType = if (headers[ContentType] != null) { // TODO: support multiple contentType options here. - (headers[ContentType] as String).substringBefore(";").lowercase(Locale.getDefault()) + (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US) } else { null } @@ -210,7 +210,7 @@ open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClie val response = client.newCall(request).execute() - val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault()) + val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US) // TODO: handle specific mapping types. e.g. Map> return when { From f1d05fc7f869706a95c985247affd91a4e4e388b Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Tue, 14 Mar 2023 19:20:31 +0100 Subject: [PATCH 048/131] Allow Java apache-httpclient users to supply additional HTTP headers per call, updated (#14929) * Allow Java apache-httpclient users to supply additional HTTP headers per API call * fix 'unexpected return value' problem * make "fullJavaUtil" work * Revert 'make "fullJavaUtil" work' This reverts commit 60c8846. --------- Co-authored-by: Jigar Joshi --- .../libraries/apache-httpclient/api.mustache | 33 ++ .../org/openapitools/client/api/BodyApi.java | 35 ++ .../org/openapitools/client/api/FormApi.java | 21 ++ .../openapitools/client/api/HeaderApi.java | 21 ++ .../org/openapitools/client/api/PathApi.java | 20 ++ .../org/openapitools/client/api/QueryApi.java | 119 +++++++ .../client/api/AnotherFakeApi.java | 19 ++ .../openapitools/client/api/DefaultApi.java | 18 ++ .../org/openapitools/client/api/FakeApi.java | 300 ++++++++++++++++++ .../client/api/FakeClassnameTags123Api.java | 19 ++ .../org/openapitools/client/api/PetApi.java | 152 +++++++++ .../org/openapitools/client/api/StoreApi.java | 65 ++++ .../org/openapitools/client/api/UserApi.java | 126 ++++++++ 13 files changed, 948 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache index 82466c4a1bc..4b542299a52 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache @@ -15,6 +15,7 @@ import {{invokerPackage}}.Pair; {{^fullJavaUtil}} import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,6 +25,8 @@ import java.util.StringJoiner; {{>generatedAnnotation}} {{#operations}} public class {{classname}} { + + private ApiClient apiClient; public {{classname}}() { @@ -65,6 +68,33 @@ public class {{classname}} { @Deprecated {{/isDeprecated}} public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException { + {{#returnType}}return {{/returnType}}this.{{operationId}}({{#allParams}}{{paramName}}, {{/allParams}}Collections.emptyMap()); + } + + + /** + * {{summary}} + * {{notes}} + {{#allParams}} + * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}} + {{/allParams}} + * @param additionalHeaders additionalHeaders for this call + {{#returnType}} + * @return {{returnType}} + {{/returnType}} + * @throws ApiException if fails to make API call + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} + {{#externalDocs}} + * {{description}} + * @see {{summary}} Documentation + {{/externalDocs}} + */ + {{#isDeprecated}} + @Deprecated + {{/isDeprecated}} + public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}Map additionalHeaders) throws ApiException { Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; {{#allParams}}{{#required}} // verify the required parameter '{{paramName}}' is set @@ -126,6 +156,8 @@ public class {{classname}} { localVarHeaderParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); {{/headerParams}} + localVarHeaderParams.putAll(additionalHeaders); + {{#cookieParams}}if ({{paramName}} != null) localVarCookieParams.put("{{baseName}}", apiClient.parameterToString({{paramName}})); {{/cookieParams}} @@ -168,6 +200,7 @@ public class {{classname}} { {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}} ); } + {{/operation}} } {{/operations}} diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java index b06c9baf402..6d28ab412f6 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java @@ -24,6 +24,7 @@ import org.openapitools.client.model.Pet; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +32,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class BodyApi { + + private ApiClient apiClient; public BodyApi() { @@ -57,6 +60,19 @@ public class BodyApi { * @throws ApiException if fails to make API call */ public Pet testEchoBodyPet(Pet pet) throws ApiException { + return this.testEchoBodyPet(pet, Collections.emptyMap()); + } + + + /** + * Test body parameter(s) + * Test body parameter(s) + * @param pet Pet object that needs to be added to the store (optional) + * @param additionalHeaders additionalHeaders for this call + * @return Pet + * @throws ApiException if fails to make API call + */ + public Pet testEchoBodyPet(Pet pet, Map additionalHeaders) throws ApiException { Object localVarPostBody = pet; // create path and map variables @@ -71,6 +87,8 @@ public class BodyApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -102,6 +120,7 @@ public class BodyApi { localVarReturnType ); } + /** * Test empty response body * Test empty response body @@ -110,6 +129,19 @@ public class BodyApi { * @throws ApiException if fails to make API call */ public String testEchoBodyPetResponseString(Pet pet) throws ApiException { + return this.testEchoBodyPetResponseString(pet, Collections.emptyMap()); + } + + + /** + * Test empty response body + * Test empty response body + * @param pet Pet object that needs to be added to the store (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testEchoBodyPetResponseString(Pet pet, Map additionalHeaders) throws ApiException { Object localVarPostBody = pet; // create path and map variables @@ -124,6 +156,8 @@ public class BodyApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -155,4 +189,5 @@ public class BodyApi { localVarReturnType ); } + } diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/FormApi.java index 44c4e489d94..225a63dbe45 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/FormApi.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/FormApi.java @@ -23,6 +23,7 @@ import org.openapitools.client.Pair; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,6 +31,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormApi { + + private ApiClient apiClient; public FormApi() { @@ -58,6 +61,21 @@ public class FormApi { * @throws ApiException if fails to make API call */ public String testFormIntegerBooleanString(Integer integerForm, Boolean booleanForm, String stringForm) throws ApiException { + return this.testFormIntegerBooleanString(integerForm, booleanForm, stringForm, Collections.emptyMap()); + } + + + /** + * Test form parameter(s) + * Test form parameter(s) + * @param integerForm (optional) + * @param booleanForm (optional) + * @param stringForm (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testFormIntegerBooleanString(Integer integerForm, Boolean booleanForm, String stringForm, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -72,6 +90,8 @@ public class FormApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + if (integerForm != null) localVarFormParams.put("integer_form", integerForm); @@ -109,4 +129,5 @@ if (stringForm != null) localVarReturnType ); } + } diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/HeaderApi.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/HeaderApi.java index facce1078e4..4a3d6233dee 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/HeaderApi.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/HeaderApi.java @@ -23,6 +23,7 @@ import org.openapitools.client.Pair; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,6 +31,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class HeaderApi { + + private ApiClient apiClient; public HeaderApi() { @@ -58,6 +61,21 @@ public class HeaderApi { * @throws ApiException if fails to make API call */ public String testHeaderIntegerBooleanString(Integer integerHeader, Boolean booleanHeader, String stringHeader) throws ApiException { + return this.testHeaderIntegerBooleanString(integerHeader, booleanHeader, stringHeader, Collections.emptyMap()); + } + + + /** + * Test header parameter(s) + * Test header parameter(s) + * @param integerHeader (optional) + * @param booleanHeader (optional) + * @param stringHeader (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testHeaderIntegerBooleanString(Integer integerHeader, Boolean booleanHeader, String stringHeader, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -78,6 +96,8 @@ if (booleanHeader != null) if (stringHeader != null) localVarHeaderParams.put("string_header", apiClient.parameterToString(stringHeader)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -109,4 +129,5 @@ if (stringHeader != null) localVarReturnType ); } + } diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/PathApi.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/PathApi.java index 6f3e8b5fcfa..1b3cd28298c 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/PathApi.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/PathApi.java @@ -23,6 +23,7 @@ import org.openapitools.client.Pair; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,6 +31,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class PathApi { + + private ApiClient apiClient; public PathApi() { @@ -57,6 +60,20 @@ public class PathApi { * @throws ApiException if fails to make API call */ public String testsPathStringPathStringIntegerPathInteger(String pathString, Integer pathInteger) throws ApiException { + return this.testsPathStringPathStringIntegerPathInteger(pathString, pathInteger, Collections.emptyMap()); + } + + + /** + * Test path parameter(s) + * Test path parameter(s) + * @param pathString (required) + * @param pathInteger (required) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testsPathStringPathStringIntegerPathInteger(String pathString, Integer pathInteger, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'pathString' is set @@ -83,6 +100,8 @@ public class PathApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -114,4 +133,5 @@ public class PathApi { localVarReturnType ); } + } diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java index 38b936ab5fa..443721f30d1 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java @@ -29,6 +29,7 @@ import org.openapitools.client.model.TestQueryStyleFormExplodeTrueArrayStringQue import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,6 +37,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class QueryApi { + + private ApiClient apiClient; public QueryApi() { @@ -64,6 +67,21 @@ public class QueryApi { * @throws ApiException if fails to make API call */ public String testQueryDatetimeDateString(OffsetDateTime datetimeQuery, LocalDate dateQuery, String stringQuery) throws ApiException { + return this.testQueryDatetimeDateString(datetimeQuery, dateQuery, stringQuery, Collections.emptyMap()); + } + + + /** + * Test query parameter(s) + * Test query parameter(s) + * @param datetimeQuery (optional) + * @param dateQuery (optional) + * @param stringQuery (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testQueryDatetimeDateString(OffsetDateTime datetimeQuery, LocalDate dateQuery, String stringQuery, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -81,6 +99,8 @@ public class QueryApi { localVarQueryParams.addAll(apiClient.parameterToPair("date_query", dateQuery)); localVarQueryParams.addAll(apiClient.parameterToPair("string_query", stringQuery)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -112,6 +132,7 @@ public class QueryApi { localVarReturnType ); } + /** * Test query parameter(s) * Test query parameter(s) @@ -122,6 +143,21 @@ public class QueryApi { * @throws ApiException if fails to make API call */ public String testQueryIntegerBooleanString(Integer integerQuery, Boolean booleanQuery, String stringQuery) throws ApiException { + return this.testQueryIntegerBooleanString(integerQuery, booleanQuery, stringQuery, Collections.emptyMap()); + } + + + /** + * Test query parameter(s) + * Test query parameter(s) + * @param integerQuery (optional) + * @param booleanQuery (optional) + * @param stringQuery (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testQueryIntegerBooleanString(Integer integerQuery, Boolean booleanQuery, String stringQuery, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -139,6 +175,8 @@ public class QueryApi { localVarQueryParams.addAll(apiClient.parameterToPair("boolean_query", booleanQuery)); localVarQueryParams.addAll(apiClient.parameterToPair("string_query", stringQuery)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -170,6 +208,7 @@ public class QueryApi { localVarReturnType ); } + /** * Test query parameter(s) * Test query parameter(s) @@ -178,6 +217,19 @@ public class QueryApi { * @throws ApiException if fails to make API call */ public String testQueryStyleDeepObjectExplodeTrueObject(Pet queryObject) throws ApiException { + return this.testQueryStyleDeepObjectExplodeTrueObject(queryObject, Collections.emptyMap()); + } + + + /** + * Test query parameter(s) + * Test query parameter(s) + * @param queryObject (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testQueryStyleDeepObjectExplodeTrueObject(Pet queryObject, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -194,6 +246,8 @@ public class QueryApi { localVarQueryParameterBaseName = "query_object"; localVarQueryStringJoiner.add(queryObject.toUrlQueryString("query_object")); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -225,6 +279,7 @@ public class QueryApi { localVarReturnType ); } + /** * Test query parameter(s) * Test query parameter(s) @@ -233,6 +288,19 @@ public class QueryApi { * @throws ApiException if fails to make API call */ public String testQueryStyleDeepObjectExplodeTrueObjectAllOf(TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter queryObject) throws ApiException { + return this.testQueryStyleDeepObjectExplodeTrueObjectAllOf(queryObject, Collections.emptyMap()); + } + + + /** + * Test query parameter(s) + * Test query parameter(s) + * @param queryObject (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testQueryStyleDeepObjectExplodeTrueObjectAllOf(TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter queryObject, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -249,6 +317,8 @@ public class QueryApi { localVarQueryParameterBaseName = "query_object"; localVarQueryStringJoiner.add(queryObject.toUrlQueryString("query_object")); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -280,6 +350,7 @@ public class QueryApi { localVarReturnType ); } + /** * Test query parameter(s) * Test query parameter(s) @@ -288,6 +359,19 @@ public class QueryApi { * @throws ApiException if fails to make API call */ public String testQueryStyleFormExplodeTrueArrayString(TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter queryObject) throws ApiException { + return this.testQueryStyleFormExplodeTrueArrayString(queryObject, Collections.emptyMap()); + } + + + /** + * Test query parameter(s) + * Test query parameter(s) + * @param queryObject (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testQueryStyleFormExplodeTrueArrayString(TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter queryObject, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -303,6 +387,8 @@ public class QueryApi { localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "values", queryObject.getValues())); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -334,6 +420,7 @@ public class QueryApi { localVarReturnType ); } + /** * Test query parameter(s) * Test query parameter(s) @@ -342,6 +429,19 @@ public class QueryApi { * @throws ApiException if fails to make API call */ public String testQueryStyleFormExplodeTrueObject(Pet queryObject) throws ApiException { + return this.testQueryStyleFormExplodeTrueObject(queryObject, Collections.emptyMap()); + } + + + /** + * Test query parameter(s) + * Test query parameter(s) + * @param queryObject (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testQueryStyleFormExplodeTrueObject(Pet queryObject, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -362,6 +462,8 @@ public class QueryApi { localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "tags", queryObject.getTags())); localVarQueryParams.addAll(apiClient.parameterToPair("status", queryObject.getStatus())); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -393,6 +495,7 @@ public class QueryApi { localVarReturnType ); } + /** * Test query parameter(s) * Test query parameter(s) @@ -401,6 +504,19 @@ public class QueryApi { * @throws ApiException if fails to make API call */ public String testQueryStyleFormExplodeTrueObjectAllOf(DataQuery queryObject) throws ApiException { + return this.testQueryStyleFormExplodeTrueObjectAllOf(queryObject, Collections.emptyMap()); + } + + + /** + * Test query parameter(s) + * Test query parameter(s) + * @param queryObject (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String testQueryStyleFormExplodeTrueObjectAllOf(DataQuery queryObject, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -416,6 +532,8 @@ public class QueryApi { localVarQueryStringJoiner.add(queryObject.toUrlQueryString()); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -447,4 +565,5 @@ public class QueryApi { localVarReturnType ); } + } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 6f6e9b8ed1e..c4a27c424a8 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -24,6 +24,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +32,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AnotherFakeApi { + + private ApiClient apiClient; public AnotherFakeApi() { @@ -57,6 +60,19 @@ public class AnotherFakeApi { * @throws ApiException if fails to make API call */ public Client call123testSpecialTags(Client client) throws ApiException { + return this.call123testSpecialTags(client, Collections.emptyMap()); + } + + + /** + * To test special tags + * To test special tags and operation ID starting with number + * @param client client model (required) + * @param additionalHeaders additionalHeaders for this call + * @return Client + * @throws ApiException if fails to make API call + */ + public Client call123testSpecialTags(Client client, Map additionalHeaders) throws ApiException { Object localVarPostBody = client; // verify the required parameter 'client' is set @@ -76,6 +92,8 @@ public class AnotherFakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -107,4 +125,5 @@ public class AnotherFakeApi { localVarReturnType ); } + } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/DefaultApi.java index 6045a630c1d..b037b033b08 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -24,6 +24,7 @@ import org.openapitools.client.model.FooGetDefaultResponse; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +32,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class DefaultApi { + + private ApiClient apiClient; public DefaultApi() { @@ -56,6 +59,18 @@ public class DefaultApi { * @throws ApiException if fails to make API call */ public FooGetDefaultResponse fooGet() throws ApiException { + return this.fooGet(Collections.emptyMap()); + } + + + /** + * + * + * @param additionalHeaders additionalHeaders for this call + * @return FooGetDefaultResponse + * @throws ApiException if fails to make API call + */ + public FooGetDefaultResponse fooGet(Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -70,6 +85,8 @@ public class DefaultApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -101,4 +118,5 @@ public class DefaultApi { localVarReturnType ); } + } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java index 18f8b7d6d77..727d782fb9d 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -35,6 +35,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,6 +43,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FakeApi { + + private ApiClient apiClient; public FakeApi() { @@ -67,6 +70,18 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public HealthCheckResult fakeHealthGet() throws ApiException { + return this.fakeHealthGet(Collections.emptyMap()); + } + + + /** + * Health check endpoint + * + * @param additionalHeaders additionalHeaders for this call + * @return HealthCheckResult + * @throws ApiException if fails to make API call + */ + public HealthCheckResult fakeHealthGet(Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -81,6 +96,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -112,6 +129,7 @@ public class FakeApi { localVarReturnType ); } + /** * test http signature authentication * @@ -121,6 +139,20 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public void fakeHttpSignatureTest(Pet pet, String query1, String header1) throws ApiException { + this.fakeHttpSignatureTest(pet, query1, header1, Collections.emptyMap()); + } + + + /** + * test http signature authentication + * + * @param pet Pet object that needs to be added to the store (required) + * @param query1 query parameter (optional) + * @param header1 header parameter (optional) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void fakeHttpSignatureTest(Pet pet, String query1, String header1, Map additionalHeaders) throws ApiException { Object localVarPostBody = pet; // verify the required parameter 'pet' is set @@ -143,6 +175,8 @@ public class FakeApi { if (header1 != null) localVarHeaderParams.put("header_1", apiClient.parameterToString(header1)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -173,6 +207,7 @@ public class FakeApi { null ); } + /** * * Test serialization of outer boolean types @@ -181,6 +216,19 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public Boolean fakeOuterBooleanSerialize(Boolean body) throws ApiException { + return this.fakeOuterBooleanSerialize(body, Collections.emptyMap()); + } + + + /** + * + * Test serialization of outer boolean types + * @param body Input boolean as post body (optional) + * @param additionalHeaders additionalHeaders for this call + * @return Boolean + * @throws ApiException if fails to make API call + */ + public Boolean fakeOuterBooleanSerialize(Boolean body, Map additionalHeaders) throws ApiException { Object localVarPostBody = body; // create path and map variables @@ -195,6 +243,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -226,6 +276,7 @@ public class FakeApi { localVarReturnType ); } + /** * * Test serialization of object with outer number type @@ -234,6 +285,19 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public OuterComposite fakeOuterCompositeSerialize(OuterComposite outerComposite) throws ApiException { + return this.fakeOuterCompositeSerialize(outerComposite, Collections.emptyMap()); + } + + + /** + * + * Test serialization of object with outer number type + * @param outerComposite Input composite as post body (optional) + * @param additionalHeaders additionalHeaders for this call + * @return OuterComposite + * @throws ApiException if fails to make API call + */ + public OuterComposite fakeOuterCompositeSerialize(OuterComposite outerComposite, Map additionalHeaders) throws ApiException { Object localVarPostBody = outerComposite; // create path and map variables @@ -248,6 +312,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -279,6 +345,7 @@ public class FakeApi { localVarReturnType ); } + /** * * Test serialization of outer number types @@ -287,6 +354,19 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws ApiException { + return this.fakeOuterNumberSerialize(body, Collections.emptyMap()); + } + + + /** + * + * Test serialization of outer number types + * @param body Input number as post body (optional) + * @param additionalHeaders additionalHeaders for this call + * @return BigDecimal + * @throws ApiException if fails to make API call + */ + public BigDecimal fakeOuterNumberSerialize(BigDecimal body, Map additionalHeaders) throws ApiException { Object localVarPostBody = body; // create path and map variables @@ -301,6 +381,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -332,6 +414,7 @@ public class FakeApi { localVarReturnType ); } + /** * * Test serialization of outer string types @@ -340,6 +423,19 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public String fakeOuterStringSerialize(String body) throws ApiException { + return this.fakeOuterStringSerialize(body, Collections.emptyMap()); + } + + + /** + * + * Test serialization of outer string types + * @param body Input string as post body (optional) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String fakeOuterStringSerialize(String body, Map additionalHeaders) throws ApiException { Object localVarPostBody = body; // create path and map variables @@ -354,6 +450,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -385,6 +483,7 @@ public class FakeApi { localVarReturnType ); } + /** * * Test serialization of enum (int) properties with examples @@ -393,6 +492,19 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws ApiException { + return this.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty, Collections.emptyMap()); + } + + + /** + * + * Test serialization of enum (int) properties with examples + * @param outerObjectWithEnumProperty Input enum (int) as post body (required) + * @param additionalHeaders additionalHeaders for this call + * @return OuterObjectWithEnumProperty + * @throws ApiException if fails to make API call + */ + public OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(OuterObjectWithEnumProperty outerObjectWithEnumProperty, Map additionalHeaders) throws ApiException { Object localVarPostBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set @@ -412,6 +524,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -443,6 +557,7 @@ public class FakeApi { localVarReturnType ); } + /** * * For this test, the body has to be a binary file. @@ -450,6 +565,18 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public void testBodyWithBinary(File body) throws ApiException { + this.testBodyWithBinary(body, Collections.emptyMap()); + } + + + /** + * + * For this test, the body has to be a binary file. + * @param body image to upload (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testBodyWithBinary(File body, Map additionalHeaders) throws ApiException { Object localVarPostBody = body; // verify the required parameter 'body' is set @@ -469,6 +596,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -499,6 +628,7 @@ public class FakeApi { null ); } + /** * * For this test, the body for this request must reference a schema named `File`. @@ -506,6 +636,18 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public void testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass) throws ApiException { + this.testBodyWithFileSchema(fileSchemaTestClass, Collections.emptyMap()); + } + + + /** + * + * For this test, the body for this request must reference a schema named `File`. + * @param fileSchemaTestClass (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass, Map additionalHeaders) throws ApiException { Object localVarPostBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set @@ -525,6 +667,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -555,6 +699,7 @@ public class FakeApi { null ); } + /** * * @@ -563,6 +708,19 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public void testBodyWithQueryParams(String query, User user) throws ApiException { + this.testBodyWithQueryParams(query, user, Collections.emptyMap()); + } + + + /** + * + * + * @param query (required) + * @param user (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testBodyWithQueryParams(String query, User user, Map additionalHeaders) throws ApiException { Object localVarPostBody = user; // verify the required parameter 'query' is set @@ -588,6 +746,8 @@ public class FakeApi { localVarQueryParams.addAll(apiClient.parameterToPair("query", query)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -618,6 +778,7 @@ public class FakeApi { null ); } + /** * To test \"client\" model * To test \"client\" model @@ -626,6 +787,19 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public Client testClientModel(Client client) throws ApiException { + return this.testClientModel(client, Collections.emptyMap()); + } + + + /** + * To test \"client\" model + * To test \"client\" model + * @param client client model (required) + * @param additionalHeaders additionalHeaders for this call + * @return Client + * @throws ApiException if fails to make API call + */ + public Client testClientModel(Client client, Map additionalHeaders) throws ApiException { Object localVarPostBody = client; // verify the required parameter 'client' is set @@ -645,6 +819,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -676,6 +852,7 @@ public class FakeApi { localVarReturnType ); } + /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -696,6 +873,31 @@ public class FakeApi { * @throws ApiException if fails to make API call */ public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + this.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, Collections.emptyMap()); + } + + + /** + * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + * @param number None (required) + * @param _double None (required) + * @param patternWithoutDelimiter None (required) + * @param _byte None (required) + * @param integer None (optional) + * @param int32 None (optional) + * @param int64 None (optional) + * @param _float None (optional) + * @param string None (optional) + * @param binary None (optional) + * @param date None (optional) + * @param dateTime None (optional) + * @param password None (optional) + * @param paramCallback None (optional) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'number' is set @@ -730,6 +932,8 @@ public class FakeApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + if (integer != null) localVarFormParams.put("integer", integer); @@ -788,6 +992,7 @@ if (paramCallback != null) null ); } + /** * To test enum parameters * To test enum parameters @@ -803,6 +1008,26 @@ if (paramCallback != null) * @throws ApiException if fails to make API call */ public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) throws ApiException { + this.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, Collections.emptyMap()); + } + + + /** + * To test enum parameters + * To test enum parameters + * @param enumHeaderStringArray Header parameter enum test (string array) (optional + * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) + * @param enumQueryStringArray Query parameter enum test (string array) (optional + * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) + * @param enumQueryInteger Query parameter enum test (double) (optional) + * @param enumQueryDouble Query parameter enum test (double) (optional) + * @param enumQueryModelArray (optional + * @param enumFormStringArray Form parameter enum test (string array) (optional + * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -826,6 +1051,8 @@ if (paramCallback != null) if (enumHeaderString != null) localVarHeaderParams.put("enum_header_string", apiClient.parameterToString(enumHeaderString)); + localVarHeaderParams.putAll(additionalHeaders); + if (enumFormStringArray != null) localVarFormParams.put("enum_form_string_array", enumFormStringArray); @@ -860,6 +1087,7 @@ if (enumFormString != null) null ); } + /** * Fake endpoint to test group parameters (optional) * Fake endpoint to test group parameters (optional) @@ -872,6 +1100,23 @@ if (enumFormString != null) * @throws ApiException if fails to make API call */ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException { + this.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, Collections.emptyMap()); + } + + + /** + * Fake endpoint to test group parameters (optional) + * Fake endpoint to test group parameters (optional) + * @param requiredStringGroup Required String in group parameters (required) + * @param requiredBooleanGroup Required Boolean in group parameters (required) + * @param requiredInt64Group Required Integer in group parameters (required) + * @param stringGroup String in group parameters (optional) + * @param booleanGroup Boolean in group parameters (optional) + * @param int64Group Integer in group parameters (optional) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'requiredStringGroup' is set @@ -909,6 +1154,8 @@ if (enumFormString != null) if (booleanGroup != null) localVarHeaderParams.put("boolean_group", apiClient.parameterToString(booleanGroup)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -939,6 +1186,7 @@ if (booleanGroup != null) null ); } + /** * test inline additionalProperties * @@ -946,6 +1194,18 @@ if (booleanGroup != null) * @throws ApiException if fails to make API call */ public void testInlineAdditionalProperties(Map requestBody) throws ApiException { + this.testInlineAdditionalProperties(requestBody, Collections.emptyMap()); + } + + + /** + * test inline additionalProperties + * + * @param requestBody request body (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testInlineAdditionalProperties(Map requestBody, Map additionalHeaders) throws ApiException { Object localVarPostBody = requestBody; // verify the required parameter 'requestBody' is set @@ -965,6 +1225,8 @@ if (booleanGroup != null) Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -995,6 +1257,7 @@ if (booleanGroup != null) null ); } + /** * test json serialization of form data * @@ -1003,6 +1266,19 @@ if (booleanGroup != null) * @throws ApiException if fails to make API call */ public void testJsonFormData(String param, String param2) throws ApiException { + this.testJsonFormData(param, param2, Collections.emptyMap()); + } + + + /** + * test json serialization of form data + * + * @param param field1 (required) + * @param param2 field2 (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testJsonFormData(String param, String param2, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'param' is set @@ -1027,6 +1303,8 @@ if (booleanGroup != null) Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + if (param != null) localVarFormParams.put("param", param); @@ -1061,6 +1339,7 @@ if (param2 != null) null ); } + /** * * To test the collection format in query parameters @@ -1074,6 +1353,24 @@ if (param2 != null) * @throws ApiException if fails to make API call */ public void testQueryParameterCollectionFormat(List pipe, List ioutil, List http, List url, List context, String allowEmpty, Map language) throws ApiException { + this.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, allowEmpty, language, Collections.emptyMap()); + } + + + /** + * + * To test the collection format in query parameters + * @param pipe (required) + * @param ioutil (required) + * @param http (required) + * @param url (required) + * @param context (required) + * @param allowEmpty (required) + * @param language (optional + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void testQueryParameterCollectionFormat(List pipe, List ioutil, List http, List url, List context, String allowEmpty, Map language, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'pipe' is set @@ -1125,6 +1422,8 @@ if (param2 != null) localVarQueryParams.addAll(apiClient.parameterToPair("language", language)); localVarQueryParams.addAll(apiClient.parameterToPair("allowEmpty", allowEmpty)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -1155,4 +1454,5 @@ if (param2 != null) null ); } + } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 4e3839ffdf7..dd68819959f 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -24,6 +24,7 @@ import org.openapitools.client.model.Client; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +32,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FakeClassnameTags123Api { + + private ApiClient apiClient; public FakeClassnameTags123Api() { @@ -57,6 +60,19 @@ public class FakeClassnameTags123Api { * @throws ApiException if fails to make API call */ public Client testClassname(Client client) throws ApiException { + return this.testClassname(client, Collections.emptyMap()); + } + + + /** + * To test class name in snake case + * To test class name in snake case + * @param client client model (required) + * @param additionalHeaders additionalHeaders for this call + * @return Client + * @throws ApiException if fails to make API call + */ + public Client testClassname(Client client, Map additionalHeaders) throws ApiException { Object localVarPostBody = client; // verify the required parameter 'client' is set @@ -76,6 +92,8 @@ public class FakeClassnameTags123Api { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -107,4 +125,5 @@ public class FakeClassnameTags123Api { localVarReturnType ); } + } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/PetApi.java index 1da9b5cc1d1..e9b323aaf11 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -34,6 +35,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class PetApi { + + private ApiClient apiClient; public PetApi() { @@ -59,6 +62,18 @@ public class PetApi { * @throws ApiException if fails to make API call */ public void addPet(Pet pet) throws ApiException { + this.addPet(pet, Collections.emptyMap()); + } + + + /** + * Add a new pet to the store + * + * @param pet Pet object that needs to be added to the store (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void addPet(Pet pet, Map additionalHeaders) throws ApiException { Object localVarPostBody = pet; // verify the required parameter 'pet' is set @@ -78,6 +93,8 @@ public class PetApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -108,6 +125,7 @@ public class PetApi { null ); } + /** * Deletes a pet * @@ -116,6 +134,19 @@ public class PetApi { * @throws ApiException if fails to make API call */ public void deletePet(Long petId, String apiKey) throws ApiException { + this.deletePet(petId, apiKey, Collections.emptyMap()); + } + + + /** + * Deletes a pet + * + * @param petId Pet id to delete (required) + * @param apiKey (optional) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void deletePet(Long petId, String apiKey, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'petId' is set @@ -138,6 +169,8 @@ public class PetApi { if (apiKey != null) localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -168,6 +201,7 @@ public class PetApi { null ); } + /** * Finds Pets by status * Multiple status values can be provided with comma separated strings @@ -176,6 +210,19 @@ public class PetApi { * @throws ApiException if fails to make API call */ public List findPetsByStatus(List status) throws ApiException { + return this.findPetsByStatus(status, Collections.emptyMap()); + } + + + /** + * Finds Pets by status + * Multiple status values can be provided with comma separated strings + * @param status Status values that need to be considered for filter (required) + * @param additionalHeaders additionalHeaders for this call + * @return List<Pet> + * @throws ApiException if fails to make API call + */ + public List findPetsByStatus(List status, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'status' is set @@ -196,6 +243,8 @@ public class PetApi { localVarCollectionQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -227,6 +276,7 @@ public class PetApi { localVarReturnType ); } + /** * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. @@ -237,6 +287,21 @@ public class PetApi { */ @Deprecated public Set findPetsByTags(Set tags) throws ApiException { + return this.findPetsByTags(tags, Collections.emptyMap()); + } + + + /** + * Finds Pets by tags + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * @param tags Tags to filter by (required) + * @param additionalHeaders additionalHeaders for this call + * @return Set<Pet> + * @throws ApiException if fails to make API call + * @deprecated + */ + @Deprecated + public Set findPetsByTags(Set tags, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'tags' is set @@ -257,6 +322,8 @@ public class PetApi { localVarCollectionQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -288,6 +355,7 @@ public class PetApi { localVarReturnType ); } + /** * Find pet by ID * Returns a single pet @@ -296,6 +364,19 @@ public class PetApi { * @throws ApiException if fails to make API call */ public Pet getPetById(Long petId) throws ApiException { + return this.getPetById(petId, Collections.emptyMap()); + } + + + /** + * Find pet by ID + * Returns a single pet + * @param petId ID of pet to return (required) + * @param additionalHeaders additionalHeaders for this call + * @return Pet + * @throws ApiException if fails to make API call + */ + public Pet getPetById(Long petId, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'petId' is set @@ -316,6 +397,8 @@ public class PetApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -347,6 +430,7 @@ public class PetApi { localVarReturnType ); } + /** * Update an existing pet * @@ -354,6 +438,18 @@ public class PetApi { * @throws ApiException if fails to make API call */ public void updatePet(Pet pet) throws ApiException { + this.updatePet(pet, Collections.emptyMap()); + } + + + /** + * Update an existing pet + * + * @param pet Pet object that needs to be added to the store (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void updatePet(Pet pet, Map additionalHeaders) throws ApiException { Object localVarPostBody = pet; // verify the required parameter 'pet' is set @@ -373,6 +469,8 @@ public class PetApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -403,6 +501,7 @@ public class PetApi { null ); } + /** * Updates a pet in the store with form data * @@ -412,6 +511,20 @@ public class PetApi { * @throws ApiException if fails to make API call */ public void updatePetWithForm(Long petId, String name, String status) throws ApiException { + this.updatePetWithForm(petId, name, status, Collections.emptyMap()); + } + + + /** + * Updates a pet in the store with form data + * + * @param petId ID of pet that needs to be updated (required) + * @param name Updated name of the pet (optional) + * @param status Updated status of the pet (optional) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void updatePetWithForm(Long petId, String name, String status, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'petId' is set @@ -432,6 +545,8 @@ public class PetApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + if (name != null) localVarFormParams.put("name", name); @@ -466,6 +581,7 @@ if (status != null) null ); } + /** * uploads an image * @@ -476,6 +592,21 @@ if (status != null) * @throws ApiException if fails to make API call */ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File _file) throws ApiException { + return this.uploadFile(petId, additionalMetadata, _file, Collections.emptyMap()); + } + + + /** + * uploads an image + * + * @param petId ID of pet to update (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param _file file to upload (optional) + * @param additionalHeaders additionalHeaders for this call + * @return ModelApiResponse + * @throws ApiException if fails to make API call + */ + public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File _file, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'petId' is set @@ -496,6 +627,8 @@ if (status != null) Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + if (additionalMetadata != null) localVarFormParams.put("additionalMetadata", additionalMetadata); @@ -531,6 +664,7 @@ if (_file != null) localVarReturnType ); } + /** * uploads an image (required) * @@ -541,6 +675,21 @@ if (_file != null) * @throws ApiException if fails to make API call */ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws ApiException { + return this.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, Collections.emptyMap()); + } + + + /** + * uploads an image (required) + * + * @param petId ID of pet to update (required) + * @param requiredFile file to upload (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param additionalHeaders additionalHeaders for this call + * @return ModelApiResponse + * @throws ApiException if fails to make API call + */ + public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'petId' is set @@ -566,6 +715,8 @@ if (_file != null) Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + if (additionalMetadata != null) localVarFormParams.put("additionalMetadata", additionalMetadata); @@ -601,4 +752,5 @@ if (requiredFile != null) localVarReturnType ); } + } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/StoreApi.java index 5ecd834878a..2c21005990f 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/StoreApi.java @@ -24,6 +24,7 @@ import org.openapitools.client.model.Order; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +32,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class StoreApi { + + private ApiClient apiClient; public StoreApi() { @@ -56,6 +59,18 @@ public class StoreApi { * @throws ApiException if fails to make API call */ public void deleteOrder(String orderId) throws ApiException { + this.deleteOrder(orderId, Collections.emptyMap()); + } + + + /** + * Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * @param orderId ID of the order that needs to be deleted (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void deleteOrder(String orderId, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'orderId' is set @@ -76,6 +91,8 @@ public class StoreApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -106,6 +123,7 @@ public class StoreApi { null ); } + /** * Returns pet inventories by status * Returns a map of status codes to quantities @@ -113,6 +131,18 @@ public class StoreApi { * @throws ApiException if fails to make API call */ public Map getInventory() throws ApiException { + return this.getInventory(Collections.emptyMap()); + } + + + /** + * Returns pet inventories by status + * Returns a map of status codes to quantities + * @param additionalHeaders additionalHeaders for this call + * @return Map<String, Integer> + * @throws ApiException if fails to make API call + */ + public Map getInventory(Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -127,6 +157,8 @@ public class StoreApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -158,6 +190,7 @@ public class StoreApi { localVarReturnType ); } + /** * Find purchase order by ID * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions @@ -166,6 +199,19 @@ public class StoreApi { * @throws ApiException if fails to make API call */ public Order getOrderById(Long orderId) throws ApiException { + return this.getOrderById(orderId, Collections.emptyMap()); + } + + + /** + * Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + * @param orderId ID of pet that needs to be fetched (required) + * @param additionalHeaders additionalHeaders for this call + * @return Order + * @throws ApiException if fails to make API call + */ + public Order getOrderById(Long orderId, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'orderId' is set @@ -186,6 +232,8 @@ public class StoreApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -217,6 +265,7 @@ public class StoreApi { localVarReturnType ); } + /** * Place an order for a pet * @@ -225,6 +274,19 @@ public class StoreApi { * @throws ApiException if fails to make API call */ public Order placeOrder(Order order) throws ApiException { + return this.placeOrder(order, Collections.emptyMap()); + } + + + /** + * Place an order for a pet + * + * @param order order placed for purchasing the pet (required) + * @param additionalHeaders additionalHeaders for this call + * @return Order + * @throws ApiException if fails to make API call + */ + public Order placeOrder(Order order, Map additionalHeaders) throws ApiException { Object localVarPostBody = order; // verify the required parameter 'order' is set @@ -244,6 +306,8 @@ public class StoreApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -275,4 +339,5 @@ public class StoreApi { localVarReturnType ); } + } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/UserApi.java index 205427abdb8..f8b7c1ed598 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/UserApi.java @@ -25,6 +25,7 @@ import org.openapitools.client.model.User; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,6 +33,8 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class UserApi { + + private ApiClient apiClient; public UserApi() { @@ -57,6 +60,18 @@ public class UserApi { * @throws ApiException if fails to make API call */ public void createUser(User user) throws ApiException { + this.createUser(user, Collections.emptyMap()); + } + + + /** + * Create user + * This can only be done by the logged in user. + * @param user Created user object (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void createUser(User user, Map additionalHeaders) throws ApiException { Object localVarPostBody = user; // verify the required parameter 'user' is set @@ -76,6 +91,8 @@ public class UserApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -106,6 +123,7 @@ public class UserApi { null ); } + /** * Creates list of users with given input array * @@ -113,6 +131,18 @@ public class UserApi { * @throws ApiException if fails to make API call */ public void createUsersWithArrayInput(List user) throws ApiException { + this.createUsersWithArrayInput(user, Collections.emptyMap()); + } + + + /** + * Creates list of users with given input array + * + * @param user List of user object (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void createUsersWithArrayInput(List user, Map additionalHeaders) throws ApiException { Object localVarPostBody = user; // verify the required parameter 'user' is set @@ -132,6 +162,8 @@ public class UserApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -162,6 +194,7 @@ public class UserApi { null ); } + /** * Creates list of users with given input array * @@ -169,6 +202,18 @@ public class UserApi { * @throws ApiException if fails to make API call */ public void createUsersWithListInput(List user) throws ApiException { + this.createUsersWithListInput(user, Collections.emptyMap()); + } + + + /** + * Creates list of users with given input array + * + * @param user List of user object (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void createUsersWithListInput(List user, Map additionalHeaders) throws ApiException { Object localVarPostBody = user; // verify the required parameter 'user' is set @@ -188,6 +233,8 @@ public class UserApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -218,6 +265,7 @@ public class UserApi { null ); } + /** * Delete user * This can only be done by the logged in user. @@ -225,6 +273,18 @@ public class UserApi { * @throws ApiException if fails to make API call */ public void deleteUser(String username) throws ApiException { + this.deleteUser(username, Collections.emptyMap()); + } + + + /** + * Delete user + * This can only be done by the logged in user. + * @param username The name that needs to be deleted (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void deleteUser(String username, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'username' is set @@ -245,6 +305,8 @@ public class UserApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -275,6 +337,7 @@ public class UserApi { null ); } + /** * Get user by user name * @@ -283,6 +346,19 @@ public class UserApi { * @throws ApiException if fails to make API call */ public User getUserByName(String username) throws ApiException { + return this.getUserByName(username, Collections.emptyMap()); + } + + + /** + * Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @param additionalHeaders additionalHeaders for this call + * @return User + * @throws ApiException if fails to make API call + */ + public User getUserByName(String username, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'username' is set @@ -303,6 +379,8 @@ public class UserApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -334,6 +412,7 @@ public class UserApi { localVarReturnType ); } + /** * Logs user into the system * @@ -343,6 +422,20 @@ public class UserApi { * @throws ApiException if fails to make API call */ public String loginUser(String username, String password) throws ApiException { + return this.loginUser(username, password, Collections.emptyMap()); + } + + + /** + * Logs user into the system + * + * @param username The user name for login (required) + * @param password The password for login in clear text (required) + * @param additionalHeaders additionalHeaders for this call + * @return String + * @throws ApiException if fails to make API call + */ + public String loginUser(String username, String password, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'username' is set @@ -369,6 +462,8 @@ public class UserApi { localVarQueryParams.addAll(apiClient.parameterToPair("username", username)); localVarQueryParams.addAll(apiClient.parameterToPair("password", password)); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -400,12 +495,24 @@ public class UserApi { localVarReturnType ); } + /** * Logs out current logged in user session * * @throws ApiException if fails to make API call */ public void logoutUser() throws ApiException { + this.logoutUser(Collections.emptyMap()); + } + + + /** + * Logs out current logged in user session + * + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void logoutUser(Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -420,6 +527,8 @@ public class UserApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -450,6 +559,7 @@ public class UserApi { null ); } + /** * Updated user * This can only be done by the logged in user. @@ -458,6 +568,19 @@ public class UserApi { * @throws ApiException if fails to make API call */ public void updateUser(String username, User user) throws ApiException { + this.updateUser(username, user, Collections.emptyMap()); + } + + + /** + * Updated user + * This can only be done by the logged in user. + * @param username name that need to be deleted (required) + * @param user Updated user object (required) + * @param additionalHeaders additionalHeaders for this call + * @throws ApiException if fails to make API call + */ + public void updateUser(String username, User user, Map additionalHeaders) throws ApiException { Object localVarPostBody = user; // verify the required parameter 'username' is set @@ -483,6 +606,8 @@ public class UserApi { Map localVarFormParams = new HashMap(); + localVarHeaderParams.putAll(additionalHeaders); + final String[] localVarAccepts = { @@ -513,4 +638,5 @@ public class UserApi { null ); } + } From 388147f822a1b260a91c48b7006c1a28b3905117 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Tue, 14 Mar 2023 22:58:09 -0400 Subject: [PATCH 049/131] suffixed variables with LocalVar to avoid conflicts (#14958) --- .../generichost/OperationOrDefault.mustache | 8 +- .../libraries/generichost/api.mustache | 160 +-- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 76 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 136 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 1248 ++++++++--------- .../Api/FakeClassnameTags123Api.cs | 92 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 848 +++++------ .../src/Org.OpenAPITools/Api/StoreApi.cs | 278 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 536 +++---- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 76 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 136 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 1224 ++++++++-------- .../Api/FakeClassnameTags123Api.cs | 92 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 848 +++++------ .../src/Org.OpenAPITools/Api/StoreApi.cs | 270 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 528 +++---- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 66 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 64 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 64 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 76 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 136 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 1224 ++++++++-------- .../Api/FakeClassnameTags123Api.cs | 92 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 848 +++++------ .../src/Org.OpenAPITools/Api/StoreApi.cs | 270 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 528 +++---- 26 files changed, 4962 insertions(+), 4962 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OperationOrDefault.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OperationOrDefault.mustache index 01a2d1daf10..399c67f02e8 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OperationOrDefault.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OperationOrDefault.mustache @@ -9,16 +9,16 @@ /// <> public async Task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}> {{operationId}}OrDefaultAsync({{>OperationSignature}}) { - ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}>{{nrt?}} result = null; + ApiResponse<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}>{{nrt?}} apiResponseLocalVar = null; try { - result = await {{operationId}}WithHttpInfoAsync({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await {{operationId}}WithHttpInfoAsync({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache index f884deda4e8..f7e0b402f1a 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache @@ -160,14 +160,14 @@ namespace {{packageName}}.{{apiPackage}} /// <> public async Task<{{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}object{{/returnType}}> {{operationId}}Async({{>OperationSignature}}) { - ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}> result = await {{operationId}}WithHttpInfoAsync({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}cancellationToken).ConfigureAwait(false); + ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}> apiResponseLocalVar = await {{operationId}}WithHttpInfoAsync({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#allParams.0}}, {{/allParams.0}}cancellationToken).ConfigureAwait(false); {{^nrt}}{{#returnTypeIsPrimitive}}#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - {{/returnTypeIsPrimitive}}{{/nrt}}if (result.Content == null){{^nrt}}{{#returnTypeIsPrimitive}} + {{/returnTypeIsPrimitive}}{{/nrt}}if (apiResponseLocalVar.Content == null){{^nrt}}{{#returnTypeIsPrimitive}} #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'{{/returnTypeIsPrimitive}}{{/nrt}} - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content{{#nrt}}{{#returnProperty}}{{#isPrimitiveType}}{{^isMap}}{{^isString}}.Value{{/isString}}{{/isMap}}{{/isPrimitiveType}}{{/returnProperty}}{{/nrt}}; + return apiResponseLocalVar.Content{{#nrt}}{{#returnProperty}}{{#isPrimitiveType}}{{^isMap}}{{^isString}}.Value{{/isString}}{{/isMap}}{{/isPrimitiveType}}{{/returnProperty}}{{/nrt}}; } {{#nrt}} @@ -219,11 +219,11 @@ namespace {{packageName}}.{{apiPackage}} /// /// Processes the server response /// - /// + /// {{#allParams}} /// {{/allParams}} - protected virtual void After{{operationId}}({{#lambda.joinWithComma}}ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}> apiResponse {{#allParams}}{{#requiredAndNotNullable}}{{#lambda.required}}{{{dataType}}}{{/lambda.required}} {{paramName}} {{/requiredAndNotNullable}}{{^requiredAndNotNullable}}{{#lambda.optional}}{{{dataType}}}{{/lambda.optional}} {{paramName}} {{/requiredAndNotNullable}}{{/allParams}}{{/lambda.joinWithComma}}) + protected virtual void After{{operationId}}({{#lambda.joinWithComma}}ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}> apiResponseLocalVar {{#allParams}}{{#requiredAndNotNullable}}{{#lambda.required}}{{{dataType}}}{{/lambda.required}} {{paramName}} {{/requiredAndNotNullable}}{{^requiredAndNotNullable}}{{#lambda.optional}}{{{dataType}}}{{/lambda.optional}} {{paramName}} {{/requiredAndNotNullable}}{{/allParams}}{{/lambda.joinWithComma}}) { } @@ -252,44 +252,44 @@ namespace {{packageName}}.{{apiPackage}} /// <> where T : public async Task> {{operationId}}WithHttpInfoAsync({{>OperationSignature}}) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - {{#allParams}}{{#-first}}{{#-last}}{{paramName}} = {{/-last}}{{^-last}}var validatedParameters = {{/-last}}{{/-first}}{{/allParams}}On{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); + {{#allParams}}{{#-first}}{{#-last}}{{paramName}} = {{/-last}}{{^-last}}var validatedParameterLocalVars = {{/-last}}{{/-first}}{{/allParams}}On{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); {{#allParams}} {{#-first}} {{^-last}} {{#allParams}} - {{paramName}} = validatedParameters.Item{{-index}}; + {{paramName}} = validatedParameterLocalVars.Item{{-index}}; {{/allParams}} {{/-last}} {{/-first}} {{/allParams}} - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { {{^servers}} - uriBuilder.Host = HttpClient.BaseAddress{{nrt!}}.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "{{path}}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress{{nrt!}}.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "{{path}}"; {{/servers}} {{#servers}} {{#-first}} - var url = request.RequestUri = new Uri("{{url}}"); - uriBuilder.Host = url.Authority; - uriBuilder.Scheme = url.Scheme; - uriBuilder.Path = url.AbsolutePath; + Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("{{url}}"); + uriBuilderLocalVar.Host = urlLocalVar.Authority; + uriBuilderLocalVar.Scheme = urlLocalVar.Scheme; + uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath; {{/-first}} {{/servers}} {{#pathParams}} {{#required}} - uriBuilder.Path = uriBuilder.Path.Replace("%7B{{baseName}}%7D", Uri.EscapeDataString({{paramName}}.ToString()));{{/required}}{{^required}} + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7B{{baseName}}%7D", Uri.EscapeDataString({{paramName}}.ToString()));{{/required}}{{^required}} if ({{paramName}} != null) - uriBuilder.Path = uriBuilder.Path + $"/{ Uri.EscapeDataString({{paramName}}).ToString()) }"; + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path + $"/{ Uri.EscapeDataString({{paramName}}).ToString()) }"; {{#-last}} {{/-last}} @@ -297,167 +297,167 @@ namespace {{packageName}}.{{apiPackage}} {{/pathParams}} {{#queryParams}} {{#-first}} - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);{{/-first}}{{/queryParams}}{{^queryParams}}{{#authMethods}}{{#isApiKey}}{{#isKeyInQuery}} + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);{{/-first}}{{/queryParams}}{{^queryParams}}{{#authMethods}}{{#isApiKey}}{{#isKeyInQuery}} - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}{{/queryParams}}{{#queryParams}}{{#required}}{{#-first}} + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}{{/queryParams}}{{#queryParams}}{{#required}}{{#-first}} {{! all the redundant tags here are to get the spacing just right }} - {{/-first}}{{/required}}{{/queryParams}}{{#queryParams}}{{#required}}parseQueryString["{{baseName}}"] = {{paramName}}.ToString(); + {{/-first}}{{/required}}{{/queryParams}}{{#queryParams}}{{#required}}parseQueryStringLocalVar["{{baseName}}"] = {{paramName}}.ToString(); {{/required}}{{/queryParams}}{{#queryParams}}{{#-first}} {{/-first}}{{/queryParams}}{{#queryParams}}{{^required}}if ({{paramName}} != null) - parseQueryString["{{baseName}}"] = {{paramName}}.ToString(); + parseQueryStringLocalVar["{{baseName}}"] = {{paramName}}.ToString(); - {{/required}}{{#-last}}uriBuilder.Query = parseQueryString.ToString(); + {{/required}}{{#-last}}uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); {{/-last}} {{/queryParams}} {{#headerParams}} {{#required}} - request.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}})); + httpRequestMessageLocalVar.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}})); {{/required}} {{^required}} if ({{paramName}} != null) - request.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}})); + httpRequestMessageLocalVar.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}})); {{/required}} {{/headerParams}} {{#formParams}} {{#-first}} - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams));{{/-first}}{{^isFile}}{{#required}} + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars));{{/-first}}{{^isFile}}{{#required}} - formParams.Add(new KeyValuePair("{{baseName}}", ClientUtils.ParameterToString({{paramName}}))); + formParameterLocalVars.Add(new KeyValuePair("{{baseName}}", ClientUtils.ParameterToString({{paramName}}))); {{/required}} {{^required}} if ({{paramName}} != null) - formParams.Add(new KeyValuePair("{{baseName}}", ClientUtils.ParameterToString({{paramName}}))); + formParameterLocalVars.Add(new KeyValuePair("{{baseName}}", ClientUtils.ParameterToString({{paramName}}))); {{/required}} {{/isFile}} {{#isFile}} {{#required}} - multipartContent.Add(new StreamContent({{paramName}})); + multipartContentLocalVar.Add(new StreamContent({{paramName}})); {{/required}} {{^required}} if ({{paramName}} != null) - multipartContent.Add(new StreamContent({{paramName}})); + multipartContentLocalVar.Add(new StreamContent({{paramName}})); {{/required}} {{/isFile}} {{/formParams}} {{#bodyParam}} - request.Content = ({{paramName}} as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize({{paramName}}, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = ({{paramName}} as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize({{paramName}}, _jsonSerializerOptions)); {{/bodyParam}} {{#authMethods}} {{#-first}} - List tokens = new List(); + List tokenBaseLocalVars = new List(); {{/-first}} {{#isApiKey}} - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey);{{#isKeyInHeader}} + tokenBaseLocalVars.Add(apiKeyTokenLocalVar);{{#isKeyInHeader}} - apiKey.UseInHeader(request, "{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}} + apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}} - apiKey.UseInQuery(request, uriBuilder, parseQueryString, "{{keyParamName}}"); + apiKeyTokenLocalVar.UseInQuery(httpRequestMessageLocalVar, uriBuilderLocalVar, parseQueryStringLocalVar, "{{keyParamName}}"); - uriBuilder.Query = parseQueryString.ToString();{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}} + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}} {{! below line must be after any UseInQuery calls, but before using the HttpSignatureToken}} - request.RequestUri = uriBuilder.Uri;{{#authMethods}}{{#isBasicBasic}} + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;{{#authMethods}}{{#isBasicBasic}} - BasicToken basicToken = (BasicToken) await BasicTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + BasicToken basicTokenLocalVar = (BasicToken) await BasicTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(basicToken); + tokenBaseLocalVars.Add(basicTokenLocalVar); - basicToken.UseInHeader(request, "{{keyParamName}}");{{/isBasicBasic}}{{#isBasicBearer}} + basicTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "{{keyParamName}}");{{/isBasicBasic}}{{#isBasicBearer}} - BearerToken bearerToken = (BearerToken) await BearerTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + BearerToken bearerTokenLocalVar = (BearerToken) await BearerTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(bearerToken); + tokenBaseLocalVars.Add(bearerTokenLocalVar); - bearerToken.UseInHeader(request, "{{keyParamName}}");{{/isBasicBearer}}{{#isOAuth}} + bearerTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "{{keyParamName}}");{{/isBasicBearer}}{{#isOAuth}} - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, "{{keyParamName}}");{{/isOAuth}}{{#isHttpSignature}} + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "{{keyParamName}}");{{/isOAuth}}{{#isHttpSignature}} - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content{{nrt!}}.ReadAsStringAsync({{^netStandard}}{{^netcoreapp3.1}}cancellationToken.GetValueOrDefault(){{/netcoreapp3.1}}{{/netStandard}}).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content{{nrt!}}.ReadAsStringAsync({{^netStandard}}{{^netcoreapp3.1}}cancellationToken.GetValueOrDefault(){{/netcoreapp3.1}}{{/netStandard}}).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken);{{/isHttpSignature}}{{/authMethods}}{{#consumes}}{{#-first}} + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken);{{/isHttpSignature}}{{/authMethods}}{{#consumes}}{{#-first}} string[] contentTypes = new string[] { {{/-first}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{#-last}} };{{/-last}}{{/consumes}}{{#consumes}}{{#-first}} - string{{nrt?}} contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string{{nrt?}} contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType);{{/-first}}{{/consumes}}{{#produces}}{{#-first}} + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar);{{/-first}}{{/consumes}}{{#produces}}{{#-first}} - string[] accepts = new string[] { {{/-first}}{{/produces}} + string[] acceptLocalVars = new string[] { {{/-first}}{{/produces}} {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}{{#produces}}{{#-last}} };{{/-last}}{{/produces}}{{#produces}}{{#-first}} - string{{nrt?}} accept = ClientUtils.SelectHeaderAccept(accepts); + string{{nrt?}} acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); {{/-first}} {{/produces}} {{^netStandard}} - request.Method = HttpMethod.{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}};{{/netStandard}}{{#netStandard}} - request.Method = new HttpMethod("{{#lambda.uppercase}}{{httpMethod}}{{/lambda.uppercase}}");{{/netStandard}}{{! early standard versions do not have HttpMethod.Patch }} + httpRequestMessageLocalVar.Method = HttpMethod.{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}};{{/netStandard}}{{#netStandard}} + httpRequestMessageLocalVar.Method = new HttpMethod("{{#lambda.uppercase}}{{httpMethod}}{{/lambda.uppercase}}");{{/netStandard}}{{! early standard versions do not have HttpMethod.Patch }} - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "{{path}}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "{{path}}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync({{^netStandard}}{{^netcoreapp3.1}}cancellationToken.GetValueOrDefault(){{/netcoreapp3.1}}{{/netStandard}}).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync({{^netStandard}}{{^netcoreapp3.1}}cancellationToken.GetValueOrDefault(){{/netcoreapp3.1}}{{/netStandard}}).ConfigureAwait(false); - ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}> apiResponse = new ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}>(responseMessage, responseContent); + ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}> apiResponseLocalVar = new ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}{{nrt?}}>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}>(apiResponse.RawContent, _jsonSerializerOptions); - After{{operationId}}({{#lambda.joinWithComma}}apiResponse {{#allParams}}{{paramName}} {{/allParams}}{{/lambda.joinWithComma}}); + apiResponseLocalVar.Content = JsonSerializer.Deserialize<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}object{{/returnType}}>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + After{{operationId}}({{#lambda.joinWithComma}}apiResponseLocalVar {{#allParams}}{{paramName}} {{/allParams}}{{/lambda.joinWithComma}}); } {{#authMethods}} - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); {{/authMethods}} - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnError{{operationId}}({{#lambda.joinWithComma}}e "{{path}}" uriBuilder.Path {{#allParams}}{{paramName}} {{/allParams}}{{/lambda.joinWithComma}}); + OnError{{operationId}}({{#lambda.joinWithComma}}e "{{path}}" uriBuilderLocalVar.Path {{#allParams}}{{paramName}} {{/allParams}}{{/lambda.joinWithComma}}); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 6ef3d1665dd..69ad0c187e5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -149,12 +149,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -166,17 +166,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -202,9 +202,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCall123TestSpecialTags(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterCall123TestSpecialTags(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -229,70 +229,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnCall123TestSpecialTags(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/another-fake/dummy"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/another-fake/dummy"; - request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Patch; + httpRequestMessageLocalVar.Method = HttpMethod.Patch; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/another-fake/dummy", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/another-fake/dummy", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCall123TestSpecialTags(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCall123TestSpecialTags(apiResponseLocalVar, modelClient); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCall123TestSpecialTags(e, "/another-fake/dummy", uriBuilder.Path, modelClient); + OnErrorCall123TestSpecialTags(e, "/another-fake/dummy", uriBuilderLocalVar.Path, modelClient); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs index ec823694979..3b7f537d72e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -180,12 +180,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FooGetAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -196,17 +196,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FooGetOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -222,8 +222,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterFooGet(ApiResponse apiResponse) + /// + protected virtual void AfterFooGet(ApiResponse apiResponseLocalVar) { } @@ -246,57 +246,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FooGetWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnFooGet(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/foo"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/foo"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/foo", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/foo", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFooGet(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFooGet(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFooGet(e, "/foo", uriBuilder.Path); + OnErrorFooGet(e, "/foo", uriBuilderLocalVar.Path); throw; } } @@ -310,12 +310,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetCountryAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -327,17 +327,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetCountryOrDefaultAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -363,9 +363,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetCountry(ApiResponse apiResponse, string country) + protected virtual void AfterGetCountry(ApiResponse apiResponseLocalVar, string country) { } @@ -390,67 +390,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetCountryWithHttpInfoAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { country = OnGetCountry(country); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/country"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/country"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("country", ClientUtils.ParameterToString(country))); + formParameterLocalVars.Add(new KeyValuePair("country", ClientUtils.ParameterToString(country))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/country", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/country", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetCountry(apiResponse, country); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetCountry(apiResponseLocalVar, country); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetCountry(e, "/country", uriBuilder.Path, country); + OnErrorGetCountry(e, "/country", uriBuilderLocalVar.Path, country); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs index 28bec8edf86..3a2112ef8ec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs @@ -728,12 +728,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeHealthGetAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -744,17 +744,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeHealthGetOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -770,8 +770,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterFakeHealthGet(ApiResponse apiResponse) + /// + protected virtual void AfterFakeHealthGet(ApiResponse apiResponseLocalVar) { } @@ -794,57 +794,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeHealthGetWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnFakeHealthGet(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/health"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/health"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/health", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/health", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeHealthGet(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeHealthGet(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeHealthGet(e, "/fake/health", uriBuilder.Path); + OnErrorFakeHealthGet(e, "/fake/health", uriBuilderLocalVar.Path); throw; } } @@ -858,12 +858,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content.Value; + return apiResponseLocalVar.Content.Value; } /// @@ -875,17 +875,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterBooleanSerializeOrDefaultAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -902,9 +902,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterBooleanSerialize(ApiResponse apiResponse, bool? body) + protected virtual void AfterFakeOuterBooleanSerialize(ApiResponse apiResponseLocalVar, bool? body) { } @@ -929,70 +929,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { body = OnFakeOuterBooleanSerialize(body); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/boolean"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/boolean"; - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/boolean", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/boolean", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterBooleanSerialize(apiResponse, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterBooleanSerialize(apiResponseLocalVar, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterBooleanSerialize(e, "/fake/outer/boolean", uriBuilder.Path, body); + OnErrorFakeOuterBooleanSerialize(e, "/fake/outer/boolean", uriBuilderLocalVar.Path, body); throw; } } @@ -1006,12 +1006,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterCompositeSerializeAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1023,17 +1023,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1050,9 +1050,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterCompositeSerialize(ApiResponse apiResponse, OuterComposite? outerComposite) + protected virtual void AfterFakeOuterCompositeSerialize(ApiResponse apiResponseLocalVar, OuterComposite? outerComposite) { } @@ -1077,70 +1077,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { outerComposite = OnFakeOuterCompositeSerialize(outerComposite); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/composite"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/composite"; - request.Content = (outerComposite as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(outerComposite, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (outerComposite as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(outerComposite, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/composite", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/composite", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterCompositeSerialize(apiResponse, outerComposite); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterCompositeSerialize(apiResponseLocalVar, outerComposite); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterCompositeSerialize(e, "/fake/outer/composite", uriBuilder.Path, outerComposite); + OnErrorFakeOuterCompositeSerialize(e, "/fake/outer/composite", uriBuilderLocalVar.Path, outerComposite); throw; } } @@ -1154,12 +1154,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content.Value; + return apiResponseLocalVar.Content.Value; } /// @@ -1171,17 +1171,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterNumberSerializeOrDefaultAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1198,9 +1198,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterNumberSerialize(ApiResponse apiResponse, decimal? body) + protected virtual void AfterFakeOuterNumberSerialize(ApiResponse apiResponseLocalVar, decimal? body) { } @@ -1225,70 +1225,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { body = OnFakeOuterNumberSerialize(body); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/number"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/number"; - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/number", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/number", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterNumberSerialize(apiResponse, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterNumberSerialize(apiResponseLocalVar, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterNumberSerialize(e, "/fake/outer/number", uriBuilder.Path, body); + OnErrorFakeOuterNumberSerialize(e, "/fake/outer/number", uriBuilderLocalVar.Path, body); throw; } } @@ -1303,12 +1303,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterStringSerializeAsync(Guid requiredStringUuid, string? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1321,17 +1321,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterStringSerializeOrDefaultAsync(Guid requiredStringUuid, string? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1358,10 +1358,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterFakeOuterStringSerialize(ApiResponse apiResponse, Guid requiredStringUuid, string? body) + protected virtual void AfterFakeOuterStringSerialize(ApiResponse apiResponseLocalVar, Guid requiredStringUuid, string? body) { } @@ -1388,78 +1388,78 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterStringSerializeWithHttpInfoAsync(Guid requiredStringUuid, string? body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnFakeOuterStringSerialize(requiredStringUuid, body); - requiredStringUuid = validatedParameters.Item1; - body = validatedParameters.Item2; + var validatedParameterLocalVars = OnFakeOuterStringSerialize(requiredStringUuid, body); + requiredStringUuid = validatedParameterLocalVars.Item1; + body = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/string"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/string"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_uuid"] = requiredStringUuid.ToString(); + parseQueryStringLocalVar["required_string_uuid"] = requiredStringUuid.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/string", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/string", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterStringSerialize(apiResponse, requiredStringUuid, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterStringSerialize(apiResponseLocalVar, requiredStringUuid, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterStringSerialize(e, "/fake/outer/string", uriBuilder.Path, requiredStringUuid, body); + OnErrorFakeOuterStringSerialize(e, "/fake/outer/string", uriBuilderLocalVar.Path, requiredStringUuid, body); throw; } } @@ -1472,12 +1472,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> GetArrayOfEnumsAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse?> result = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse?> apiResponseLocalVar = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1488,17 +1488,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task?> GetArrayOfEnumsOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse?>? result = null; + ApiResponse?>? apiResponseLocalVar = null; try { - result = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1514,8 +1514,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterGetArrayOfEnums(ApiResponse?> apiResponse) + /// + protected virtual void AfterGetArrayOfEnums(ApiResponse?> apiResponseLocalVar) { } @@ -1538,57 +1538,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task?>> GetArrayOfEnumsWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnGetArrayOfEnums(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/array-of-enums"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/array-of-enums"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/array-of-enums", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/array-of-enums", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse?> apiResponse = new ApiResponse?>(responseMessage, responseContent); + ApiResponse?> apiResponseLocalVar = new ApiResponse?>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetArrayOfEnums(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetArrayOfEnums(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetArrayOfEnums(e, "/fake/array-of-enums", uriBuilder.Path); + OnErrorGetArrayOfEnums(e, "/fake/array-of-enums", uriBuilderLocalVar.Path); throw; } } @@ -1602,12 +1602,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1619,17 +1619,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1655,9 +1655,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestBodyWithFileSchema(ApiResponse apiResponse, FileSchemaTestClass fileSchemaTestClass) + protected virtual void AfterTestBodyWithFileSchema(ApiResponse apiResponseLocalVar, FileSchemaTestClass fileSchemaTestClass) { } @@ -1682,61 +1682,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { fileSchemaTestClass = OnTestBodyWithFileSchema(fileSchemaTestClass); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-file-schema"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-file-schema"; - request.Content = (fileSchemaTestClass as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(fileSchemaTestClass, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(fileSchemaTestClass, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/body-with-file-schema", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/body-with-file-schema", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestBodyWithFileSchema(apiResponse, fileSchemaTestClass); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestBodyWithFileSchema(apiResponseLocalVar, fileSchemaTestClass); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestBodyWithFileSchema(e, "/fake/body-with-file-schema", uriBuilder.Path, fileSchemaTestClass); + OnErrorTestBodyWithFileSchema(e, "/fake/body-with-file-schema", uriBuilderLocalVar.Path, fileSchemaTestClass); throw; } } @@ -1751,12 +1751,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1769,17 +1769,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1809,10 +1809,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterTestBodyWithQueryParams(ApiResponse apiResponse, User user, string query) + protected virtual void AfterTestBodyWithQueryParams(ApiResponse apiResponseLocalVar, User user, string query) { } @@ -1839,69 +1839,69 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestBodyWithQueryParams(user, query); - user = validatedParameters.Item1; - query = validatedParameters.Item2; + var validatedParameterLocalVars = OnTestBodyWithQueryParams(user, query); + user = validatedParameterLocalVars.Item1; + query = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-query-params"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-query-params"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["query"] = query.ToString(); + parseQueryStringLocalVar["query"] = query.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/body-with-query-params", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/body-with-query-params", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestBodyWithQueryParams(apiResponse, user, query); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestBodyWithQueryParams(apiResponseLocalVar, user, query); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query); + OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query); throw; } } @@ -1915,12 +1915,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1932,17 +1932,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1968,9 +1968,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestClientModel(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterTestClientModel(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -1995,70 +1995,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnTestClientModel(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Patch; + httpRequestMessageLocalVar.Method = HttpMethod.Patch; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestClientModel(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestClientModel(apiResponseLocalVar, modelClient); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestClientModel(e, "/fake", uriBuilder.Path, modelClient); + OnErrorTestClientModel(e, "/fake", uriBuilderLocalVar.Path, modelClient); throw; } } @@ -2085,12 +2085,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2115,17 +2115,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2173,7 +2173,7 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// @@ -2188,7 +2188,7 @@ namespace Org.OpenAPITools.Api /// /// /// - protected virtual void AfterTestEndpointParameters(ApiResponse apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream? binary, float? _float, int? integer, int? int32, long? int64, string? _string, string? password, string? callback, DateTime? dateTime) + protected virtual void AfterTestEndpointParameters(ApiResponse apiResponseLocalVar, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream? binary, float? _float, int? integer, int? int32, long? int64, string? _string, string? password, string? callback, DateTime? dateTime) { } @@ -2239,134 +2239,134 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); - _byte = validatedParameters.Item1; - number = validatedParameters.Item2; - _double = validatedParameters.Item3; - patternWithoutDelimiter = validatedParameters.Item4; - date = validatedParameters.Item5; - binary = validatedParameters.Item6; - _float = validatedParameters.Item7; - integer = validatedParameters.Item8; - int32 = validatedParameters.Item9; - int64 = validatedParameters.Item10; - _string = validatedParameters.Item11; - password = validatedParameters.Item12; - callback = validatedParameters.Item13; - dateTime = validatedParameters.Item14; + var validatedParameterLocalVars = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + _byte = validatedParameterLocalVars.Item1; + number = validatedParameterLocalVars.Item2; + _double = validatedParameterLocalVars.Item3; + patternWithoutDelimiter = validatedParameterLocalVars.Item4; + date = validatedParameterLocalVars.Item5; + binary = validatedParameterLocalVars.Item6; + _float = validatedParameterLocalVars.Item7; + integer = validatedParameterLocalVars.Item8; + int32 = validatedParameterLocalVars.Item9; + int64 = validatedParameterLocalVars.Item10; + _string = validatedParameterLocalVars.Item11; + password = validatedParameterLocalVars.Item12; + callback = validatedParameterLocalVars.Item13; + dateTime = validatedParameterLocalVars.Item14; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("byte", ClientUtils.ParameterToString(_byte))); + formParameterLocalVars.Add(new KeyValuePair("byte", ClientUtils.ParameterToString(_byte))); - formParams.Add(new KeyValuePair("number", ClientUtils.ParameterToString(number))); + formParameterLocalVars.Add(new KeyValuePair("number", ClientUtils.ParameterToString(number))); - formParams.Add(new KeyValuePair("double", ClientUtils.ParameterToString(_double))); + formParameterLocalVars.Add(new KeyValuePair("double", ClientUtils.ParameterToString(_double))); - formParams.Add(new KeyValuePair("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter))); + formParameterLocalVars.Add(new KeyValuePair("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter))); if (date != null) - formParams.Add(new KeyValuePair("date", ClientUtils.ParameterToString(date))); + formParameterLocalVars.Add(new KeyValuePair("date", ClientUtils.ParameterToString(date))); if (binary != null) - multipartContent.Add(new StreamContent(binary)); + multipartContentLocalVar.Add(new StreamContent(binary)); if (_float != null) - formParams.Add(new KeyValuePair("float", ClientUtils.ParameterToString(_float))); + formParameterLocalVars.Add(new KeyValuePair("float", ClientUtils.ParameterToString(_float))); if (integer != null) - formParams.Add(new KeyValuePair("integer", ClientUtils.ParameterToString(integer))); + formParameterLocalVars.Add(new KeyValuePair("integer", ClientUtils.ParameterToString(integer))); if (int32 != null) - formParams.Add(new KeyValuePair("int32", ClientUtils.ParameterToString(int32))); + formParameterLocalVars.Add(new KeyValuePair("int32", ClientUtils.ParameterToString(int32))); if (int64 != null) - formParams.Add(new KeyValuePair("int64", ClientUtils.ParameterToString(int64))); + formParameterLocalVars.Add(new KeyValuePair("int64", ClientUtils.ParameterToString(int64))); if (_string != null) - formParams.Add(new KeyValuePair("string", ClientUtils.ParameterToString(_string))); + formParameterLocalVars.Add(new KeyValuePair("string", ClientUtils.ParameterToString(_string))); if (password != null) - formParams.Add(new KeyValuePair("password", ClientUtils.ParameterToString(password))); + formParameterLocalVars.Add(new KeyValuePair("password", ClientUtils.ParameterToString(password))); if (callback != null) - formParams.Add(new KeyValuePair("callback", ClientUtils.ParameterToString(callback))); + formParameterLocalVars.Add(new KeyValuePair("callback", ClientUtils.ParameterToString(callback))); if (dateTime != null) - formParams.Add(new KeyValuePair("dateTime", ClientUtils.ParameterToString(dateTime))); + formParameterLocalVars.Add(new KeyValuePair("dateTime", ClientUtils.ParameterToString(dateTime))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - BasicToken basicToken = (BasicToken) await BasicTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + BasicToken basicTokenLocalVar = (BasicToken) await BasicTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(basicToken); + tokenBaseLocalVars.Add(basicTokenLocalVar); - basicToken.UseInHeader(request, ""); + basicTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestEndpointParameters(apiResponseLocalVar, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + OnErrorTestEndpointParameters(e, "/fake", uriBuilderLocalVar.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); throw; } } @@ -2387,12 +2387,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEnumParametersAsync(List? enumHeaderStringArray = null, List? enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List? enumFormStringArray = null, string? enumHeaderString = null, string? enumQueryString = null, string? enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2411,17 +2411,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEnumParametersOrDefaultAsync(List? enumHeaderStringArray = null, List? enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List? enumFormStringArray = null, string? enumHeaderString = null, string? enumQueryString = null, string? enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2445,7 +2445,7 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// @@ -2454,7 +2454,7 @@ namespace Org.OpenAPITools.Api /// /// /// - protected virtual void AfterTestEnumParameters(ApiResponse apiResponse, List? enumHeaderStringArray, List? enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List? enumFormStringArray, string? enumHeaderString, string? enumQueryString, string? enumFormString) + protected virtual void AfterTestEnumParameters(ApiResponse apiResponseLocalVar, List? enumHeaderStringArray, List? enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List? enumFormStringArray, string? enumHeaderString, string? enumQueryString, string? enumFormString) { } @@ -2493,98 +2493,98 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestEnumParametersWithHttpInfoAsync(List? enumHeaderStringArray = null, List? enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List? enumFormStringArray = null, string? enumHeaderString = null, string? enumQueryString = null, string? enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); - enumHeaderStringArray = validatedParameters.Item1; - enumQueryStringArray = validatedParameters.Item2; - enumQueryDouble = validatedParameters.Item3; - enumQueryInteger = validatedParameters.Item4; - enumFormStringArray = validatedParameters.Item5; - enumHeaderString = validatedParameters.Item6; - enumQueryString = validatedParameters.Item7; - enumFormString = validatedParameters.Item8; + var validatedParameterLocalVars = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + enumHeaderStringArray = validatedParameterLocalVars.Item1; + enumQueryStringArray = validatedParameterLocalVars.Item2; + enumQueryDouble = validatedParameterLocalVars.Item3; + enumQueryInteger = validatedParameterLocalVars.Item4; + enumFormStringArray = validatedParameterLocalVars.Item5; + enumHeaderString = validatedParameterLocalVars.Item6; + enumQueryString = validatedParameterLocalVars.Item7; + enumFormString = validatedParameterLocalVars.Item8; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); if (enumQueryStringArray != null) - parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString(); + parseQueryStringLocalVar["enum_query_string_array"] = enumQueryStringArray.ToString(); if (enumQueryDouble != null) - parseQueryString["enum_query_double"] = enumQueryDouble.ToString(); + parseQueryStringLocalVar["enum_query_double"] = enumQueryDouble.ToString(); if (enumQueryInteger != null) - parseQueryString["enum_query_integer"] = enumQueryInteger.ToString(); + parseQueryStringLocalVar["enum_query_integer"] = enumQueryInteger.ToString(); if (enumQueryString != null) - parseQueryString["enum_query_string"] = enumQueryString.ToString(); + parseQueryStringLocalVar["enum_query_string"] = enumQueryString.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); if (enumHeaderStringArray != null) - request.Headers.Add("enum_header_string_array", ClientUtils.ParameterToString(enumHeaderStringArray)); + httpRequestMessageLocalVar.Headers.Add("enum_header_string_array", ClientUtils.ParameterToString(enumHeaderStringArray)); if (enumHeaderString != null) - request.Headers.Add("enum_header_string", ClientUtils.ParameterToString(enumHeaderString)); + httpRequestMessageLocalVar.Headers.Add("enum_header_string", ClientUtils.ParameterToString(enumHeaderString)); - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (enumFormStringArray != null) - formParams.Add(new KeyValuePair("enum_form_string_array", ClientUtils.ParameterToString(enumFormStringArray))); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (enumFormStringArray != null) + formParameterLocalVars.Add(new KeyValuePair("enum_form_string_array", ClientUtils.ParameterToString(enumFormStringArray))); if (enumFormString != null) - formParams.Add(new KeyValuePair("enum_form_string", ClientUtils.ParameterToString(enumFormString))); + formParameterLocalVars.Add(new KeyValuePair("enum_form_string", ClientUtils.ParameterToString(enumFormString))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestEnumParameters(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + OnErrorTestEnumParameters(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); throw; } } @@ -2603,12 +2603,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2625,17 +2625,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2672,14 +2672,14 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// /// /// /// - protected virtual void AfterTestGroupParameters(ApiResponse apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group) + protected virtual void AfterTestGroupParameters(ApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group) { } @@ -2714,83 +2714,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); - requiredBooleanGroup = validatedParameters.Item1; - requiredStringGroup = validatedParameters.Item2; - requiredInt64Group = validatedParameters.Item3; - booleanGroup = validatedParameters.Item4; - stringGroup = validatedParameters.Item5; - int64Group = validatedParameters.Item6; + var validatedParameterLocalVars = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + requiredBooleanGroup = validatedParameterLocalVars.Item1; + requiredStringGroup = validatedParameterLocalVars.Item2; + requiredInt64Group = validatedParameterLocalVars.Item3; + booleanGroup = validatedParameterLocalVars.Item4; + stringGroup = validatedParameterLocalVars.Item5; + int64Group = validatedParameterLocalVars.Item6; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_group"] = requiredStringGroup.ToString(); - parseQueryString["required_int64_group"] = requiredInt64Group.ToString(); + parseQueryStringLocalVar["required_string_group"] = requiredStringGroup.ToString(); + parseQueryStringLocalVar["required_int64_group"] = requiredInt64Group.ToString(); if (stringGroup != null) - parseQueryString["string_group"] = stringGroup.ToString(); + parseQueryStringLocalVar["string_group"] = stringGroup.ToString(); if (int64Group != null) - parseQueryString["int64_group"] = int64Group.ToString(); + parseQueryStringLocalVar["int64_group"] = int64Group.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Headers.Add("required_boolean_group", ClientUtils.ParameterToString(requiredBooleanGroup)); + httpRequestMessageLocalVar.Headers.Add("required_boolean_group", ClientUtils.ParameterToString(requiredBooleanGroup)); if (booleanGroup != null) - request.Headers.Add("boolean_group", ClientUtils.ParameterToString(booleanGroup)); + httpRequestMessageLocalVar.Headers.Add("boolean_group", ClientUtils.ParameterToString(booleanGroup)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - BearerToken bearerToken = (BearerToken) await BearerTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + BearerToken bearerTokenLocalVar = (BearerToken) await BearerTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(bearerToken); + tokenBaseLocalVars.Add(bearerTokenLocalVar); - bearerToken.UseInHeader(request, ""); + bearerTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - request.Method = HttpMethod.Delete; + httpRequestMessageLocalVar.Method = HttpMethod.Delete; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestGroupParameters(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + OnErrorTestGroupParameters(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); throw; } } @@ -2804,12 +2804,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestInlineAdditionalPropertiesAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2821,17 +2821,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2857,9 +2857,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestInlineAdditionalProperties(ApiResponse apiResponse, Dictionary requestBody) + protected virtual void AfterTestInlineAdditionalProperties(ApiResponse apiResponseLocalVar, Dictionary requestBody) { } @@ -2884,61 +2884,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { requestBody = OnTestInlineAdditionalProperties(requestBody); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/inline-additionalProperties"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/inline-additionalProperties"; - request.Content = (requestBody as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(requestBody, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(requestBody, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/inline-additionalProperties", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/inline-additionalProperties", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestInlineAdditionalProperties(apiResponse, requestBody); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestInlineAdditionalProperties(apiResponseLocalVar, requestBody); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestInlineAdditionalProperties(e, "/fake/inline-additionalProperties", uriBuilder.Path, requestBody); + OnErrorTestInlineAdditionalProperties(e, "/fake/inline-additionalProperties", uriBuilderLocalVar.Path, requestBody); throw; } } @@ -2953,12 +2953,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2971,17 +2971,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -3011,10 +3011,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterTestJsonFormData(ApiResponse apiResponse, string param, string param2) + protected virtual void AfterTestJsonFormData(ApiResponse apiResponseLocalVar, string param, string param2) { } @@ -3041,73 +3041,73 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestJsonFormData(param, param2); - param = validatedParameters.Item1; - param2 = validatedParameters.Item2; + var validatedParameterLocalVars = OnTestJsonFormData(param, param2); + param = validatedParameterLocalVars.Item1; + param2 = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/jsonFormData"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/jsonFormData"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("param", ClientUtils.ParameterToString(param))); + formParameterLocalVars.Add(new KeyValuePair("param", ClientUtils.ParameterToString(param))); - formParams.Add(new KeyValuePair("param2", ClientUtils.ParameterToString(param2))); + formParameterLocalVars.Add(new KeyValuePair("param2", ClientUtils.ParameterToString(param2))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/jsonFormData", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/jsonFormData", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestJsonFormData(apiResponse, param, param2); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestJsonFormData(apiResponseLocalVar, param, param2); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestJsonFormData(e, "/fake/jsonFormData", uriBuilder.Path, param, param2); + OnErrorTestJsonFormData(e, "/fake/jsonFormData", uriBuilderLocalVar.Path, param, param2); throw; } } @@ -3125,12 +3125,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestQueryParameterCollectionFormatAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -3146,17 +3146,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestQueryParameterCollectionFormatOrDefaultAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -3198,13 +3198,13 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// /// /// - protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse apiResponse, List pipe, List ioutil, List http, List url, List context) + protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse apiResponseLocalVar, List pipe, List ioutil, List http, List url, List context) { } @@ -3237,63 +3237,63 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestQueryParameterCollectionFormatWithHttpInfoAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestQueryParameterCollectionFormat(pipe, ioutil, http, url, context); - pipe = validatedParameters.Item1; - ioutil = validatedParameters.Item2; - http = validatedParameters.Item3; - url = validatedParameters.Item4; - context = validatedParameters.Item5; + var validatedParameterLocalVars = OnTestQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + pipe = validatedParameterLocalVars.Item1; + ioutil = validatedParameterLocalVars.Item2; + http = validatedParameterLocalVars.Item3; + url = validatedParameterLocalVars.Item4; + context = validatedParameterLocalVars.Item5; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/test-query-parameters"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/test-query-parameters"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["pipe"] = pipe.ToString(); - parseQueryString["ioutil"] = ioutil.ToString(); - parseQueryString["http"] = http.ToString(); - parseQueryString["url"] = url.ToString(); - parseQueryString["context"] = context.ToString(); + parseQueryStringLocalVar["pipe"] = pipe.ToString(); + parseQueryStringLocalVar["ioutil"] = ioutil.ToString(); + parseQueryStringLocalVar["http"] = http.ToString(); + parseQueryStringLocalVar["url"] = url.ToString(); + parseQueryStringLocalVar["context"] = context.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/test-query-parameters", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/test-query-parameters", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestQueryParameterCollectionFormat(apiResponse, pipe, ioutil, http, url, context); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestQueryParameterCollectionFormat(apiResponseLocalVar, pipe, ioutil, http, url, context); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestQueryParameterCollectionFormat(e, "/fake/test-query-parameters", uriBuilder.Path, pipe, ioutil, http, url, context); + OnErrorTestQueryParameterCollectionFormat(e, "/fake/test-query-parameters", uriBuilderLocalVar.Path, pipe, ioutil, http, url, context); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 7dab9b6adab..60455e19b93 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -149,12 +149,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -166,17 +166,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -202,9 +202,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestClassname(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterTestClassname(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -229,83 +229,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnTestClassname(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake_classname_test"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake_classname_test"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInQuery(request, uriBuilder, parseQueryString, "api_key_query"); + apiKeyTokenLocalVar.UseInQuery(httpRequestMessageLocalVar, uriBuilderLocalVar, parseQueryStringLocalVar, "api_key_query"); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Patch; + httpRequestMessageLocalVar.Method = HttpMethod.Patch; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake_classname_test", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake_classname_test", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestClassname(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestClassname(apiResponseLocalVar, modelClient); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestClassname(e, "/fake_classname_test", uriBuilder.Path, modelClient); + OnErrorTestClassname(e, "/fake_classname_test", uriBuilderLocalVar.Path, modelClient); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs index 575efbe6b09..a617fe18d11 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs @@ -450,12 +450,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -467,17 +467,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -503,9 +503,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterAddPet(ApiResponse apiResponse, Pet pet) + protected virtual void AfterAddPet(ApiResponse apiResponseLocalVar, Pet pet) { } @@ -530,84 +530,84 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { pet = OnAddPet(pet); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - var url = request.RequestUri = new Uri("http://petstore.swagger.io/v2"); - uriBuilder.Host = url.Authority; - uriBuilder.Scheme = url.Scheme; - uriBuilder.Path = url.AbsolutePath; + Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2"); + uriBuilderLocalVar.Host = urlLocalVar.Authority; + uriBuilderLocalVar.Scheme = urlLocalVar.Scheme; + uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath; - request.Content = (pet as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (pet as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content!.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content!.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); string[] contentTypes = new string[] { "application/json", "application/xml" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterAddPet(apiResponse, pet); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterAddPet(apiResponseLocalVar, pet); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorAddPet(e, "/pet", uriBuilder.Path, pet); + OnErrorAddPet(e, "/pet", uriBuilderLocalVar.Path, pet); throw; } } @@ -622,12 +622,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeletePetAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -640,17 +640,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeletePetOrDefaultAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -677,10 +677,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterDeletePet(ApiResponse apiResponse, long petId, string? apiKey) + protected virtual void AfterDeletePet(ApiResponse apiResponseLocalVar, long petId, string? apiKey) { } @@ -707,64 +707,64 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeletePetWithHttpInfoAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnDeletePet(petId, apiKey); - petId = validatedParameters.Item1; - apiKey = validatedParameters.Item2; + var validatedParameterLocalVars = OnDeletePet(petId, apiKey); + petId = validatedParameterLocalVars.Item1; + apiKey = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); if (apiKey != null) - request.Headers.Add("api_key", ClientUtils.ParameterToString(apiKey)); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); if (apiKey != null) + httpRequestMessageLocalVar.Headers.Add("api_key", ClientUtils.ParameterToString(apiKey)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - request.Method = HttpMethod.Delete; + httpRequestMessageLocalVar.Method = HttpMethod.Delete; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeletePet(apiResponse, petId, apiKey); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeletePet(apiResponseLocalVar, petId, apiKey); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeletePet(e, "/pet/{petId}", uriBuilder.Path, petId, apiKey); + OnErrorDeletePet(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId, apiKey); throw; } } @@ -778,12 +778,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse?> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); + ApiResponse?> apiResponseLocalVar = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -795,17 +795,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task?> FindPetsByStatusOrDefaultAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse?>? result = null; + ApiResponse?>? apiResponseLocalVar = null; try { - result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -831,9 +831,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFindPetsByStatus(ApiResponse?> apiResponse, List status) + protected virtual void AfterFindPetsByStatus(ApiResponse?> apiResponseLocalVar, List status) { } @@ -858,86 +858,86 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task?>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { status = OnFindPetsByStatus(status); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/findByStatus"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/findByStatus"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["status"] = status.ToString(); + parseQueryStringLocalVar["status"] = status.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content!.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content!.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/findByStatus", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/findByStatus", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse?> apiResponse = new ApiResponse?>(responseMessage, responseContent); + ApiResponse?> apiResponseLocalVar = new ApiResponse?>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterFindPetsByStatus(apiResponse, status); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFindPetsByStatus(apiResponseLocalVar, status); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFindPetsByStatus(e, "/pet/findByStatus", uriBuilder.Path, status); + OnErrorFindPetsByStatus(e, "/pet/findByStatus", uriBuilderLocalVar.Path, status); throw; } } @@ -951,12 +951,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse?> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); + ApiResponse?> apiResponseLocalVar = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -968,17 +968,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task?> FindPetsByTagsOrDefaultAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse?>? result = null; + ApiResponse?>? apiResponseLocalVar = null; try { - result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1004,9 +1004,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFindPetsByTags(ApiResponse?> apiResponse, List tags) + protected virtual void AfterFindPetsByTags(ApiResponse?> apiResponseLocalVar, List tags) { } @@ -1031,86 +1031,86 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task?>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { tags = OnFindPetsByTags(tags); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/findByTags"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/findByTags"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["tags"] = tags.ToString(); + parseQueryStringLocalVar["tags"] = tags.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content!.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content!.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/findByTags", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/findByTags", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse?> apiResponse = new ApiResponse?>(responseMessage, responseContent); + ApiResponse?> apiResponseLocalVar = new ApiResponse?>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterFindPetsByTags(apiResponse, tags); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFindPetsByTags(apiResponseLocalVar, tags); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFindPetsByTags(e, "/pet/findByTags", uriBuilder.Path, tags); + OnErrorFindPetsByTags(e, "/pet/findByTags", uriBuilderLocalVar.Path, tags); throw; } } @@ -1124,12 +1124,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1141,17 +1141,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1177,9 +1177,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetPetById(ApiResponse apiResponse, long petId) + protected virtual void AfterGetPetById(ApiResponse apiResponseLocalVar, long petId) { } @@ -1204,67 +1204,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { petId = OnGetPetById(petId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List tokens = new List(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInHeader(request, "api_key"); + apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "api_key"); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetPetById(apiResponse, petId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetPetById(apiResponseLocalVar, petId); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetPetById(e, "/pet/{petId}", uriBuilder.Path, petId); + OnErrorGetPetById(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId); throw; } } @@ -1278,12 +1278,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1295,17 +1295,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1331,9 +1331,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterUpdatePet(ApiResponse apiResponse, Pet pet) + protected virtual void AfterUpdatePet(ApiResponse apiResponseLocalVar, Pet pet) { } @@ -1358,84 +1358,84 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { pet = OnUpdatePet(pet); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - var url = request.RequestUri = new Uri("http://petstore.swagger.io/v2"); - uriBuilder.Host = url.Authority; - uriBuilder.Scheme = url.Scheme; - uriBuilder.Path = url.AbsolutePath; + Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2"); + uriBuilderLocalVar.Host = urlLocalVar.Authority; + uriBuilderLocalVar.Scheme = urlLocalVar.Scheme; + uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath; - request.Content = (pet as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (pet as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content!.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content!.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); string[] contentTypes = new string[] { "application/json", "application/xml" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdatePet(apiResponse, pet); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdatePet(apiResponseLocalVar, pet); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdatePet(e, "/pet", uriBuilder.Path, pet); + OnErrorUpdatePet(e, "/pet", uriBuilderLocalVar.Path, pet); throw; } } @@ -1451,12 +1451,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetWithFormAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1470,17 +1470,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetWithFormOrDefaultAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1508,11 +1508,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUpdatePetWithForm(ApiResponse apiResponse, long petId, string? name, string? status) + protected virtual void AfterUpdatePetWithForm(ApiResponse apiResponseLocalVar, long petId, string? name, string? status) { } @@ -1541,83 +1541,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdatePetWithFormWithHttpInfoAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUpdatePetWithForm(petId, name, status); - petId = validatedParameters.Item1; - name = validatedParameters.Item2; - status = validatedParameters.Item3; + var validatedParameterLocalVars = OnUpdatePetWithForm(petId, name, status); + petId = validatedParameterLocalVars.Item1; + name = validatedParameterLocalVars.Item2; + status = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (name != null) - formParams.Add(new KeyValuePair("name", ClientUtils.ParameterToString(name))); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (name != null) + formParameterLocalVars.Add(new KeyValuePair("name", ClientUtils.ParameterToString(name))); if (status != null) - formParams.Add(new KeyValuePair("status", ClientUtils.ParameterToString(status))); + formParameterLocalVars.Add(new KeyValuePair("status", ClientUtils.ParameterToString(status))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdatePetWithForm(apiResponse, petId, name, status); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdatePetWithForm(apiResponseLocalVar, petId, name, status); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdatePetWithForm(e, "/pet/{petId}", uriBuilder.Path, petId, name, status); + OnErrorUpdatePetWithForm(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId, name, status); throw; } } @@ -1633,12 +1633,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1652,17 +1652,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileOrDefaultAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1690,11 +1690,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUploadFile(ApiResponse apiResponse, long petId, System.IO.Stream? file, string? additionalMetadata) + protected virtual void AfterUploadFile(ApiResponse apiResponseLocalVar, long petId, System.IO.Stream? file, string? additionalMetadata) { } @@ -1723,92 +1723,92 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUploadFile(petId, file, additionalMetadata); - petId = validatedParameters.Item1; - file = validatedParameters.Item2; - additionalMetadata = validatedParameters.Item3; + var validatedParameterLocalVars = OnUploadFile(petId, file, additionalMetadata); + petId = validatedParameterLocalVars.Item1; + file = validatedParameterLocalVars.Item2; + additionalMetadata = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}/uploadImage"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}/uploadImage"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (file != null) - multipartContent.Add(new StreamContent(file)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (file != null) + multipartContentLocalVar.Add(new StreamContent(file)); if (additionalMetadata != null) - formParams.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); + formParameterLocalVars.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "multipart/form-data" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}/uploadImage", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUploadFile(apiResponse, petId, file, additionalMetadata); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUploadFile(apiResponseLocalVar, petId, file, additionalMetadata); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata); + OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata); throw; } } @@ -1824,12 +1824,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1843,17 +1843,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1884,11 +1884,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUploadFileWithRequiredFile(ApiResponse apiResponse, System.IO.Stream requiredFile, long petId, string? additionalMetadata) + protected virtual void AfterUploadFileWithRequiredFile(ApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, string? additionalMetadata) { } @@ -1917,92 +1917,92 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata); - requiredFile = validatedParameters.Item1; - petId = validatedParameters.Item2; - additionalMetadata = validatedParameters.Item3; + var validatedParameterLocalVars = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata); + requiredFile = validatedParameterLocalVars.Item1; + petId = validatedParameterLocalVars.Item2; + additionalMetadata = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/{petId}/uploadImageWithRequiredFile"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/{petId}/uploadImageWithRequiredFile"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); multipartContent.Add(new StreamContent(requiredFile)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); multipartContentLocalVar.Add(new StreamContent(requiredFile)); if (additionalMetadata != null) - formParams.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); + formParameterLocalVars.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "multipart/form-data" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUploadFileWithRequiredFile(apiResponseLocalVar, requiredFile, petId, additionalMetadata); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata); + OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs index 2b65bdae6b9..29533089eb7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs @@ -251,12 +251,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -268,17 +268,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -304,9 +304,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterDeleteOrder(ApiResponse apiResponse, string orderId) + protected virtual void AfterDeleteOrder(ApiResponse apiResponseLocalVar, string orderId) { } @@ -331,48 +331,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { orderId = OnDeleteOrder(orderId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = HttpMethod.Delete; + httpRequestMessageLocalVar.Method = HttpMethod.Delete; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order/{order_id}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order/{order_id}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeleteOrder(apiResponse, orderId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeleteOrder(apiResponseLocalVar, orderId); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeleteOrder(e, "/store/order/{order_id}", uriBuilder.Path, orderId); + OnErrorDeleteOrder(e, "/store/order/{order_id}", uriBuilderLocalVar.Path, orderId); throw; } } @@ -385,12 +385,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> GetInventoryAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse?> result = await GetInventoryWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse?> apiResponseLocalVar = await GetInventoryWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -401,17 +401,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task?> GetInventoryOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse?>? result = null; + ApiResponse?>? apiResponseLocalVar = null; try { - result = await GetInventoryWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetInventoryWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -427,8 +427,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterGetInventory(ApiResponse?> apiResponse) + /// + protected virtual void AfterGetInventory(ApiResponse?> apiResponseLocalVar) { } @@ -451,66 +451,66 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task?>> GetInventoryWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnGetInventory(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/inventory"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/inventory"; - List tokens = new List(); + List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInHeader(request, "api_key"); + apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "api_key"); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/inventory", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/inventory", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse?> apiResponse = new ApiResponse?>(responseMessage, responseContent); + ApiResponse?> apiResponseLocalVar = new ApiResponse?>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetInventory(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetInventory(apiResponseLocalVar); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetInventory(e, "/store/inventory", uriBuilder.Path); + OnErrorGetInventory(e, "/store/inventory", uriBuilderLocalVar.Path); throw; } } @@ -524,12 +524,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -541,17 +541,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -577,9 +577,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetOrderById(ApiResponse apiResponse, long orderId) + protected virtual void AfterGetOrderById(ApiResponse apiResponseLocalVar, long orderId) { } @@ -604,58 +604,58 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { orderId = OnGetOrderById(orderId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order/{order_id}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order/{order_id}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetOrderById(apiResponse, orderId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetOrderById(apiResponseLocalVar, orderId); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetOrderById(e, "/store/order/{order_id}", uriBuilder.Path, orderId); + OnErrorGetOrderById(e, "/store/order/{order_id}", uriBuilderLocalVar.Path, orderId); throw; } } @@ -669,12 +669,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -686,17 +686,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -722,9 +722,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterPlaceOrder(ApiResponse apiResponse, Order order) + protected virtual void AfterPlaceOrder(ApiResponse apiResponseLocalVar, Order order) { } @@ -749,71 +749,71 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { order = OnPlaceOrder(order); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order"; - request.Content = (order as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(order, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(order, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterPlaceOrder(apiResponse, order); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterPlaceOrder(apiResponseLocalVar, order); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorPlaceOrder(e, "/store/order", uriBuilder.Path, order); + OnErrorPlaceOrder(e, "/store/order", uriBuilderLocalVar.Path, order); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs index ec937c3be30..e73ad7f0437 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs @@ -397,12 +397,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -414,17 +414,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -450,9 +450,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUser(ApiResponse apiResponse, User user) + protected virtual void AfterCreateUser(ApiResponse apiResponseLocalVar, User user) { } @@ -477,61 +477,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUser(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUser(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUser(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUser(e, "/user", uriBuilder.Path, user); + OnErrorCreateUser(e, "/user", uriBuilderLocalVar.Path, user); throw; } } @@ -545,12 +545,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithArrayInputAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -562,17 +562,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithArrayInputOrDefaultAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -598,9 +598,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUsersWithArrayInput(ApiResponse apiResponse, List user) + protected virtual void AfterCreateUsersWithArrayInput(ApiResponse apiResponseLocalVar, List user) { } @@ -625,61 +625,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUsersWithArrayInputWithHttpInfoAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUsersWithArrayInput(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/createWithArray"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/createWithArray"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/createWithArray", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/createWithArray", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUsersWithArrayInput(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUsersWithArrayInput(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUsersWithArrayInput(e, "/user/createWithArray", uriBuilder.Path, user); + OnErrorCreateUsersWithArrayInput(e, "/user/createWithArray", uriBuilderLocalVar.Path, user); throw; } } @@ -693,12 +693,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithListInputAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -710,17 +710,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithListInputOrDefaultAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -746,9 +746,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUsersWithListInput(ApiResponse apiResponse, List user) + protected virtual void AfterCreateUsersWithListInput(ApiResponse apiResponseLocalVar, List user) { } @@ -773,61 +773,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUsersWithListInputWithHttpInfoAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUsersWithListInput(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/createWithList"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/createWithList"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/createWithList", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/createWithList", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUsersWithListInput(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUsersWithListInput(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUsersWithListInput(e, "/user/createWithList", uriBuilder.Path, user); + OnErrorCreateUsersWithListInput(e, "/user/createWithList", uriBuilderLocalVar.Path, user); throw; } } @@ -841,12 +841,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -858,17 +858,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -894,9 +894,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterDeleteUser(ApiResponse apiResponse, string username) + protected virtual void AfterDeleteUser(ApiResponse apiResponseLocalVar, string username) { } @@ -921,48 +921,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { username = OnDeleteUser(username); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = HttpMethod.Delete; + httpRequestMessageLocalVar.Method = HttpMethod.Delete; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeleteUser(apiResponse, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeleteUser(apiResponseLocalVar, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeleteUser(e, "/user/{username}", uriBuilder.Path, username); + OnErrorDeleteUser(e, "/user/{username}", uriBuilderLocalVar.Path, username); throw; } } @@ -976,12 +976,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -993,17 +993,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1029,9 +1029,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetUserByName(ApiResponse apiResponse, string username) + protected virtual void AfterGetUserByName(ApiResponse apiResponseLocalVar, string username) { } @@ -1056,58 +1056,58 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { username = OnGetUserByName(username); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetUserByName(apiResponse, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetUserByName(apiResponseLocalVar, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetUserByName(e, "/user/{username}", uriBuilder.Path, username); + OnErrorGetUserByName(e, "/user/{username}", uriBuilderLocalVar.Path, username); throw; } } @@ -1122,12 +1122,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1140,17 +1140,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task LoginUserOrDefaultAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1180,10 +1180,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterLoginUser(ApiResponse apiResponse, string username, string password) + protected virtual void AfterLoginUser(ApiResponse apiResponseLocalVar, string username, string password) { } @@ -1210,67 +1210,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnLoginUser(username, password); - username = validatedParameters.Item1; - password = validatedParameters.Item2; + var validatedParameterLocalVars = OnLoginUser(username, password); + username = validatedParameterLocalVars.Item1; + password = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/login"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/login"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["username"] = username.ToString(); - parseQueryString["password"] = password.ToString(); + parseQueryStringLocalVar["username"] = username.ToString(); + parseQueryStringLocalVar["password"] = password.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/login", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/login", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterLoginUser(apiResponse, username, password); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterLoginUser(apiResponseLocalVar, username, password); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorLoginUser(e, "/user/login", uriBuilder.Path, username, password); + OnErrorLoginUser(e, "/user/login", uriBuilderLocalVar.Path, username, password); throw; } } @@ -1283,12 +1283,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task LogoutUserAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1299,17 +1299,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task LogoutUserOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1325,8 +1325,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterLogoutUser(ApiResponse apiResponse) + /// + protected virtual void AfterLogoutUser(ApiResponse apiResponseLocalVar) { } @@ -1349,48 +1349,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> LogoutUserWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnLogoutUser(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/logout"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/logout"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/logout", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/logout", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterLogoutUser(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterLogoutUser(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorLogoutUser(e, "/user/logout", uriBuilder.Path); + OnErrorLogoutUser(e, "/user/logout", uriBuilderLocalVar.Path); throw; } } @@ -1405,12 +1405,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1423,17 +1423,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1463,10 +1463,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterUpdateUser(ApiResponse apiResponse, User user, string username) + protected virtual void AfterUpdateUser(ApiResponse apiResponseLocalVar, User user, string username) { } @@ -1493,63 +1493,63 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUpdateUser(user, username); - user = validatedParameters.Item1; - username = validatedParameters.Item2; + var validatedParameterLocalVars = OnUpdateUser(user, username); + user = validatedParameterLocalVars.Item1; + username = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string? contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string? contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdateUser(apiResponse, user, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdateUser(apiResponseLocalVar, user, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username); + OnErrorUpdateUser(e, "/user/{username}", uriBuilderLocalVar.Path, user, username); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index a46d61ee554..f8d4878704f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -136,12 +136,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -153,17 +153,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -189,9 +189,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCall123TestSpecialTags(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterCall123TestSpecialTags(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -216,70 +216,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnCall123TestSpecialTags(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/another-fake/dummy"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/another-fake/dummy"; - request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Patch; + httpRequestMessageLocalVar.Method = HttpMethod.Patch; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/another-fake/dummy", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/another-fake/dummy", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCall123TestSpecialTags(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCall123TestSpecialTags(apiResponseLocalVar, modelClient); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCall123TestSpecialTags(e, "/another-fake/dummy", uriBuilder.Path, modelClient); + OnErrorCall123TestSpecialTags(e, "/another-fake/dummy", uriBuilderLocalVar.Path, modelClient); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs index 23848d2c610..d8ebe474c5c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -157,12 +157,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FooGetAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -173,17 +173,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FooGetOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -199,8 +199,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterFooGet(ApiResponse apiResponse) + /// + protected virtual void AfterFooGet(ApiResponse apiResponseLocalVar) { } @@ -223,57 +223,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FooGetWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnFooGet(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/foo"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/foo"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/foo", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/foo", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFooGet(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFooGet(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFooGet(e, "/foo", uriBuilder.Path); + OnErrorFooGet(e, "/foo", uriBuilderLocalVar.Path); throw; } } @@ -287,12 +287,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetCountryAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -304,17 +304,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetCountryOrDefaultAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -340,9 +340,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetCountry(ApiResponse apiResponse, string country) + protected virtual void AfterGetCountry(ApiResponse apiResponseLocalVar, string country) { } @@ -367,67 +367,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetCountryWithHttpInfoAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { country = OnGetCountry(country); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/country"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/country"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("country", ClientUtils.ParameterToString(country))); + formParameterLocalVars.Add(new KeyValuePair("country", ClientUtils.ParameterToString(country))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/country", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/country", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetCountry(apiResponse, country); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetCountry(apiResponseLocalVar, country); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetCountry(e, "/country", uriBuilder.Path, country); + OnErrorGetCountry(e, "/country", uriBuilderLocalVar.Path, country); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs index 4902407d15b..0b0a79ddb6b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs @@ -531,12 +531,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeHealthGetAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -547,17 +547,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeHealthGetOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -573,8 +573,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterFakeHealthGet(ApiResponse apiResponse) + /// + protected virtual void AfterFakeHealthGet(ApiResponse apiResponseLocalVar) { } @@ -597,57 +597,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeHealthGetWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnFakeHealthGet(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/health"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/health"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/health", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/health", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeHealthGet(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeHealthGet(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeHealthGet(e, "/fake/health", uriBuilder.Path); + OnErrorFakeHealthGet(e, "/fake/health", uriBuilderLocalVar.Path); throw; } } @@ -661,14 +661,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -684,9 +684,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterBooleanSerialize(ApiResponse apiResponse, bool? body) + protected virtual void AfterFakeOuterBooleanSerialize(ApiResponse apiResponseLocalVar, bool? body) { } @@ -711,70 +711,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { body = OnFakeOuterBooleanSerialize(body); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/boolean"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/boolean"; - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/boolean", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/boolean", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterBooleanSerialize(apiResponse, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterBooleanSerialize(apiResponseLocalVar, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterBooleanSerialize(e, "/fake/outer/boolean", uriBuilder.Path, body); + OnErrorFakeOuterBooleanSerialize(e, "/fake/outer/boolean", uriBuilderLocalVar.Path, body); throw; } } @@ -788,12 +788,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterCompositeSerializeAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -805,17 +805,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -832,9 +832,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterCompositeSerialize(ApiResponse apiResponse, OuterComposite outerComposite) + protected virtual void AfterFakeOuterCompositeSerialize(ApiResponse apiResponseLocalVar, OuterComposite outerComposite) { } @@ -859,70 +859,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { outerComposite = OnFakeOuterCompositeSerialize(outerComposite); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/composite"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/composite"; - request.Content = (outerComposite as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(outerComposite, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (outerComposite as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(outerComposite, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/composite", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/composite", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterCompositeSerialize(apiResponse, outerComposite); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterCompositeSerialize(apiResponseLocalVar, outerComposite); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterCompositeSerialize(e, "/fake/outer/composite", uriBuilder.Path, outerComposite); + OnErrorFakeOuterCompositeSerialize(e, "/fake/outer/composite", uriBuilderLocalVar.Path, outerComposite); throw; } } @@ -936,14 +936,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -959,9 +959,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterNumberSerialize(ApiResponse apiResponse, decimal? body) + protected virtual void AfterFakeOuterNumberSerialize(ApiResponse apiResponseLocalVar, decimal? body) { } @@ -986,70 +986,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { body = OnFakeOuterNumberSerialize(body); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/number"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/number"; - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/number", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/number", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterNumberSerialize(apiResponse, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterNumberSerialize(apiResponseLocalVar, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterNumberSerialize(e, "/fake/outer/number", uriBuilder.Path, body); + OnErrorFakeOuterNumberSerialize(e, "/fake/outer/number", uriBuilderLocalVar.Path, body); throw; } } @@ -1064,14 +1064,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterStringSerializeAsync(Guid requiredStringUuid, string body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1097,10 +1097,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterFakeOuterStringSerialize(ApiResponse apiResponse, Guid requiredStringUuid, string body) + protected virtual void AfterFakeOuterStringSerialize(ApiResponse apiResponseLocalVar, Guid requiredStringUuid, string body) { } @@ -1127,78 +1127,78 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterStringSerializeWithHttpInfoAsync(Guid requiredStringUuid, string body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnFakeOuterStringSerialize(requiredStringUuid, body); - requiredStringUuid = validatedParameters.Item1; - body = validatedParameters.Item2; + var validatedParameterLocalVars = OnFakeOuterStringSerialize(requiredStringUuid, body); + requiredStringUuid = validatedParameterLocalVars.Item1; + body = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/string"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/string"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_uuid"] = requiredStringUuid.ToString(); + parseQueryStringLocalVar["required_string_uuid"] = requiredStringUuid.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/string", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/string", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterStringSerialize(apiResponse, requiredStringUuid, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterStringSerialize(apiResponseLocalVar, requiredStringUuid, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterStringSerialize(e, "/fake/outer/string", uriBuilder.Path, requiredStringUuid, body); + OnErrorFakeOuterStringSerialize(e, "/fake/outer/string", uriBuilderLocalVar.Path, requiredStringUuid, body); throw; } } @@ -1211,12 +1211,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> GetArrayOfEnumsAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse> apiResponseLocalVar = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1227,17 +1227,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task> GetArrayOfEnumsOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = null; + ApiResponse> apiResponseLocalVar = null; try { - result = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1253,8 +1253,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterGetArrayOfEnums(ApiResponse> apiResponse) + /// + protected virtual void AfterGetArrayOfEnums(ApiResponse> apiResponseLocalVar) { } @@ -1277,57 +1277,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task>> GetArrayOfEnumsWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnGetArrayOfEnums(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/array-of-enums"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/array-of-enums"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/array-of-enums", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/array-of-enums", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse> apiResponse = new ApiResponse>(responseMessage, responseContent); + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetArrayOfEnums(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetArrayOfEnums(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetArrayOfEnums(e, "/fake/array-of-enums", uriBuilder.Path); + OnErrorGetArrayOfEnums(e, "/fake/array-of-enums", uriBuilderLocalVar.Path); throw; } } @@ -1341,12 +1341,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1358,17 +1358,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1394,9 +1394,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestBodyWithFileSchema(ApiResponse apiResponse, FileSchemaTestClass fileSchemaTestClass) + protected virtual void AfterTestBodyWithFileSchema(ApiResponse apiResponseLocalVar, FileSchemaTestClass fileSchemaTestClass) { } @@ -1421,61 +1421,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { fileSchemaTestClass = OnTestBodyWithFileSchema(fileSchemaTestClass); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-file-schema"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-file-schema"; - request.Content = (fileSchemaTestClass as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(fileSchemaTestClass, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(fileSchemaTestClass, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/body-with-file-schema", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/body-with-file-schema", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestBodyWithFileSchema(apiResponse, fileSchemaTestClass); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestBodyWithFileSchema(apiResponseLocalVar, fileSchemaTestClass); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestBodyWithFileSchema(e, "/fake/body-with-file-schema", uriBuilder.Path, fileSchemaTestClass); + OnErrorTestBodyWithFileSchema(e, "/fake/body-with-file-schema", uriBuilderLocalVar.Path, fileSchemaTestClass); throw; } } @@ -1490,12 +1490,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1508,17 +1508,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1548,10 +1548,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterTestBodyWithQueryParams(ApiResponse apiResponse, User user, string query) + protected virtual void AfterTestBodyWithQueryParams(ApiResponse apiResponseLocalVar, User user, string query) { } @@ -1578,69 +1578,69 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestBodyWithQueryParams(user, query); - user = validatedParameters.Item1; - query = validatedParameters.Item2; + var validatedParameterLocalVars = OnTestBodyWithQueryParams(user, query); + user = validatedParameterLocalVars.Item1; + query = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-query-params"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-query-params"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["query"] = query.ToString(); + parseQueryStringLocalVar["query"] = query.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/body-with-query-params", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/body-with-query-params", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestBodyWithQueryParams(apiResponse, user, query); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestBodyWithQueryParams(apiResponseLocalVar, user, query); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query); + OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query); throw; } } @@ -1654,12 +1654,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1671,17 +1671,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1707,9 +1707,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestClientModel(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterTestClientModel(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -1734,70 +1734,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnTestClientModel(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Patch; + httpRequestMessageLocalVar.Method = HttpMethod.Patch; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestClientModel(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestClientModel(apiResponseLocalVar, modelClient); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestClientModel(e, "/fake", uriBuilder.Path, modelClient); + OnErrorTestClientModel(e, "/fake", uriBuilderLocalVar.Path, modelClient); throw; } } @@ -1824,12 +1824,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1854,17 +1854,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1912,7 +1912,7 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// @@ -1927,7 +1927,7 @@ namespace Org.OpenAPITools.Api /// /// /// - protected virtual void AfterTestEndpointParameters(ApiResponse apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime) + protected virtual void AfterTestEndpointParameters(ApiResponse apiResponseLocalVar, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime) { } @@ -1978,134 +1978,134 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); - _byte = validatedParameters.Item1; - number = validatedParameters.Item2; - _double = validatedParameters.Item3; - patternWithoutDelimiter = validatedParameters.Item4; - date = validatedParameters.Item5; - binary = validatedParameters.Item6; - _float = validatedParameters.Item7; - integer = validatedParameters.Item8; - int32 = validatedParameters.Item9; - int64 = validatedParameters.Item10; - _string = validatedParameters.Item11; - password = validatedParameters.Item12; - callback = validatedParameters.Item13; - dateTime = validatedParameters.Item14; + var validatedParameterLocalVars = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + _byte = validatedParameterLocalVars.Item1; + number = validatedParameterLocalVars.Item2; + _double = validatedParameterLocalVars.Item3; + patternWithoutDelimiter = validatedParameterLocalVars.Item4; + date = validatedParameterLocalVars.Item5; + binary = validatedParameterLocalVars.Item6; + _float = validatedParameterLocalVars.Item7; + integer = validatedParameterLocalVars.Item8; + int32 = validatedParameterLocalVars.Item9; + int64 = validatedParameterLocalVars.Item10; + _string = validatedParameterLocalVars.Item11; + password = validatedParameterLocalVars.Item12; + callback = validatedParameterLocalVars.Item13; + dateTime = validatedParameterLocalVars.Item14; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("byte", ClientUtils.ParameterToString(_byte))); + formParameterLocalVars.Add(new KeyValuePair("byte", ClientUtils.ParameterToString(_byte))); - formParams.Add(new KeyValuePair("number", ClientUtils.ParameterToString(number))); + formParameterLocalVars.Add(new KeyValuePair("number", ClientUtils.ParameterToString(number))); - formParams.Add(new KeyValuePair("double", ClientUtils.ParameterToString(_double))); + formParameterLocalVars.Add(new KeyValuePair("double", ClientUtils.ParameterToString(_double))); - formParams.Add(new KeyValuePair("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter))); + formParameterLocalVars.Add(new KeyValuePair("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter))); if (date != null) - formParams.Add(new KeyValuePair("date", ClientUtils.ParameterToString(date))); + formParameterLocalVars.Add(new KeyValuePair("date", ClientUtils.ParameterToString(date))); if (binary != null) - multipartContent.Add(new StreamContent(binary)); + multipartContentLocalVar.Add(new StreamContent(binary)); if (_float != null) - formParams.Add(new KeyValuePair("float", ClientUtils.ParameterToString(_float))); + formParameterLocalVars.Add(new KeyValuePair("float", ClientUtils.ParameterToString(_float))); if (integer != null) - formParams.Add(new KeyValuePair("integer", ClientUtils.ParameterToString(integer))); + formParameterLocalVars.Add(new KeyValuePair("integer", ClientUtils.ParameterToString(integer))); if (int32 != null) - formParams.Add(new KeyValuePair("int32", ClientUtils.ParameterToString(int32))); + formParameterLocalVars.Add(new KeyValuePair("int32", ClientUtils.ParameterToString(int32))); if (int64 != null) - formParams.Add(new KeyValuePair("int64", ClientUtils.ParameterToString(int64))); + formParameterLocalVars.Add(new KeyValuePair("int64", ClientUtils.ParameterToString(int64))); if (_string != null) - formParams.Add(new KeyValuePair("string", ClientUtils.ParameterToString(_string))); + formParameterLocalVars.Add(new KeyValuePair("string", ClientUtils.ParameterToString(_string))); if (password != null) - formParams.Add(new KeyValuePair("password", ClientUtils.ParameterToString(password))); + formParameterLocalVars.Add(new KeyValuePair("password", ClientUtils.ParameterToString(password))); if (callback != null) - formParams.Add(new KeyValuePair("callback", ClientUtils.ParameterToString(callback))); + formParameterLocalVars.Add(new KeyValuePair("callback", ClientUtils.ParameterToString(callback))); if (dateTime != null) - formParams.Add(new KeyValuePair("dateTime", ClientUtils.ParameterToString(dateTime))); + formParameterLocalVars.Add(new KeyValuePair("dateTime", ClientUtils.ParameterToString(dateTime))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - BasicToken basicToken = (BasicToken) await BasicTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + BasicToken basicTokenLocalVar = (BasicToken) await BasicTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(basicToken); + tokenBaseLocalVars.Add(basicTokenLocalVar); - basicToken.UseInHeader(request, ""); + basicTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestEndpointParameters(apiResponseLocalVar, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + OnErrorTestEndpointParameters(e, "/fake", uriBuilderLocalVar.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); throw; } } @@ -2126,12 +2126,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEnumParametersAsync(List enumHeaderStringArray = null, List enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2150,17 +2150,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEnumParametersOrDefaultAsync(List enumHeaderStringArray = null, List enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2184,7 +2184,7 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// @@ -2193,7 +2193,7 @@ namespace Org.OpenAPITools.Api /// /// /// - protected virtual void AfterTestEnumParameters(ApiResponse apiResponse, List enumHeaderStringArray, List enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString) + protected virtual void AfterTestEnumParameters(ApiResponse apiResponseLocalVar, List enumHeaderStringArray, List enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString) { } @@ -2232,98 +2232,98 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestEnumParametersWithHttpInfoAsync(List enumHeaderStringArray = null, List enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); - enumHeaderStringArray = validatedParameters.Item1; - enumQueryStringArray = validatedParameters.Item2; - enumQueryDouble = validatedParameters.Item3; - enumQueryInteger = validatedParameters.Item4; - enumFormStringArray = validatedParameters.Item5; - enumHeaderString = validatedParameters.Item6; - enumQueryString = validatedParameters.Item7; - enumFormString = validatedParameters.Item8; + var validatedParameterLocalVars = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + enumHeaderStringArray = validatedParameterLocalVars.Item1; + enumQueryStringArray = validatedParameterLocalVars.Item2; + enumQueryDouble = validatedParameterLocalVars.Item3; + enumQueryInteger = validatedParameterLocalVars.Item4; + enumFormStringArray = validatedParameterLocalVars.Item5; + enumHeaderString = validatedParameterLocalVars.Item6; + enumQueryString = validatedParameterLocalVars.Item7; + enumFormString = validatedParameterLocalVars.Item8; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); if (enumQueryStringArray != null) - parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString(); + parseQueryStringLocalVar["enum_query_string_array"] = enumQueryStringArray.ToString(); if (enumQueryDouble != null) - parseQueryString["enum_query_double"] = enumQueryDouble.ToString(); + parseQueryStringLocalVar["enum_query_double"] = enumQueryDouble.ToString(); if (enumQueryInteger != null) - parseQueryString["enum_query_integer"] = enumQueryInteger.ToString(); + parseQueryStringLocalVar["enum_query_integer"] = enumQueryInteger.ToString(); if (enumQueryString != null) - parseQueryString["enum_query_string"] = enumQueryString.ToString(); + parseQueryStringLocalVar["enum_query_string"] = enumQueryString.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); if (enumHeaderStringArray != null) - request.Headers.Add("enum_header_string_array", ClientUtils.ParameterToString(enumHeaderStringArray)); + httpRequestMessageLocalVar.Headers.Add("enum_header_string_array", ClientUtils.ParameterToString(enumHeaderStringArray)); if (enumHeaderString != null) - request.Headers.Add("enum_header_string", ClientUtils.ParameterToString(enumHeaderString)); + httpRequestMessageLocalVar.Headers.Add("enum_header_string", ClientUtils.ParameterToString(enumHeaderString)); - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (enumFormStringArray != null) - formParams.Add(new KeyValuePair("enum_form_string_array", ClientUtils.ParameterToString(enumFormStringArray))); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (enumFormStringArray != null) + formParameterLocalVars.Add(new KeyValuePair("enum_form_string_array", ClientUtils.ParameterToString(enumFormStringArray))); if (enumFormString != null) - formParams.Add(new KeyValuePair("enum_form_string", ClientUtils.ParameterToString(enumFormString))); + formParameterLocalVars.Add(new KeyValuePair("enum_form_string", ClientUtils.ParameterToString(enumFormString))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestEnumParameters(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + OnErrorTestEnumParameters(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); throw; } } @@ -2342,12 +2342,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2364,17 +2364,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2411,14 +2411,14 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// /// /// /// - protected virtual void AfterTestGroupParameters(ApiResponse apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group) + protected virtual void AfterTestGroupParameters(ApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group) { } @@ -2453,83 +2453,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); - requiredBooleanGroup = validatedParameters.Item1; - requiredStringGroup = validatedParameters.Item2; - requiredInt64Group = validatedParameters.Item3; - booleanGroup = validatedParameters.Item4; - stringGroup = validatedParameters.Item5; - int64Group = validatedParameters.Item6; + var validatedParameterLocalVars = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + requiredBooleanGroup = validatedParameterLocalVars.Item1; + requiredStringGroup = validatedParameterLocalVars.Item2; + requiredInt64Group = validatedParameterLocalVars.Item3; + booleanGroup = validatedParameterLocalVars.Item4; + stringGroup = validatedParameterLocalVars.Item5; + int64Group = validatedParameterLocalVars.Item6; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_group"] = requiredStringGroup.ToString(); - parseQueryString["required_int64_group"] = requiredInt64Group.ToString(); + parseQueryStringLocalVar["required_string_group"] = requiredStringGroup.ToString(); + parseQueryStringLocalVar["required_int64_group"] = requiredInt64Group.ToString(); if (stringGroup != null) - parseQueryString["string_group"] = stringGroup.ToString(); + parseQueryStringLocalVar["string_group"] = stringGroup.ToString(); if (int64Group != null) - parseQueryString["int64_group"] = int64Group.ToString(); + parseQueryStringLocalVar["int64_group"] = int64Group.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Headers.Add("required_boolean_group", ClientUtils.ParameterToString(requiredBooleanGroup)); + httpRequestMessageLocalVar.Headers.Add("required_boolean_group", ClientUtils.ParameterToString(requiredBooleanGroup)); if (booleanGroup != null) - request.Headers.Add("boolean_group", ClientUtils.ParameterToString(booleanGroup)); + httpRequestMessageLocalVar.Headers.Add("boolean_group", ClientUtils.ParameterToString(booleanGroup)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - BearerToken bearerToken = (BearerToken) await BearerTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + BearerToken bearerTokenLocalVar = (BearerToken) await BearerTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(bearerToken); + tokenBaseLocalVars.Add(bearerTokenLocalVar); - bearerToken.UseInHeader(request, ""); + bearerTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - request.Method = HttpMethod.Delete; + httpRequestMessageLocalVar.Method = HttpMethod.Delete; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestGroupParameters(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + OnErrorTestGroupParameters(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); throw; } } @@ -2543,12 +2543,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestInlineAdditionalPropertiesAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2560,17 +2560,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2596,9 +2596,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestInlineAdditionalProperties(ApiResponse apiResponse, Dictionary requestBody) + protected virtual void AfterTestInlineAdditionalProperties(ApiResponse apiResponseLocalVar, Dictionary requestBody) { } @@ -2623,61 +2623,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { requestBody = OnTestInlineAdditionalProperties(requestBody); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/inline-additionalProperties"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/inline-additionalProperties"; - request.Content = (requestBody as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(requestBody, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(requestBody, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/inline-additionalProperties", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/inline-additionalProperties", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestInlineAdditionalProperties(apiResponse, requestBody); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestInlineAdditionalProperties(apiResponseLocalVar, requestBody); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestInlineAdditionalProperties(e, "/fake/inline-additionalProperties", uriBuilder.Path, requestBody); + OnErrorTestInlineAdditionalProperties(e, "/fake/inline-additionalProperties", uriBuilderLocalVar.Path, requestBody); throw; } } @@ -2692,12 +2692,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2710,17 +2710,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2750,10 +2750,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterTestJsonFormData(ApiResponse apiResponse, string param, string param2) + protected virtual void AfterTestJsonFormData(ApiResponse apiResponseLocalVar, string param, string param2) { } @@ -2780,73 +2780,73 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestJsonFormData(param, param2); - param = validatedParameters.Item1; - param2 = validatedParameters.Item2; + var validatedParameterLocalVars = OnTestJsonFormData(param, param2); + param = validatedParameterLocalVars.Item1; + param2 = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/jsonFormData"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/jsonFormData"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("param", ClientUtils.ParameterToString(param))); + formParameterLocalVars.Add(new KeyValuePair("param", ClientUtils.ParameterToString(param))); - formParams.Add(new KeyValuePair("param2", ClientUtils.ParameterToString(param2))); + formParameterLocalVars.Add(new KeyValuePair("param2", ClientUtils.ParameterToString(param2))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/jsonFormData", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/jsonFormData", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestJsonFormData(apiResponse, param, param2); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestJsonFormData(apiResponseLocalVar, param, param2); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestJsonFormData(e, "/fake/jsonFormData", uriBuilder.Path, param, param2); + OnErrorTestJsonFormData(e, "/fake/jsonFormData", uriBuilderLocalVar.Path, param, param2); throw; } } @@ -2864,12 +2864,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestQueryParameterCollectionFormatAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2885,17 +2885,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestQueryParameterCollectionFormatOrDefaultAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2937,13 +2937,13 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// /// /// - protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse apiResponse, List pipe, List ioutil, List http, List url, List context) + protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse apiResponseLocalVar, List pipe, List ioutil, List http, List url, List context) { } @@ -2976,63 +2976,63 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestQueryParameterCollectionFormatWithHttpInfoAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestQueryParameterCollectionFormat(pipe, ioutil, http, url, context); - pipe = validatedParameters.Item1; - ioutil = validatedParameters.Item2; - http = validatedParameters.Item3; - url = validatedParameters.Item4; - context = validatedParameters.Item5; + var validatedParameterLocalVars = OnTestQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + pipe = validatedParameterLocalVars.Item1; + ioutil = validatedParameterLocalVars.Item2; + http = validatedParameterLocalVars.Item3; + url = validatedParameterLocalVars.Item4; + context = validatedParameterLocalVars.Item5; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/test-query-parameters"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/test-query-parameters"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["pipe"] = pipe.ToString(); - parseQueryString["ioutil"] = ioutil.ToString(); - parseQueryString["http"] = http.ToString(); - parseQueryString["url"] = url.ToString(); - parseQueryString["context"] = context.ToString(); + parseQueryStringLocalVar["pipe"] = pipe.ToString(); + parseQueryStringLocalVar["ioutil"] = ioutil.ToString(); + parseQueryStringLocalVar["http"] = http.ToString(); + parseQueryStringLocalVar["url"] = url.ToString(); + parseQueryStringLocalVar["context"] = context.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/test-query-parameters", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/test-query-parameters", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestQueryParameterCollectionFormat(apiResponse, pipe, ioutil, http, url, context); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestQueryParameterCollectionFormat(apiResponseLocalVar, pipe, ioutil, http, url, context); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestQueryParameterCollectionFormat(e, "/fake/test-query-parameters", uriBuilder.Path, pipe, ioutil, http, url, context); + OnErrorTestQueryParameterCollectionFormat(e, "/fake/test-query-parameters", uriBuilderLocalVar.Path, pipe, ioutil, http, url, context); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 2c2533fc2f5..43cdf5a7831 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -136,12 +136,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -153,17 +153,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -189,9 +189,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestClassname(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterTestClassname(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -216,83 +216,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnTestClassname(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake_classname_test"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake_classname_test"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInQuery(request, uriBuilder, parseQueryString, "api_key_query"); + apiKeyTokenLocalVar.UseInQuery(httpRequestMessageLocalVar, uriBuilderLocalVar, parseQueryStringLocalVar, "api_key_query"); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Patch; + httpRequestMessageLocalVar.Method = HttpMethod.Patch; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake_classname_test", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake_classname_test", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestClassname(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestClassname(apiResponseLocalVar, modelClient); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestClassname(e, "/fake_classname_test", uriBuilder.Path, modelClient); + OnErrorTestClassname(e, "/fake_classname_test", uriBuilderLocalVar.Path, modelClient); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs index ab2a938dda5..135a8eee75b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs @@ -342,12 +342,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -359,17 +359,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -395,9 +395,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterAddPet(ApiResponse apiResponse, Pet pet) + protected virtual void AfterAddPet(ApiResponse apiResponseLocalVar, Pet pet) { } @@ -422,84 +422,84 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { pet = OnAddPet(pet); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - var url = request.RequestUri = new Uri("http://petstore.swagger.io/v2"); - uriBuilder.Host = url.Authority; - uriBuilder.Scheme = url.Scheme; - uriBuilder.Path = url.AbsolutePath; + Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2"); + uriBuilderLocalVar.Host = urlLocalVar.Authority; + uriBuilderLocalVar.Scheme = urlLocalVar.Scheme; + uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath; - request.Content = (pet as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (pet as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); string[] contentTypes = new string[] { "application/json", "application/xml" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterAddPet(apiResponse, pet); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterAddPet(apiResponseLocalVar, pet); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorAddPet(e, "/pet", uriBuilder.Path, pet); + OnErrorAddPet(e, "/pet", uriBuilderLocalVar.Path, pet); throw; } } @@ -514,12 +514,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -532,17 +532,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeletePetOrDefaultAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -569,10 +569,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterDeletePet(ApiResponse apiResponse, long petId, string apiKey) + protected virtual void AfterDeletePet(ApiResponse apiResponseLocalVar, long petId, string apiKey) { } @@ -599,64 +599,64 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnDeletePet(petId, apiKey); - petId = validatedParameters.Item1; - apiKey = validatedParameters.Item2; + var validatedParameterLocalVars = OnDeletePet(petId, apiKey); + petId = validatedParameterLocalVars.Item1; + apiKey = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); if (apiKey != null) - request.Headers.Add("api_key", ClientUtils.ParameterToString(apiKey)); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); if (apiKey != null) + httpRequestMessageLocalVar.Headers.Add("api_key", ClientUtils.ParameterToString(apiKey)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - request.Method = HttpMethod.Delete; + httpRequestMessageLocalVar.Method = HttpMethod.Delete; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeletePet(apiResponse, petId, apiKey); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeletePet(apiResponseLocalVar, petId, apiKey); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeletePet(e, "/pet/{petId}", uriBuilder.Path, petId, apiKey); + OnErrorDeletePet(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId, apiKey); throw; } } @@ -670,12 +670,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); + ApiResponse> apiResponseLocalVar = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -687,17 +687,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByStatusOrDefaultAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = null; + ApiResponse> apiResponseLocalVar = null; try { - result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -723,9 +723,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFindPetsByStatus(ApiResponse> apiResponse, List status) + protected virtual void AfterFindPetsByStatus(ApiResponse> apiResponseLocalVar, List status) { } @@ -750,86 +750,86 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { status = OnFindPetsByStatus(status); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/findByStatus"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/findByStatus"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["status"] = status.ToString(); + parseQueryStringLocalVar["status"] = status.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/findByStatus", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/findByStatus", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse> apiResponse = new ApiResponse>(responseMessage, responseContent); + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterFindPetsByStatus(apiResponse, status); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFindPetsByStatus(apiResponseLocalVar, status); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFindPetsByStatus(e, "/pet/findByStatus", uriBuilder.Path, status); + OnErrorFindPetsByStatus(e, "/pet/findByStatus", uriBuilderLocalVar.Path, status); throw; } } @@ -843,12 +843,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); + ApiResponse> apiResponseLocalVar = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -860,17 +860,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByTagsOrDefaultAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = null; + ApiResponse> apiResponseLocalVar = null; try { - result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -896,9 +896,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFindPetsByTags(ApiResponse> apiResponse, List tags) + protected virtual void AfterFindPetsByTags(ApiResponse> apiResponseLocalVar, List tags) { } @@ -923,86 +923,86 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { tags = OnFindPetsByTags(tags); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/findByTags"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/findByTags"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["tags"] = tags.ToString(); + parseQueryStringLocalVar["tags"] = tags.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/findByTags", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/findByTags", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse> apiResponse = new ApiResponse>(responseMessage, responseContent); + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterFindPetsByTags(apiResponse, tags); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFindPetsByTags(apiResponseLocalVar, tags); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFindPetsByTags(e, "/pet/findByTags", uriBuilder.Path, tags); + OnErrorFindPetsByTags(e, "/pet/findByTags", uriBuilderLocalVar.Path, tags); throw; } } @@ -1016,12 +1016,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1033,17 +1033,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1069,9 +1069,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetPetById(ApiResponse apiResponse, long petId) + protected virtual void AfterGetPetById(ApiResponse apiResponseLocalVar, long petId) { } @@ -1096,67 +1096,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { petId = OnGetPetById(petId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List tokens = new List(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInHeader(request, "api_key"); + apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "api_key"); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetPetById(apiResponse, petId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetPetById(apiResponseLocalVar, petId); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetPetById(e, "/pet/{petId}", uriBuilder.Path, petId); + OnErrorGetPetById(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId); throw; } } @@ -1170,12 +1170,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1187,17 +1187,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1223,9 +1223,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterUpdatePet(ApiResponse apiResponse, Pet pet) + protected virtual void AfterUpdatePet(ApiResponse apiResponseLocalVar, Pet pet) { } @@ -1250,84 +1250,84 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { pet = OnUpdatePet(pet); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - var url = request.RequestUri = new Uri("http://petstore.swagger.io/v2"); - uriBuilder.Host = url.Authority; - uriBuilder.Scheme = url.Scheme; - uriBuilder.Path = url.AbsolutePath; + Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2"); + uriBuilderLocalVar.Host = urlLocalVar.Authority; + uriBuilderLocalVar.Scheme = urlLocalVar.Scheme; + uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath; - request.Content = (pet as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (pet as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); string[] contentTypes = new string[] { "application/json", "application/xml" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdatePet(apiResponse, pet); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdatePet(apiResponseLocalVar, pet); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdatePet(e, "/pet", uriBuilder.Path, pet); + OnErrorUpdatePet(e, "/pet", uriBuilderLocalVar.Path, pet); throw; } } @@ -1343,12 +1343,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1362,17 +1362,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetWithFormOrDefaultAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1400,11 +1400,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUpdatePetWithForm(ApiResponse apiResponse, long petId, string name, string status) + protected virtual void AfterUpdatePetWithForm(ApiResponse apiResponseLocalVar, long petId, string name, string status) { } @@ -1433,83 +1433,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUpdatePetWithForm(petId, name, status); - petId = validatedParameters.Item1; - name = validatedParameters.Item2; - status = validatedParameters.Item3; + var validatedParameterLocalVars = OnUpdatePetWithForm(petId, name, status); + petId = validatedParameterLocalVars.Item1; + name = validatedParameterLocalVars.Item2; + status = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (name != null) - formParams.Add(new KeyValuePair("name", ClientUtils.ParameterToString(name))); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (name != null) + formParameterLocalVars.Add(new KeyValuePair("name", ClientUtils.ParameterToString(name))); if (status != null) - formParams.Add(new KeyValuePair("status", ClientUtils.ParameterToString(status))); + formParameterLocalVars.Add(new KeyValuePair("status", ClientUtils.ParameterToString(status))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdatePetWithForm(apiResponse, petId, name, status); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdatePetWithForm(apiResponseLocalVar, petId, name, status); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdatePetWithForm(e, "/pet/{petId}", uriBuilder.Path, petId, name, status); + OnErrorUpdatePetWithForm(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId, name, status); throw; } } @@ -1525,12 +1525,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1544,17 +1544,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileOrDefaultAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1582,11 +1582,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUploadFile(ApiResponse apiResponse, long petId, System.IO.Stream file, string additionalMetadata) + protected virtual void AfterUploadFile(ApiResponse apiResponseLocalVar, long petId, System.IO.Stream file, string additionalMetadata) { } @@ -1615,92 +1615,92 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUploadFile(petId, file, additionalMetadata); - petId = validatedParameters.Item1; - file = validatedParameters.Item2; - additionalMetadata = validatedParameters.Item3; + var validatedParameterLocalVars = OnUploadFile(petId, file, additionalMetadata); + petId = validatedParameterLocalVars.Item1; + file = validatedParameterLocalVars.Item2; + additionalMetadata = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}/uploadImage"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}/uploadImage"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (file != null) - multipartContent.Add(new StreamContent(file)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (file != null) + multipartContentLocalVar.Add(new StreamContent(file)); if (additionalMetadata != null) - formParams.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); + formParameterLocalVars.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "multipart/form-data" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}/uploadImage", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUploadFile(apiResponse, petId, file, additionalMetadata); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUploadFile(apiResponseLocalVar, petId, file, additionalMetadata); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata); + OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata); throw; } } @@ -1716,12 +1716,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1735,17 +1735,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1776,11 +1776,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUploadFileWithRequiredFile(ApiResponse apiResponse, System.IO.Stream requiredFile, long petId, string additionalMetadata) + protected virtual void AfterUploadFileWithRequiredFile(ApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, string additionalMetadata) { } @@ -1809,92 +1809,92 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata); - requiredFile = validatedParameters.Item1; - petId = validatedParameters.Item2; - additionalMetadata = validatedParameters.Item3; + var validatedParameterLocalVars = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata); + requiredFile = validatedParameterLocalVars.Item1; + petId = validatedParameterLocalVars.Item2; + additionalMetadata = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/{petId}/uploadImageWithRequiredFile"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/{petId}/uploadImageWithRequiredFile"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); multipartContent.Add(new StreamContent(requiredFile)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); multipartContentLocalVar.Add(new StreamContent(requiredFile)); if (additionalMetadata != null) - formParams.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); + formParameterLocalVars.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "multipart/form-data" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUploadFileWithRequiredFile(apiResponseLocalVar, requiredFile, petId, additionalMetadata); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata); + OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs index 19d7f7632d1..e143a8d54f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs @@ -206,12 +206,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -223,17 +223,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -259,9 +259,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterDeleteOrder(ApiResponse apiResponse, string orderId) + protected virtual void AfterDeleteOrder(ApiResponse apiResponseLocalVar, string orderId) { } @@ -286,48 +286,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { orderId = OnDeleteOrder(orderId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = HttpMethod.Delete; + httpRequestMessageLocalVar.Method = HttpMethod.Delete; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order/{order_id}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order/{order_id}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeleteOrder(apiResponse, orderId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeleteOrder(apiResponseLocalVar, orderId); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeleteOrder(e, "/store/order/{order_id}", uriBuilder.Path, orderId); + OnErrorDeleteOrder(e, "/store/order/{order_id}", uriBuilderLocalVar.Path, orderId); throw; } } @@ -340,14 +340,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task> GetInventoryAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = await GetInventoryWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse> apiResponseLocalVar = await GetInventoryWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -362,8 +362,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterGetInventory(ApiResponse> apiResponse) + /// + protected virtual void AfterGetInventory(ApiResponse> apiResponseLocalVar) { } @@ -386,66 +386,66 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task>> GetInventoryWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnGetInventory(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/inventory"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/inventory"; - List tokens = new List(); + List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInHeader(request, "api_key"); + apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "api_key"); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/inventory", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/inventory", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse> apiResponse = new ApiResponse>(responseMessage, responseContent); + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetInventory(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetInventory(apiResponseLocalVar); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetInventory(e, "/store/inventory", uriBuilder.Path); + OnErrorGetInventory(e, "/store/inventory", uriBuilderLocalVar.Path); throw; } } @@ -459,12 +459,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -476,17 +476,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -512,9 +512,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetOrderById(ApiResponse apiResponse, long orderId) + protected virtual void AfterGetOrderById(ApiResponse apiResponseLocalVar, long orderId) { } @@ -539,58 +539,58 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { orderId = OnGetOrderById(orderId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order/{order_id}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order/{order_id}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetOrderById(apiResponse, orderId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetOrderById(apiResponseLocalVar, orderId); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetOrderById(e, "/store/order/{order_id}", uriBuilder.Path, orderId); + OnErrorGetOrderById(e, "/store/order/{order_id}", uriBuilderLocalVar.Path, orderId); throw; } } @@ -604,12 +604,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -621,17 +621,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -657,9 +657,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterPlaceOrder(ApiResponse apiResponse, Order order) + protected virtual void AfterPlaceOrder(ApiResponse apiResponseLocalVar, Order order) { } @@ -684,71 +684,71 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { order = OnPlaceOrder(order); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order"; - request.Content = (order as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(order, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(order, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterPlaceOrder(apiResponse, order); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterPlaceOrder(apiResponseLocalVar, order); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorPlaceOrder(e, "/store/order", uriBuilder.Path, order); + OnErrorPlaceOrder(e, "/store/order", uriBuilderLocalVar.Path, order); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs index 84f89c5c9d4..c74d6b58d33 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs @@ -306,12 +306,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -323,17 +323,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -359,9 +359,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUser(ApiResponse apiResponse, User user) + protected virtual void AfterCreateUser(ApiResponse apiResponseLocalVar, User user) { } @@ -386,61 +386,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUser(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUser(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUser(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUser(e, "/user", uriBuilder.Path, user); + OnErrorCreateUser(e, "/user", uriBuilderLocalVar.Path, user); throw; } } @@ -454,12 +454,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithArrayInputAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -471,17 +471,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithArrayInputOrDefaultAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -507,9 +507,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUsersWithArrayInput(ApiResponse apiResponse, List user) + protected virtual void AfterCreateUsersWithArrayInput(ApiResponse apiResponseLocalVar, List user) { } @@ -534,61 +534,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUsersWithArrayInputWithHttpInfoAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUsersWithArrayInput(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/createWithArray"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/createWithArray"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/createWithArray", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/createWithArray", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUsersWithArrayInput(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUsersWithArrayInput(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUsersWithArrayInput(e, "/user/createWithArray", uriBuilder.Path, user); + OnErrorCreateUsersWithArrayInput(e, "/user/createWithArray", uriBuilderLocalVar.Path, user); throw; } } @@ -602,12 +602,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithListInputAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -619,17 +619,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithListInputOrDefaultAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -655,9 +655,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUsersWithListInput(ApiResponse apiResponse, List user) + protected virtual void AfterCreateUsersWithListInput(ApiResponse apiResponseLocalVar, List user) { } @@ -682,61 +682,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUsersWithListInputWithHttpInfoAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUsersWithListInput(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/createWithList"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/createWithList"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Post; + httpRequestMessageLocalVar.Method = HttpMethod.Post; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/createWithList", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/createWithList", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUsersWithListInput(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUsersWithListInput(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUsersWithListInput(e, "/user/createWithList", uriBuilder.Path, user); + OnErrorCreateUsersWithListInput(e, "/user/createWithList", uriBuilderLocalVar.Path, user); throw; } } @@ -750,12 +750,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -767,17 +767,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -803,9 +803,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterDeleteUser(ApiResponse apiResponse, string username) + protected virtual void AfterDeleteUser(ApiResponse apiResponseLocalVar, string username) { } @@ -830,48 +830,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { username = OnDeleteUser(username); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = HttpMethod.Delete; + httpRequestMessageLocalVar.Method = HttpMethod.Delete; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeleteUser(apiResponse, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeleteUser(apiResponseLocalVar, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeleteUser(e, "/user/{username}", uriBuilder.Path, username); + OnErrorDeleteUser(e, "/user/{username}", uriBuilderLocalVar.Path, username); throw; } } @@ -885,12 +885,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -902,17 +902,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -938,9 +938,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetUserByName(ApiResponse apiResponse, string username) + protected virtual void AfterGetUserByName(ApiResponse apiResponseLocalVar, string username) { } @@ -965,58 +965,58 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { username = OnGetUserByName(username); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetUserByName(apiResponse, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetUserByName(apiResponseLocalVar, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetUserByName(e, "/user/{username}", uriBuilder.Path, username); + OnErrorGetUserByName(e, "/user/{username}", uriBuilderLocalVar.Path, username); throw; } } @@ -1031,14 +1031,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1067,10 +1067,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterLoginUser(ApiResponse apiResponse, string username, string password) + protected virtual void AfterLoginUser(ApiResponse apiResponseLocalVar, string username, string password) { } @@ -1097,67 +1097,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnLoginUser(username, password); - username = validatedParameters.Item1; - password = validatedParameters.Item2; + var validatedParameterLocalVars = OnLoginUser(username, password); + username = validatedParameterLocalVars.Item1; + password = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/login"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/login"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["username"] = username.ToString(); - parseQueryString["password"] = password.ToString(); + parseQueryStringLocalVar["username"] = username.ToString(); + parseQueryStringLocalVar["password"] = password.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/login", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/login", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterLoginUser(apiResponse, username, password); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterLoginUser(apiResponseLocalVar, username, password); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorLoginUser(e, "/user/login", uriBuilder.Path, username, password); + OnErrorLoginUser(e, "/user/login", uriBuilderLocalVar.Path, username, password); throw; } } @@ -1170,12 +1170,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task LogoutUserAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1186,17 +1186,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task LogoutUserOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1212,8 +1212,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterLogoutUser(ApiResponse apiResponse) + /// + protected virtual void AfterLogoutUser(ApiResponse apiResponseLocalVar) { } @@ -1236,48 +1236,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> LogoutUserWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnLogoutUser(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/logout"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/logout"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/logout", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/logout", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterLogoutUser(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterLogoutUser(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorLogoutUser(e, "/user/logout", uriBuilder.Path); + OnErrorLogoutUser(e, "/user/logout", uriBuilderLocalVar.Path); throw; } } @@ -1292,12 +1292,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1310,17 +1310,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1350,10 +1350,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterUpdateUser(ApiResponse apiResponse, User user, string username) + protected virtual void AfterUpdateUser(ApiResponse apiResponseLocalVar, User user, string username) { } @@ -1380,63 +1380,63 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUpdateUser(user, username); - user = validatedParameters.Item1; - username = validatedParameters.Item2; + var validatedParameterLocalVars = OnUpdateUser(user, username); + user = validatedParameterLocalVars.Item1; + username = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = HttpMethod.Put; + httpRequestMessageLocalVar.Method = HttpMethod.Put; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdateUser(apiResponse, user, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdateUser(apiResponseLocalVar, user, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username); + OnErrorUpdateUser(e, "/user/{username}", uriBuilderLocalVar.Path, user, username); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 1849b534544..5b196642d31 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -114,12 +114,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task ListAsync(string personId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await ListWithHttpInfoAsync(personId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await ListWithHttpInfoAsync(personId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -131,17 +131,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task ListOrDefaultAsync(string personId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await ListWithHttpInfoAsync(personId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await ListWithHttpInfoAsync(personId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -167,9 +167,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterList(ApiResponse apiResponse, string personId) + protected virtual void AfterList(ApiResponse apiResponseLocalVar, string personId) { } @@ -194,57 +194,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> ListWithHttpInfoAsync(string personId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { personId = OnList(personId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/person/display/{personId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/person/display/{personId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/person/display/{personId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/person/display/{personId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterList(apiResponse, personId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterList(apiResponseLocalVar, personId); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorList(e, "/person/display/{personId}", uriBuilder.Path, personId); + OnErrorList(e, "/person/display/{personId}", uriBuilderLocalVar.Path, personId); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index e3422a961a7..c48099bdb54 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -110,12 +110,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task RootGetAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await RootGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await RootGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -126,17 +126,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task RootGetOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await RootGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await RootGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -152,8 +152,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterRootGet(ApiResponse apiResponse) + /// + protected virtual void AfterRootGet(ApiResponse apiResponseLocalVar) { } @@ -176,57 +176,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> RootGetWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnRootGet(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterRootGet(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterRootGet(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorRootGet(e, "/", uriBuilder.Path); + OnErrorRootGet(e, "/", uriBuilderLocalVar.Path); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index e3422a961a7..c48099bdb54 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -110,12 +110,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task RootGetAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await RootGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await RootGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -126,17 +126,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task RootGetOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse? result = null; + ApiResponse? apiResponseLocalVar = null; try { - result = await RootGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await RootGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -152,8 +152,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterRootGet(ApiResponse apiResponse) + /// + protected virtual void AfterRootGet(ApiResponse apiResponseLocalVar) { } @@ -176,57 +176,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> RootGetWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnRootGet(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress!.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string? accept = ClientUtils.SelectHeaderAccept(accepts); + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = HttpMethod.Get; + httpRequestMessageLocalVar.Method = HttpMethod.Get; - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterRootGet(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterRootGet(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorRootGet(e, "/", uriBuilder.Path); + OnErrorRootGet(e, "/", uriBuilderLocalVar.Path); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index add615bbd61..a0bc52dc911 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -136,12 +136,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -153,17 +153,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -189,9 +189,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCall123TestSpecialTags(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterCall123TestSpecialTags(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -216,70 +216,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnCall123TestSpecialTags(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/another-fake/dummy"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/another-fake/dummy"; - request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("PATCH"); + httpRequestMessageLocalVar.Method = new HttpMethod("PATCH"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/another-fake/dummy", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/another-fake/dummy", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCall123TestSpecialTags(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCall123TestSpecialTags(apiResponseLocalVar, modelClient); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCall123TestSpecialTags(e, "/another-fake/dummy", uriBuilder.Path, modelClient); + OnErrorCall123TestSpecialTags(e, "/another-fake/dummy", uriBuilderLocalVar.Path, modelClient); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs index beaaeb8a943..c736d802911 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -157,12 +157,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FooGetAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -173,17 +173,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FooGetOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FooGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -199,8 +199,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterFooGet(ApiResponse apiResponse) + /// + protected virtual void AfterFooGet(ApiResponse apiResponseLocalVar) { } @@ -223,57 +223,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FooGetWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnFooGet(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/foo"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/foo"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/foo", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/foo", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFooGet(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFooGet(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFooGet(e, "/foo", uriBuilder.Path); + OnErrorFooGet(e, "/foo", uriBuilderLocalVar.Path); throw; } } @@ -287,12 +287,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetCountryAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -304,17 +304,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetCountryOrDefaultAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetCountryWithHttpInfoAsync(country, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -340,9 +340,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetCountry(ApiResponse apiResponse, string country) + protected virtual void AfterGetCountry(ApiResponse apiResponseLocalVar, string country) { } @@ -367,67 +367,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetCountryWithHttpInfoAsync(string country, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { country = OnGetCountry(country); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/country"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/country"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("country", ClientUtils.ParameterToString(country))); + formParameterLocalVars.Add(new KeyValuePair("country", ClientUtils.ParameterToString(country))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/country", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/country", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetCountry(apiResponse, country); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetCountry(apiResponseLocalVar, country); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetCountry(e, "/country", uriBuilder.Path, country); + OnErrorGetCountry(e, "/country", uriBuilderLocalVar.Path, country); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs index 33d7fee317d..4c8be6afd31 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs @@ -531,12 +531,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeHealthGetAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -547,17 +547,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeHealthGetOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeHealthGetWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -573,8 +573,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterFakeHealthGet(ApiResponse apiResponse) + /// + protected virtual void AfterFakeHealthGet(ApiResponse apiResponseLocalVar) { } @@ -597,57 +597,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeHealthGetWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnFakeHealthGet(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/health"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/health"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/health", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/health", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeHealthGet(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeHealthGet(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeHealthGet(e, "/fake/health", uriBuilder.Path); + OnErrorFakeHealthGet(e, "/fake/health", uriBuilderLocalVar.Path); throw; } } @@ -661,14 +661,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -684,9 +684,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterBooleanSerialize(ApiResponse apiResponse, bool? body) + protected virtual void AfterFakeOuterBooleanSerialize(ApiResponse apiResponseLocalVar, bool? body) { } @@ -711,70 +711,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { body = OnFakeOuterBooleanSerialize(body); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/boolean"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/boolean"; - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/boolean", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/boolean", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterBooleanSerialize(apiResponse, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterBooleanSerialize(apiResponseLocalVar, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterBooleanSerialize(e, "/fake/outer/boolean", uriBuilder.Path, body); + OnErrorFakeOuterBooleanSerialize(e, "/fake/outer/boolean", uriBuilderLocalVar.Path, body); throw; } } @@ -788,12 +788,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterCompositeSerializeAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -805,17 +805,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -832,9 +832,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterCompositeSerialize(ApiResponse apiResponse, OuterComposite outerComposite) + protected virtual void AfterFakeOuterCompositeSerialize(ApiResponse apiResponseLocalVar, OuterComposite outerComposite) { } @@ -859,70 +859,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { outerComposite = OnFakeOuterCompositeSerialize(outerComposite); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/composite"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/composite"; - request.Content = (outerComposite as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(outerComposite, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (outerComposite as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(outerComposite, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/composite", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/composite", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterCompositeSerialize(apiResponse, outerComposite); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterCompositeSerialize(apiResponseLocalVar, outerComposite); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterCompositeSerialize(e, "/fake/outer/composite", uriBuilder.Path, outerComposite); + OnErrorFakeOuterCompositeSerialize(e, "/fake/outer/composite", uriBuilderLocalVar.Path, outerComposite); throw; } } @@ -936,14 +936,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -959,9 +959,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFakeOuterNumberSerialize(ApiResponse apiResponse, decimal? body) + protected virtual void AfterFakeOuterNumberSerialize(ApiResponse apiResponseLocalVar, decimal? body) { } @@ -986,70 +986,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { body = OnFakeOuterNumberSerialize(body); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/number"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/number"; - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/number", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/number", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterNumberSerialize(apiResponse, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterNumberSerialize(apiResponseLocalVar, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterNumberSerialize(e, "/fake/outer/number", uriBuilder.Path, body); + OnErrorFakeOuterNumberSerialize(e, "/fake/outer/number", uriBuilderLocalVar.Path, body); throw; } } @@ -1064,14 +1064,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task FakeOuterStringSerializeAsync(Guid requiredStringUuid, string body = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await FakeOuterStringSerializeWithHttpInfoAsync(requiredStringUuid, body, cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1097,10 +1097,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterFakeOuterStringSerialize(ApiResponse apiResponse, Guid requiredStringUuid, string body) + protected virtual void AfterFakeOuterStringSerialize(ApiResponse apiResponseLocalVar, Guid requiredStringUuid, string body) { } @@ -1127,78 +1127,78 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> FakeOuterStringSerializeWithHttpInfoAsync(Guid requiredStringUuid, string body = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnFakeOuterStringSerialize(requiredStringUuid, body); - requiredStringUuid = validatedParameters.Item1; - body = validatedParameters.Item2; + var validatedParameterLocalVars = OnFakeOuterStringSerialize(requiredStringUuid, body); + requiredStringUuid = validatedParameterLocalVars.Item1; + body = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/string"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/outer/string"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_uuid"] = requiredStringUuid.ToString(); + parseQueryStringLocalVar["required_string_uuid"] = requiredStringUuid.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Content = (body as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (body as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(body, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "*/*" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/outer/string", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/outer/string", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterFakeOuterStringSerialize(apiResponse, requiredStringUuid, body); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFakeOuterStringSerialize(apiResponseLocalVar, requiredStringUuid, body); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFakeOuterStringSerialize(e, "/fake/outer/string", uriBuilder.Path, requiredStringUuid, body); + OnErrorFakeOuterStringSerialize(e, "/fake/outer/string", uriBuilderLocalVar.Path, requiredStringUuid, body); throw; } } @@ -1211,12 +1211,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> GetArrayOfEnumsAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse> apiResponseLocalVar = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1227,17 +1227,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task> GetArrayOfEnumsOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = null; + ApiResponse> apiResponseLocalVar = null; try { - result = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetArrayOfEnumsWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1253,8 +1253,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterGetArrayOfEnums(ApiResponse> apiResponse) + /// + protected virtual void AfterGetArrayOfEnums(ApiResponse> apiResponseLocalVar) { } @@ -1277,57 +1277,57 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task>> GetArrayOfEnumsWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnGetArrayOfEnums(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/array-of-enums"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/array-of-enums"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/array-of-enums", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/array-of-enums", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse> apiResponse = new ApiResponse>(responseMessage, responseContent); + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetArrayOfEnums(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetArrayOfEnums(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetArrayOfEnums(e, "/fake/array-of-enums", uriBuilder.Path); + OnErrorGetArrayOfEnums(e, "/fake/array-of-enums", uriBuilderLocalVar.Path); throw; } } @@ -1341,12 +1341,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1358,17 +1358,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1394,9 +1394,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestBodyWithFileSchema(ApiResponse apiResponse, FileSchemaTestClass fileSchemaTestClass) + protected virtual void AfterTestBodyWithFileSchema(ApiResponse apiResponseLocalVar, FileSchemaTestClass fileSchemaTestClass) { } @@ -1421,61 +1421,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { fileSchemaTestClass = OnTestBodyWithFileSchema(fileSchemaTestClass); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-file-schema"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-file-schema"; - request.Content = (fileSchemaTestClass as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(fileSchemaTestClass, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (fileSchemaTestClass as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(fileSchemaTestClass, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("PUT"); + httpRequestMessageLocalVar.Method = new HttpMethod("PUT"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/body-with-file-schema", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/body-with-file-schema", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestBodyWithFileSchema(apiResponse, fileSchemaTestClass); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestBodyWithFileSchema(apiResponseLocalVar, fileSchemaTestClass); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestBodyWithFileSchema(e, "/fake/body-with-file-schema", uriBuilder.Path, fileSchemaTestClass); + OnErrorTestBodyWithFileSchema(e, "/fake/body-with-file-schema", uriBuilderLocalVar.Path, fileSchemaTestClass); throw; } } @@ -1490,12 +1490,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1508,17 +1508,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1548,10 +1548,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterTestBodyWithQueryParams(ApiResponse apiResponse, User user, string query) + protected virtual void AfterTestBodyWithQueryParams(ApiResponse apiResponseLocalVar, User user, string query) { } @@ -1578,69 +1578,69 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestBodyWithQueryParams(user, query); - user = validatedParameters.Item1; - query = validatedParameters.Item2; + var validatedParameterLocalVars = OnTestBodyWithQueryParams(user, query); + user = validatedParameterLocalVars.Item1; + query = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-query-params"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/body-with-query-params"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["query"] = query.ToString(); + parseQueryStringLocalVar["query"] = query.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("PUT"); + httpRequestMessageLocalVar.Method = new HttpMethod("PUT"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/body-with-query-params", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/body-with-query-params", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestBodyWithQueryParams(apiResponse, user, query); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestBodyWithQueryParams(apiResponseLocalVar, user, query); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query); + OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilderLocalVar.Path, user, query); throw; } } @@ -1654,12 +1654,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1671,17 +1671,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1707,9 +1707,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestClientModel(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterTestClientModel(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -1734,70 +1734,70 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnTestClientModel(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("PATCH"); + httpRequestMessageLocalVar.Method = new HttpMethod("PATCH"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestClientModel(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestClientModel(apiResponseLocalVar, modelClient); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestClientModel(e, "/fake", uriBuilder.Path, modelClient); + OnErrorTestClientModel(e, "/fake", uriBuilderLocalVar.Path, modelClient); throw; } } @@ -1824,12 +1824,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1854,17 +1854,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1912,7 +1912,7 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// @@ -1927,7 +1927,7 @@ namespace Org.OpenAPITools.Api /// /// /// - protected virtual void AfterTestEndpointParameters(ApiResponse apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime) + protected virtual void AfterTestEndpointParameters(ApiResponse apiResponseLocalVar, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime) { } @@ -1978,134 +1978,134 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); - _byte = validatedParameters.Item1; - number = validatedParameters.Item2; - _double = validatedParameters.Item3; - patternWithoutDelimiter = validatedParameters.Item4; - date = validatedParameters.Item5; - binary = validatedParameters.Item6; - _float = validatedParameters.Item7; - integer = validatedParameters.Item8; - int32 = validatedParameters.Item9; - int64 = validatedParameters.Item10; - _string = validatedParameters.Item11; - password = validatedParameters.Item12; - callback = validatedParameters.Item13; - dateTime = validatedParameters.Item14; + var validatedParameterLocalVars = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + _byte = validatedParameterLocalVars.Item1; + number = validatedParameterLocalVars.Item2; + _double = validatedParameterLocalVars.Item3; + patternWithoutDelimiter = validatedParameterLocalVars.Item4; + date = validatedParameterLocalVars.Item5; + binary = validatedParameterLocalVars.Item6; + _float = validatedParameterLocalVars.Item7; + integer = validatedParameterLocalVars.Item8; + int32 = validatedParameterLocalVars.Item9; + int64 = validatedParameterLocalVars.Item10; + _string = validatedParameterLocalVars.Item11; + password = validatedParameterLocalVars.Item12; + callback = validatedParameterLocalVars.Item13; + dateTime = validatedParameterLocalVars.Item14; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("byte", ClientUtils.ParameterToString(_byte))); + formParameterLocalVars.Add(new KeyValuePair("byte", ClientUtils.ParameterToString(_byte))); - formParams.Add(new KeyValuePair("number", ClientUtils.ParameterToString(number))); + formParameterLocalVars.Add(new KeyValuePair("number", ClientUtils.ParameterToString(number))); - formParams.Add(new KeyValuePair("double", ClientUtils.ParameterToString(_double))); + formParameterLocalVars.Add(new KeyValuePair("double", ClientUtils.ParameterToString(_double))); - formParams.Add(new KeyValuePair("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter))); + formParameterLocalVars.Add(new KeyValuePair("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter))); if (date != null) - formParams.Add(new KeyValuePair("date", ClientUtils.ParameterToString(date))); + formParameterLocalVars.Add(new KeyValuePair("date", ClientUtils.ParameterToString(date))); if (binary != null) - multipartContent.Add(new StreamContent(binary)); + multipartContentLocalVar.Add(new StreamContent(binary)); if (_float != null) - formParams.Add(new KeyValuePair("float", ClientUtils.ParameterToString(_float))); + formParameterLocalVars.Add(new KeyValuePair("float", ClientUtils.ParameterToString(_float))); if (integer != null) - formParams.Add(new KeyValuePair("integer", ClientUtils.ParameterToString(integer))); + formParameterLocalVars.Add(new KeyValuePair("integer", ClientUtils.ParameterToString(integer))); if (int32 != null) - formParams.Add(new KeyValuePair("int32", ClientUtils.ParameterToString(int32))); + formParameterLocalVars.Add(new KeyValuePair("int32", ClientUtils.ParameterToString(int32))); if (int64 != null) - formParams.Add(new KeyValuePair("int64", ClientUtils.ParameterToString(int64))); + formParameterLocalVars.Add(new KeyValuePair("int64", ClientUtils.ParameterToString(int64))); if (_string != null) - formParams.Add(new KeyValuePair("string", ClientUtils.ParameterToString(_string))); + formParameterLocalVars.Add(new KeyValuePair("string", ClientUtils.ParameterToString(_string))); if (password != null) - formParams.Add(new KeyValuePair("password", ClientUtils.ParameterToString(password))); + formParameterLocalVars.Add(new KeyValuePair("password", ClientUtils.ParameterToString(password))); if (callback != null) - formParams.Add(new KeyValuePair("callback", ClientUtils.ParameterToString(callback))); + formParameterLocalVars.Add(new KeyValuePair("callback", ClientUtils.ParameterToString(callback))); if (dateTime != null) - formParams.Add(new KeyValuePair("dateTime", ClientUtils.ParameterToString(dateTime))); + formParameterLocalVars.Add(new KeyValuePair("dateTime", ClientUtils.ParameterToString(dateTime))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - BasicToken basicToken = (BasicToken) await BasicTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + BasicToken basicTokenLocalVar = (BasicToken) await BasicTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(basicToken); + tokenBaseLocalVars.Add(basicTokenLocalVar); - basicToken.UseInHeader(request, ""); + basicTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestEndpointParameters(apiResponseLocalVar, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); + OnErrorTestEndpointParameters(e, "/fake", uriBuilderLocalVar.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime); throw; } } @@ -2126,12 +2126,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEnumParametersAsync(List enumHeaderStringArray = null, List enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2150,17 +2150,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestEnumParametersOrDefaultAsync(List enumHeaderStringArray = null, List enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2184,7 +2184,7 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// @@ -2193,7 +2193,7 @@ namespace Org.OpenAPITools.Api /// /// /// - protected virtual void AfterTestEnumParameters(ApiResponse apiResponse, List enumHeaderStringArray, List enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString) + protected virtual void AfterTestEnumParameters(ApiResponse apiResponseLocalVar, List enumHeaderStringArray, List enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString) { } @@ -2232,98 +2232,98 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestEnumParametersWithHttpInfoAsync(List enumHeaderStringArray = null, List enumQueryStringArray = null, double? enumQueryDouble = null, int? enumQueryInteger = null, List enumFormStringArray = null, string enumHeaderString = null, string enumQueryString = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); - enumHeaderStringArray = validatedParameters.Item1; - enumQueryStringArray = validatedParameters.Item2; - enumQueryDouble = validatedParameters.Item3; - enumQueryInteger = validatedParameters.Item4; - enumFormStringArray = validatedParameters.Item5; - enumHeaderString = validatedParameters.Item6; - enumQueryString = validatedParameters.Item7; - enumFormString = validatedParameters.Item8; + var validatedParameterLocalVars = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + enumHeaderStringArray = validatedParameterLocalVars.Item1; + enumQueryStringArray = validatedParameterLocalVars.Item2; + enumQueryDouble = validatedParameterLocalVars.Item3; + enumQueryInteger = validatedParameterLocalVars.Item4; + enumFormStringArray = validatedParameterLocalVars.Item5; + enumHeaderString = validatedParameterLocalVars.Item6; + enumQueryString = validatedParameterLocalVars.Item7; + enumFormString = validatedParameterLocalVars.Item8; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); if (enumQueryStringArray != null) - parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString(); + parseQueryStringLocalVar["enum_query_string_array"] = enumQueryStringArray.ToString(); if (enumQueryDouble != null) - parseQueryString["enum_query_double"] = enumQueryDouble.ToString(); + parseQueryStringLocalVar["enum_query_double"] = enumQueryDouble.ToString(); if (enumQueryInteger != null) - parseQueryString["enum_query_integer"] = enumQueryInteger.ToString(); + parseQueryStringLocalVar["enum_query_integer"] = enumQueryInteger.ToString(); if (enumQueryString != null) - parseQueryString["enum_query_string"] = enumQueryString.ToString(); + parseQueryStringLocalVar["enum_query_string"] = enumQueryString.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); if (enumHeaderStringArray != null) - request.Headers.Add("enum_header_string_array", ClientUtils.ParameterToString(enumHeaderStringArray)); + httpRequestMessageLocalVar.Headers.Add("enum_header_string_array", ClientUtils.ParameterToString(enumHeaderStringArray)); if (enumHeaderString != null) - request.Headers.Add("enum_header_string", ClientUtils.ParameterToString(enumHeaderString)); + httpRequestMessageLocalVar.Headers.Add("enum_header_string", ClientUtils.ParameterToString(enumHeaderString)); - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (enumFormStringArray != null) - formParams.Add(new KeyValuePair("enum_form_string_array", ClientUtils.ParameterToString(enumFormStringArray))); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (enumFormStringArray != null) + formParameterLocalVars.Add(new KeyValuePair("enum_form_string_array", ClientUtils.ParameterToString(enumFormStringArray))); if (enumFormString != null) - formParams.Add(new KeyValuePair("enum_form_string", ClientUtils.ParameterToString(enumFormString))); + formParameterLocalVars.Add(new KeyValuePair("enum_form_string", ClientUtils.ParameterToString(enumFormString))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestEnumParameters(apiResponseLocalVar, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); + OnErrorTestEnumParameters(e, "/fake", uriBuilderLocalVar.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString); throw; } } @@ -2342,12 +2342,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2364,17 +2364,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2411,14 +2411,14 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// /// /// /// - protected virtual void AfterTestGroupParameters(ApiResponse apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group) + protected virtual void AfterTestGroupParameters(ApiResponse apiResponseLocalVar, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group) { } @@ -2453,83 +2453,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); - requiredBooleanGroup = validatedParameters.Item1; - requiredStringGroup = validatedParameters.Item2; - requiredInt64Group = validatedParameters.Item3; - booleanGroup = validatedParameters.Item4; - stringGroup = validatedParameters.Item5; - int64Group = validatedParameters.Item6; + var validatedParameterLocalVars = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + requiredBooleanGroup = validatedParameterLocalVars.Item1; + requiredStringGroup = validatedParameterLocalVars.Item2; + requiredInt64Group = validatedParameterLocalVars.Item3; + booleanGroup = validatedParameterLocalVars.Item4; + stringGroup = validatedParameterLocalVars.Item5; + int64Group = validatedParameterLocalVars.Item6; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["required_string_group"] = requiredStringGroup.ToString(); - parseQueryString["required_int64_group"] = requiredInt64Group.ToString(); + parseQueryStringLocalVar["required_string_group"] = requiredStringGroup.ToString(); + parseQueryStringLocalVar["required_int64_group"] = requiredInt64Group.ToString(); if (stringGroup != null) - parseQueryString["string_group"] = stringGroup.ToString(); + parseQueryStringLocalVar["string_group"] = stringGroup.ToString(); if (int64Group != null) - parseQueryString["int64_group"] = int64Group.ToString(); + parseQueryStringLocalVar["int64_group"] = int64Group.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.Headers.Add("required_boolean_group", ClientUtils.ParameterToString(requiredBooleanGroup)); + httpRequestMessageLocalVar.Headers.Add("required_boolean_group", ClientUtils.ParameterToString(requiredBooleanGroup)); if (booleanGroup != null) - request.Headers.Add("boolean_group", ClientUtils.ParameterToString(booleanGroup)); + httpRequestMessageLocalVar.Headers.Add("boolean_group", ClientUtils.ParameterToString(booleanGroup)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - BearerToken bearerToken = (BearerToken) await BearerTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + BearerToken bearerTokenLocalVar = (BearerToken) await BearerTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(bearerToken); + tokenBaseLocalVars.Add(bearerTokenLocalVar); - bearerToken.UseInHeader(request, ""); + bearerTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - request.Method = new HttpMethod("DELETE"); + httpRequestMessageLocalVar.Method = new HttpMethod("DELETE"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestGroupParameters(apiResponseLocalVar, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); + OnErrorTestGroupParameters(e, "/fake", uriBuilderLocalVar.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group); throw; } } @@ -2543,12 +2543,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestInlineAdditionalPropertiesAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2560,17 +2560,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2596,9 +2596,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestInlineAdditionalProperties(ApiResponse apiResponse, Dictionary requestBody) + protected virtual void AfterTestInlineAdditionalProperties(ApiResponse apiResponseLocalVar, Dictionary requestBody) { } @@ -2623,61 +2623,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary requestBody, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { requestBody = OnTestInlineAdditionalProperties(requestBody); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/inline-additionalProperties"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/inline-additionalProperties"; - request.Content = (requestBody as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(requestBody, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (requestBody as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(requestBody, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/inline-additionalProperties", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/inline-additionalProperties", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestInlineAdditionalProperties(apiResponse, requestBody); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestInlineAdditionalProperties(apiResponseLocalVar, requestBody); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestInlineAdditionalProperties(e, "/fake/inline-additionalProperties", uriBuilder.Path, requestBody); + OnErrorTestInlineAdditionalProperties(e, "/fake/inline-additionalProperties", uriBuilderLocalVar.Path, requestBody); throw; } } @@ -2692,12 +2692,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2710,17 +2710,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2750,10 +2750,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterTestJsonFormData(ApiResponse apiResponse, string param, string param2) + protected virtual void AfterTestJsonFormData(ApiResponse apiResponseLocalVar, string param, string param2) { } @@ -2780,73 +2780,73 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestJsonFormData(param, param2); - param = validatedParameters.Item1; - param2 = validatedParameters.Item2; + var validatedParameterLocalVars = OnTestJsonFormData(param, param2); + param = validatedParameterLocalVars.Item1; + param2 = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/jsonFormData"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/jsonFormData"; - MultipartContent multipartContent = new MultipartContent(); + MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); - formParams.Add(new KeyValuePair("param", ClientUtils.ParameterToString(param))); + formParameterLocalVars.Add(new KeyValuePair("param", ClientUtils.ParameterToString(param))); - formParams.Add(new KeyValuePair("param2", ClientUtils.ParameterToString(param2))); + formParameterLocalVars.Add(new KeyValuePair("param2", ClientUtils.ParameterToString(param2))); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/jsonFormData", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/jsonFormData", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestJsonFormData(apiResponse, param, param2); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestJsonFormData(apiResponseLocalVar, param, param2); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestJsonFormData(e, "/fake/jsonFormData", uriBuilder.Path, param, param2); + OnErrorTestJsonFormData(e, "/fake/jsonFormData", uriBuilderLocalVar.Path, param, param2); throw; } } @@ -2864,12 +2864,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestQueryParameterCollectionFormatAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -2885,17 +2885,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestQueryParameterCollectionFormatOrDefaultAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -2937,13 +2937,13 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// /// /// - protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse apiResponse, List pipe, List ioutil, List http, List url, List context) + protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse apiResponseLocalVar, List pipe, List ioutil, List http, List url, List context) { } @@ -2976,63 +2976,63 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestQueryParameterCollectionFormatWithHttpInfoAsync(List pipe, List ioutil, List http, List url, List context, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnTestQueryParameterCollectionFormat(pipe, ioutil, http, url, context); - pipe = validatedParameters.Item1; - ioutil = validatedParameters.Item2; - http = validatedParameters.Item3; - url = validatedParameters.Item4; - context = validatedParameters.Item5; + var validatedParameterLocalVars = OnTestQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + pipe = validatedParameterLocalVars.Item1; + ioutil = validatedParameterLocalVars.Item2; + http = validatedParameterLocalVars.Item3; + url = validatedParameterLocalVars.Item4; + context = validatedParameterLocalVars.Item5; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/test-query-parameters"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/test-query-parameters"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["pipe"] = pipe.ToString(); - parseQueryString["ioutil"] = ioutil.ToString(); - parseQueryString["http"] = http.ToString(); - parseQueryString["url"] = url.ToString(); - parseQueryString["context"] = context.ToString(); + parseQueryStringLocalVar["pipe"] = pipe.ToString(); + parseQueryStringLocalVar["ioutil"] = ioutil.ToString(); + parseQueryStringLocalVar["http"] = http.ToString(); + parseQueryStringLocalVar["url"] = url.ToString(); + parseQueryStringLocalVar["context"] = context.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = new HttpMethod("PUT"); + httpRequestMessageLocalVar.Method = new HttpMethod("PUT"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/test-query-parameters", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/test-query-parameters", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestQueryParameterCollectionFormat(apiResponse, pipe, ioutil, http, url, context); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestQueryParameterCollectionFormat(apiResponseLocalVar, pipe, ioutil, http, url, context); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestQueryParameterCollectionFormat(e, "/fake/test-query-parameters", uriBuilder.Path, pipe, ioutil, http, url, context); + OnErrorTestQueryParameterCollectionFormat(e, "/fake/test-query-parameters", uriBuilderLocalVar.Path, pipe, ioutil, http, url, context); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index cced05336fb..a3ef181e5dc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -136,12 +136,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -153,17 +153,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -189,9 +189,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterTestClassname(ApiResponse apiResponse, ModelClient modelClient) + protected virtual void AfterTestClassname(ApiResponse apiResponseLocalVar, ModelClient modelClient) { } @@ -216,83 +216,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { modelClient = OnTestClassname(modelClient); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake_classname_test"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake_classname_test"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); request.Content = (modelClient as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInQuery(request, uriBuilder, parseQueryString, "api_key_query"); + apiKeyTokenLocalVar.UseInQuery(httpRequestMessageLocalVar, uriBuilderLocalVar, parseQueryStringLocalVar, "api_key_query"); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("PATCH"); + httpRequestMessageLocalVar.Method = new HttpMethod("PATCH"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake_classname_test", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake_classname_test", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterTestClassname(apiResponse, modelClient); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterTestClassname(apiResponseLocalVar, modelClient); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorTestClassname(e, "/fake_classname_test", uriBuilder.Path, modelClient); + OnErrorTestClassname(e, "/fake_classname_test", uriBuilderLocalVar.Path, modelClient); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs index b67aa8423b9..cd0b005f8bf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs @@ -342,12 +342,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -359,17 +359,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -395,9 +395,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterAddPet(ApiResponse apiResponse, Pet pet) + protected virtual void AfterAddPet(ApiResponse apiResponseLocalVar, Pet pet) { } @@ -422,84 +422,84 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { pet = OnAddPet(pet); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - var url = request.RequestUri = new Uri("http://petstore.swagger.io/v2"); - uriBuilder.Host = url.Authority; - uriBuilder.Scheme = url.Scheme; - uriBuilder.Path = url.AbsolutePath; + Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2"); + uriBuilderLocalVar.Host = urlLocalVar.Authority; + uriBuilderLocalVar.Scheme = urlLocalVar.Scheme; + uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath; - request.Content = (pet as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (pet as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content.ReadAsStringAsync().ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); string[] contentTypes = new string[] { "application/json", "application/xml" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterAddPet(apiResponse, pet); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterAddPet(apiResponseLocalVar, pet); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorAddPet(e, "/pet", uriBuilder.Path, pet); + OnErrorAddPet(e, "/pet", uriBuilderLocalVar.Path, pet); throw; } } @@ -514,12 +514,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -532,17 +532,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeletePetOrDefaultAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -569,10 +569,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterDeletePet(ApiResponse apiResponse, long petId, string apiKey) + protected virtual void AfterDeletePet(ApiResponse apiResponseLocalVar, long petId, string apiKey) { } @@ -599,64 +599,64 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnDeletePet(petId, apiKey); - petId = validatedParameters.Item1; - apiKey = validatedParameters.Item2; + var validatedParameterLocalVars = OnDeletePet(petId, apiKey); + petId = validatedParameterLocalVars.Item1; + apiKey = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); if (apiKey != null) - request.Headers.Add("api_key", ClientUtils.ParameterToString(apiKey)); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); if (apiKey != null) + httpRequestMessageLocalVar.Headers.Add("api_key", ClientUtils.ParameterToString(apiKey)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - request.Method = new HttpMethod("DELETE"); + httpRequestMessageLocalVar.Method = new HttpMethod("DELETE"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeletePet(apiResponse, petId, apiKey); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeletePet(apiResponseLocalVar, petId, apiKey); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeletePet(e, "/pet/{petId}", uriBuilder.Path, petId, apiKey); + OnErrorDeletePet(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId, apiKey); throw; } } @@ -670,12 +670,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByStatusAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); + ApiResponse> apiResponseLocalVar = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -687,17 +687,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByStatusOrDefaultAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = null; + ApiResponse> apiResponseLocalVar = null; try { - result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -723,9 +723,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFindPetsByStatus(ApiResponse> apiResponse, List status) + protected virtual void AfterFindPetsByStatus(ApiResponse> apiResponseLocalVar, List status) { } @@ -750,86 +750,86 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task>> FindPetsByStatusWithHttpInfoAsync(List status, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { status = OnFindPetsByStatus(status); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/findByStatus"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/findByStatus"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["status"] = status.ToString(); + parseQueryStringLocalVar["status"] = status.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content.ReadAsStringAsync().ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/findByStatus", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/findByStatus", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse> apiResponse = new ApiResponse>(responseMessage, responseContent); + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterFindPetsByStatus(apiResponse, status); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFindPetsByStatus(apiResponseLocalVar, status); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFindPetsByStatus(e, "/pet/findByStatus", uriBuilder.Path, status); + OnErrorFindPetsByStatus(e, "/pet/findByStatus", uriBuilderLocalVar.Path, status); throw; } } @@ -843,12 +843,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByTagsAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); + ApiResponse> apiResponseLocalVar = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -860,17 +860,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task> FindPetsByTagsOrDefaultAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = null; + ApiResponse> apiResponseLocalVar = null; try { - result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -896,9 +896,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterFindPetsByTags(ApiResponse> apiResponse, List tags) + protected virtual void AfterFindPetsByTags(ApiResponse> apiResponseLocalVar, List tags) { } @@ -923,86 +923,86 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task>> FindPetsByTagsWithHttpInfoAsync(List tags, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { tags = OnFindPetsByTags(tags); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/findByTags"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/findByTags"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["tags"] = tags.ToString(); + parseQueryStringLocalVar["tags"] = tags.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content.ReadAsStringAsync().ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/findByTags", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/findByTags", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse> apiResponse = new ApiResponse>(responseMessage, responseContent); + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterFindPetsByTags(apiResponse, tags); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterFindPetsByTags(apiResponseLocalVar, tags); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorFindPetsByTags(e, "/pet/findByTags", uriBuilder.Path, tags); + OnErrorFindPetsByTags(e, "/pet/findByTags", uriBuilderLocalVar.Path, tags); throw; } } @@ -1016,12 +1016,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1033,17 +1033,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1069,9 +1069,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetPetById(ApiResponse apiResponse, long petId) + protected virtual void AfterGetPetById(ApiResponse apiResponseLocalVar, long petId) { } @@ -1096,67 +1096,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { petId = OnGetPetById(petId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List tokens = new List(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInHeader(request, "api_key"); + apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "api_key"); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetPetById(apiResponse, petId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetPetById(apiResponseLocalVar, petId); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetPetById(e, "/pet/{petId}", uriBuilder.Path, petId); + OnErrorGetPetById(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId); throw; } } @@ -1170,12 +1170,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1187,17 +1187,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1223,9 +1223,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterUpdatePet(ApiResponse apiResponse, Pet pet) + protected virtual void AfterUpdatePet(ApiResponse apiResponseLocalVar, Pet pet) { } @@ -1250,84 +1250,84 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { pet = OnUpdatePet(pet); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - var url = request.RequestUri = new Uri("http://petstore.swagger.io/v2"); - uriBuilder.Host = url.Authority; - uriBuilder.Scheme = url.Scheme; - uriBuilder.Path = url.AbsolutePath; + Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2"); + uriBuilderLocalVar.Host = urlLocalVar.Authority; + uriBuilderLocalVar.Scheme = urlLocalVar.Scheme; + uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath; - request.Content = (pet as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (pet as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(pet, _jsonSerializerOptions)); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); - HttpSignatureToken signatureToken = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + HttpSignatureToken httpSignatureTokenLocalVar = (HttpSignatureToken) await HttpSignatureTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(signatureToken); + tokenBaseLocalVars.Add(httpSignatureTokenLocalVar); - string requestBody = await request.Content.ReadAsStringAsync().ConfigureAwait(false); + string requestBodyLocalVar = await httpRequestMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - signatureToken.UseInHeader(request, requestBody, cancellationToken); + httpSignatureTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, requestBodyLocalVar, cancellationToken); string[] contentTypes = new string[] { "application/json", "application/xml" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("PUT"); + httpRequestMessageLocalVar.Method = new HttpMethod("PUT"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdatePet(apiResponse, pet); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdatePet(apiResponseLocalVar, pet); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdatePet(e, "/pet", uriBuilder.Path, pet); + OnErrorUpdatePet(e, "/pet", uriBuilderLocalVar.Path, pet); throw; } } @@ -1343,12 +1343,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1362,17 +1362,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdatePetWithFormOrDefaultAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1400,11 +1400,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUpdatePetWithForm(ApiResponse apiResponse, long petId, string name, string status) + protected virtual void AfterUpdatePetWithForm(ApiResponse apiResponseLocalVar, long petId, string name, string status) { } @@ -1433,83 +1433,83 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUpdatePetWithForm(petId, name, status); - petId = validatedParameters.Item1; - name = validatedParameters.Item2; - status = validatedParameters.Item3; + var validatedParameterLocalVars = OnUpdatePetWithForm(petId, name, status); + petId = validatedParameterLocalVars.Item1; + name = validatedParameterLocalVars.Item2; + status = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (name != null) - formParams.Add(new KeyValuePair("name", ClientUtils.ParameterToString(name))); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (name != null) + formParameterLocalVars.Add(new KeyValuePair("name", ClientUtils.ParameterToString(name))); if (status != null) - formParams.Add(new KeyValuePair("status", ClientUtils.ParameterToString(status))); + formParameterLocalVars.Add(new KeyValuePair("status", ClientUtils.ParameterToString(status))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "application/x-www-form-urlencoded" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdatePetWithForm(apiResponse, petId, name, status); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdatePetWithForm(apiResponseLocalVar, petId, name, status); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdatePetWithForm(e, "/pet/{petId}", uriBuilder.Path, petId, name, status); + OnErrorUpdatePetWithForm(e, "/pet/{petId}", uriBuilderLocalVar.Path, petId, name, status); throw; } } @@ -1525,12 +1525,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1544,17 +1544,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileOrDefaultAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1582,11 +1582,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUploadFile(ApiResponse apiResponse, long petId, System.IO.Stream file, string additionalMetadata) + protected virtual void AfterUploadFile(ApiResponse apiResponseLocalVar, long petId, System.IO.Stream file, string additionalMetadata) { } @@ -1615,92 +1615,92 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUploadFile(petId, file, additionalMetadata); - petId = validatedParameters.Item1; - file = validatedParameters.Item2; - additionalMetadata = validatedParameters.Item3; + var validatedParameterLocalVars = OnUploadFile(petId, file, additionalMetadata); + petId = validatedParameterLocalVars.Item1; + file = validatedParameterLocalVars.Item2; + additionalMetadata = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}/uploadImage"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/pet/{petId}/uploadImage"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); if (file != null) - multipartContent.Add(new StreamContent(file)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); if (file != null) + multipartContentLocalVar.Add(new StreamContent(file)); if (additionalMetadata != null) - formParams.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); + formParameterLocalVars.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "multipart/form-data" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/pet/{petId}/uploadImage", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUploadFile(apiResponse, petId, file, additionalMetadata); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUploadFile(apiResponseLocalVar, petId, file, additionalMetadata); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata); + OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilderLocalVar.Path, petId, file, additionalMetadata); throw; } } @@ -1716,12 +1716,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1735,17 +1735,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1776,11 +1776,11 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// /// - protected virtual void AfterUploadFileWithRequiredFile(ApiResponse apiResponse, System.IO.Stream requiredFile, long petId, string additionalMetadata) + protected virtual void AfterUploadFileWithRequiredFile(ApiResponse apiResponseLocalVar, System.IO.Stream requiredFile, long petId, string additionalMetadata) { } @@ -1809,92 +1809,92 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata); - requiredFile = validatedParameters.Item1; - petId = validatedParameters.Item2; - additionalMetadata = validatedParameters.Item3; + var validatedParameterLocalVars = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata); + requiredFile = validatedParameterLocalVars.Item1; + petId = validatedParameterLocalVars.Item2; + additionalMetadata = validatedParameterLocalVars.Item3; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/fake/{petId}/uploadImageWithRequiredFile"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/fake/{petId}/uploadImageWithRequiredFile"; - uriBuilder.Path = uriBuilder.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContent = new MultipartContent(); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpetId%7D", Uri.EscapeDataString(petId.ToString())); MultipartContent multipartContentLocalVar = new MultipartContent(); - request.Content = multipartContent; + httpRequestMessageLocalVar.Content = multipartContentLocalVar; - List> formParams = new List>(); + List> formParameterLocalVars = new List>(); - multipartContent.Add(new FormUrlEncodedContent(formParams)); multipartContent.Add(new StreamContent(requiredFile)); + multipartContentLocalVar.Add(new FormUrlEncodedContent(formParameterLocalVars)); multipartContentLocalVar.Add(new StreamContent(requiredFile)); if (additionalMetadata != null) - formParams.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); + formParameterLocalVars.Add(new KeyValuePair("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata))); - List tokens = new List(); + List tokenBaseLocalVars = new List(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - OAuthToken oauthToken = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); + OAuthToken oauthTokenLocalVar = (OAuthToken) await OauthTokenProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(oauthToken); + tokenBaseLocalVars.Add(oauthTokenLocalVar); - oauthToken.UseInHeader(request, ""); + oauthTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, ""); string[] contentTypes = new string[] { "multipart/form-data" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUploadFileWithRequiredFile(apiResponseLocalVar, requiredFile, petId, additionalMetadata); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata); + OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilderLocalVar.Path, requiredFile, petId, additionalMetadata); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs index 9d1b7480e80..bc1fe0d6538 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs @@ -206,12 +206,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -223,17 +223,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -259,9 +259,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterDeleteOrder(ApiResponse apiResponse, string orderId) + protected virtual void AfterDeleteOrder(ApiResponse apiResponseLocalVar, string orderId) { } @@ -286,48 +286,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { orderId = OnDeleteOrder(orderId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = new HttpMethod("DELETE"); + httpRequestMessageLocalVar.Method = new HttpMethod("DELETE"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order/{order_id}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order/{order_id}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeleteOrder(apiResponse, orderId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeleteOrder(apiResponseLocalVar, orderId); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeleteOrder(e, "/store/order/{order_id}", uriBuilder.Path, orderId); + OnErrorDeleteOrder(e, "/store/order/{order_id}", uriBuilderLocalVar.Path, orderId); throw; } } @@ -340,14 +340,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task> GetInventoryAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse> result = await GetInventoryWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse> apiResponseLocalVar = await GetInventoryWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -362,8 +362,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterGetInventory(ApiResponse> apiResponse) + /// + protected virtual void AfterGetInventory(ApiResponse> apiResponseLocalVar) { } @@ -386,66 +386,66 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task>> GetInventoryWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnGetInventory(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/inventory"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/inventory"; - List tokens = new List(); + List tokenBaseLocalVars = new List(); - ApiKeyToken apiKey = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); + ApiKeyToken apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false); - tokens.Add(apiKey); + tokenBaseLocalVars.Add(apiKeyTokenLocalVar); - apiKey.UseInHeader(request, "api_key"); + apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "api_key"); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/inventory", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/inventory", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse> apiResponse = new ApiResponse>(responseMessage, responseContent); + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize>(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetInventory(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetInventory(apiResponseLocalVar); } - else if (apiResponse.StatusCode == (HttpStatusCode) 429) - foreach(TokenBase token in tokens) - token.BeginRateLimit(); + else if (apiResponseLocalVar.StatusCode == (HttpStatusCode) 429) + foreach(TokenBase tokenBaseLocalVar in tokenBaseLocalVars) + tokenBaseLocalVar.BeginRateLimit(); - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetInventory(e, "/store/inventory", uriBuilder.Path); + OnErrorGetInventory(e, "/store/inventory", uriBuilderLocalVar.Path); throw; } } @@ -459,12 +459,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -476,17 +476,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -512,9 +512,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetOrderById(ApiResponse apiResponse, long orderId) + protected virtual void AfterGetOrderById(ApiResponse apiResponseLocalVar, long orderId) { } @@ -539,58 +539,58 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { orderId = OnGetOrderById(orderId); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order/{order_id}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Border_id%7D", Uri.EscapeDataString(orderId.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order/{order_id}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order/{order_id}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetOrderById(apiResponse, orderId); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetOrderById(apiResponseLocalVar, orderId); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetOrderById(e, "/store/order/{order_id}", uriBuilder.Path, orderId); + OnErrorGetOrderById(e, "/store/order/{order_id}", uriBuilderLocalVar.Path, orderId); throw; } } @@ -604,12 +604,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -621,17 +621,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -657,9 +657,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterPlaceOrder(ApiResponse apiResponse, Order order) + protected virtual void AfterPlaceOrder(ApiResponse apiResponseLocalVar, Order order) { } @@ -684,71 +684,71 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { order = OnPlaceOrder(order); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/store/order"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/order"; - request.Content = (order as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(order, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (order as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(order, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/store/order", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/store/order", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterPlaceOrder(apiResponse, order); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterPlaceOrder(apiResponseLocalVar, order); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorPlaceOrder(e, "/store/order", uriBuilder.Path, order); + OnErrorPlaceOrder(e, "/store/order", uriBuilderLocalVar.Path, order); throw; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs index 052ed169feb..4c6d12518f0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs @@ -306,12 +306,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -323,17 +323,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -359,9 +359,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUser(ApiResponse apiResponse, User user) + protected virtual void AfterCreateUser(ApiResponse apiResponseLocalVar, User user) { } @@ -386,61 +386,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUser(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUser(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUser(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUser(e, "/user", uriBuilder.Path, user); + OnErrorCreateUser(e, "/user", uriBuilderLocalVar.Path, user); throw; } } @@ -454,12 +454,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithArrayInputAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -471,17 +471,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithArrayInputOrDefaultAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -507,9 +507,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUsersWithArrayInput(ApiResponse apiResponse, List user) + protected virtual void AfterCreateUsersWithArrayInput(ApiResponse apiResponseLocalVar, List user) { } @@ -534,61 +534,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUsersWithArrayInputWithHttpInfoAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUsersWithArrayInput(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/createWithArray"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/createWithArray"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/createWithArray", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/createWithArray", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUsersWithArrayInput(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUsersWithArrayInput(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUsersWithArrayInput(e, "/user/createWithArray", uriBuilder.Path, user); + OnErrorCreateUsersWithArrayInput(e, "/user/createWithArray", uriBuilderLocalVar.Path, user); throw; } } @@ -602,12 +602,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithListInputAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -619,17 +619,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task CreateUsersWithListInputOrDefaultAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -655,9 +655,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterCreateUsersWithListInput(ApiResponse apiResponse, List user) + protected virtual void AfterCreateUsersWithListInput(ApiResponse apiResponseLocalVar, List user) { } @@ -682,61 +682,61 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> CreateUsersWithListInputWithHttpInfoAsync(List user, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { user = OnCreateUsersWithListInput(user); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/createWithList"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/createWithList"; - request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("POST"); + httpRequestMessageLocalVar.Method = new HttpMethod("POST"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/createWithList", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/createWithList", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterCreateUsersWithListInput(apiResponse, user); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterCreateUsersWithListInput(apiResponseLocalVar, user); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorCreateUsersWithListInput(e, "/user/createWithList", uriBuilder.Path, user); + OnErrorCreateUsersWithListInput(e, "/user/createWithList", uriBuilderLocalVar.Path, user); throw; } } @@ -750,12 +750,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -767,17 +767,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -803,9 +803,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterDeleteUser(ApiResponse apiResponse, string username) + protected virtual void AfterDeleteUser(ApiResponse apiResponseLocalVar, string username) { } @@ -830,48 +830,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { username = OnDeleteUser(username); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = new HttpMethod("DELETE"); + httpRequestMessageLocalVar.Method = new HttpMethod("DELETE"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterDeleteUser(apiResponse, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterDeleteUser(apiResponseLocalVar, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorDeleteUser(e, "/user/{username}", uriBuilder.Path, username); + OnErrorDeleteUser(e, "/user/{username}", uriBuilderLocalVar.Path, username); throw; } } @@ -885,12 +885,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -902,17 +902,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -938,9 +938,9 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// - protected virtual void AfterGetUserByName(ApiResponse apiResponse, string username) + protected virtual void AfterGetUserByName(ApiResponse apiResponseLocalVar, string username) { } @@ -965,58 +965,58 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { username = OnGetUserByName(username); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterGetUserByName(apiResponse, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterGetUserByName(apiResponseLocalVar, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorGetUserByName(e, "/user/{username}", uriBuilder.Path, username); + OnErrorGetUserByName(e, "/user/{username}", uriBuilderLocalVar.Path, username); throw; } } @@ -1031,14 +1031,14 @@ namespace Org.OpenAPITools.Api /// <> public async Task LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - if (result.Content == null) + if (apiResponseLocalVar.Content == null) #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1067,10 +1067,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterLoginUser(ApiResponse apiResponse, string username, string password) + protected virtual void AfterLoginUser(ApiResponse apiResponseLocalVar, string username, string password) { } @@ -1097,67 +1097,67 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnLoginUser(username, password); - username = validatedParameters.Item1; - password = validatedParameters.Item2; + var validatedParameterLocalVars = OnLoginUser(username, password); + username = validatedParameterLocalVars.Item1; + password = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/login"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/login"; - System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); + System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty); - parseQueryString["username"] = username.ToString(); - parseQueryString["password"] = password.ToString(); + parseQueryStringLocalVar["username"] = username.ToString(); + parseQueryStringLocalVar["password"] = password.ToString(); - uriBuilder.Query = parseQueryString.ToString(); + uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString(); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - string[] accepts = new string[] { + string[] acceptLocalVars = new string[] { "application/xml", "application/json" }; - string accept = ClientUtils.SelectHeaderAccept(accepts); + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); - if (accept != null) - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(accept)); + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/login", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/login", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterLoginUser(apiResponse, username, password); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterLoginUser(apiResponseLocalVar, username, password); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorLoginUser(e, "/user/login", uriBuilder.Path, username, password); + OnErrorLoginUser(e, "/user/login", uriBuilderLocalVar.Path, username, password); throw; } } @@ -1170,12 +1170,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task LogoutUserAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1186,17 +1186,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task LogoutUserOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await LogoutUserWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1212,8 +1212,8 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// - protected virtual void AfterLogoutUser(ApiResponse apiResponse) + /// + protected virtual void AfterLogoutUser(ApiResponse apiResponseLocalVar) { } @@ -1236,48 +1236,48 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> LogoutUserWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { OnLogoutUser(); - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/logout"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/logout"; - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; - request.Method = new HttpMethod("GET"); + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/logout", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/logout", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterLogoutUser(apiResponse); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterLogoutUser(apiResponseLocalVar); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorLogoutUser(e, "/user/logout", uriBuilder.Path); + OnErrorLogoutUser(e, "/user/logout", uriBuilderLocalVar.Path); throw; } } @@ -1292,12 +1292,12 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); + ApiResponse apiResponseLocalVar = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); - if (result.Content == null) - throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent); + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return result.Content; + return apiResponseLocalVar.Content; } /// @@ -1310,17 +1310,17 @@ namespace Org.OpenAPITools.Api /// <> public async Task UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - ApiResponse result = null; + ApiResponse apiResponseLocalVar = null; try { - result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); + apiResponseLocalVar = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false); } catch (Exception) { } - return result != null && result.IsSuccessStatusCode - ? result.Content + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content : null; } @@ -1350,10 +1350,10 @@ namespace Org.OpenAPITools.Api /// /// Processes the server response /// - /// + /// /// /// - protected virtual void AfterUpdateUser(ApiResponse apiResponse, User user, string username) + protected virtual void AfterUpdateUser(ApiResponse apiResponseLocalVar, User user, string username) { } @@ -1380,63 +1380,63 @@ namespace Org.OpenAPITools.Api /// <> where T : public async Task> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null) { - UriBuilder uriBuilder = new UriBuilder(); + UriBuilder uriBuilderLocalVar = new UriBuilder(); try { - var validatedParameters = OnUpdateUser(user, username); - user = validatedParameters.Item1; - username = validatedParameters.Item2; + var validatedParameterLocalVars = OnUpdateUser(user, username); + user = validatedParameterLocalVars.Item1; + username = validatedParameterLocalVars.Item2; - using (HttpRequestMessage request = new HttpRequestMessage()) + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) { - uriBuilder.Host = HttpClient.BaseAddress.Host; - uriBuilder.Port = HttpClient.BaseAddress.Port; - uriBuilder.Scheme = HttpClient.BaseAddress.Scheme; - uriBuilder.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/user/{username}"; - uriBuilder.Path = uriBuilder.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); request.Content = (user as object) is System.IO.Stream stream - ? request.Content = new StreamContent(stream) - : request.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); + uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Busername%7D", Uri.EscapeDataString(username.ToString())); httpRequestMessageLocalVar.Content = (user as object) is System.IO.Stream stream + ? httpRequestMessageLocalVar.Content = new StreamContent(stream) + : httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(user, _jsonSerializerOptions)); - request.RequestUri = uriBuilder.Uri; + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; string[] contentTypes = new string[] { "application/json" }; - string contentType = ClientUtils.SelectHeaderContentType(contentTypes); + string contentTypeLocalVar = ClientUtils.SelectHeaderContentType(contentTypes); - if (contentType != null) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(contentType); + if (contentTypeLocalVar != null) + httpRequestMessageLocalVar.Content.Headers.ContentType = new MediaTypeHeaderValue(contentTypeLocalVar); - request.Method = new HttpMethod("PUT"); + httpRequestMessageLocalVar.Method = new HttpMethod("PUT"); - DateTime requestedAt = DateTime.UtcNow; + DateTime requestedAtLocalVar = DateTime.UtcNow; - using (HttpResponseMessage responseMessage = await HttpClient.SendAsync(request, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) { - OnApiResponded(new ApiResponseEventArgs(requestedAt, DateTime.UtcNow, responseMessage.StatusCode, "/user/{username}", uriBuilder.Path)); + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/user/{username}", uriBuilderLocalVar.Path)); - string responseContent = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - ApiResponse apiResponse = new ApiResponse(responseMessage, responseContent); + ApiResponse apiResponseLocalVar = new ApiResponse(httpResponseMessageLocalVar, responseContentLocalVar); - if (apiResponse.IsSuccessStatusCode) + if (apiResponseLocalVar.IsSuccessStatusCode) { - apiResponse.Content = JsonSerializer.Deserialize(apiResponse.RawContent, _jsonSerializerOptions); - AfterUpdateUser(apiResponse, user, username); + apiResponseLocalVar.Content = JsonSerializer.Deserialize(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterUpdateUser(apiResponseLocalVar, user, username); } - return apiResponse; + return apiResponseLocalVar; } } } catch(Exception e) { - OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username); + OnErrorUpdateUser(e, "/user/{username}", uriBuilderLocalVar.Path, user, username); throw; } } From 1268b5135d3a0e469e9e135533cd58ff87cb1681 Mon Sep 17 00:00:00 2001 From: Jason D'Amour Date: Tue, 14 Mar 2023 23:46:05 -0700 Subject: [PATCH 050/131] Enable bearer security schema for Go client (#14957) --- .../java/org/openapitools/codegen/languages/GoClientCodegen.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java index c9f45740d3a..ad4aa914a21 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java @@ -71,6 +71,7 @@ public class GoClientCodegen extends AbstractGoCodegen { .wireFormatFeatures(EnumSet.of(WireFormatFeature.JSON, WireFormatFeature.XML)) .securityFeatures(EnumSet.of( SecurityFeature.BasicAuth, + SecurityFeature.BearerToken, SecurityFeature.ApiKey, SecurityFeature.OAuth2_Implicit )) From 5eb2819744b5a25dc91b4700c627ebf54a01df16 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 15 Mar 2023 15:11:35 +0800 Subject: [PATCH 051/131] update go doc --- docs/generators/go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/generators/go.md b/docs/generators/go.md index f99ca5e9fbf..3295fc5413f 100644 --- a/docs/generators/go.md +++ b/docs/generators/go.md @@ -218,7 +218,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |BasicAuth|✓|OAS2,OAS3 |ApiKey|✓|OAS2,OAS3 |OpenIDConnect|✗|OAS3 -|BearerToken|✗|OAS3 +|BearerToken|✓|OAS3 |OAuth2_Implicit|✓|OAS2,OAS3 |OAuth2_Password|✗|OAS2,OAS3 |OAuth2_ClientCredentials|✗|OAS2,OAS3 From 5c4529259f5fded5f12885dc3c9c1ba33565975f Mon Sep 17 00:00:00 2001 From: Peter Lamby Date: Wed, 15 Mar 2023 09:47:34 +0100 Subject: [PATCH 052/131] [BUG][typescript-fetch] wrong response for simple types (#14659) See #9364 See #2870 --- .../resources/typescript-fetch/apis.mustache | 6 +++++- .../typescript-fetch/runtime.mustache | 18 ++++++++++++++++++ .../builds/allOf-nullable/runtime.ts | 18 ++++++++++++++++++ .../builds/allOf-readonly/runtime.ts | 18 ++++++++++++++++++ .../builds/default-v3.0/apis/FakeApi.ts | 18 +++++++++++++++--- .../builds/default-v3.0/apis/UserApi.ts | 6 +++++- .../builds/default-v3.0/runtime.ts | 18 ++++++++++++++++++ .../builds/default/apis/UserApi.ts | 6 +++++- .../typescript-fetch/builds/default/runtime.ts | 18 ++++++++++++++++++ .../typescript-fetch/builds/enum/runtime.ts | 18 ++++++++++++++++++ .../builds/es6-target/src/apis/UserApi.ts | 6 +++++- .../builds/es6-target/src/runtime.ts | 18 ++++++++++++++++++ .../builds/multiple-parameters/apis/UserApi.ts | 6 +++++- .../builds/multiple-parameters/runtime.ts | 18 ++++++++++++++++++ .../src/apis/UserApi.ts | 6 +++++- .../prefix-parameter-interfaces/src/runtime.ts | 18 ++++++++++++++++++ .../sagas-and-records/src/apis/UserApi.ts | 6 +++++- .../builds/sagas-and-records/src/runtime.ts | 18 ++++++++++++++++++ .../builds/with-interfaces/apis/UserApi.ts | 6 +++++- .../builds/with-interfaces/runtime.ts | 18 ++++++++++++++++++ .../with-npm-version/src/apis/UserApi.ts | 6 +++++- .../builds/with-npm-version/src/runtime.ts | 18 ++++++++++++++++++ .../builds/with-string-enums/runtime.ts | 18 ++++++++++++++++++ .../without-runtime-checks/src/apis/UserApi.ts | 6 +++++- .../without-runtime-checks/src/runtime.ts | 18 ++++++++++++++++++ 25 files changed, 317 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 24edd4d6ade..000e1af3266 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -306,7 +306,11 @@ export class {{classname}} extends runtime.BaseAPI { return new runtime.JSONApiResponse(response); {{/isArray}} {{#returnSimpleType}} - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse<{{returnType}}>(response); + } else { + return new runtime.TextApiResponse(response) as any; + } {{/returnSimpleType}} {{/returnTypeIsPrimitive}} {{^returnTypeIsPrimitive}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index fb105057e34..58f8adabaea 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -80,6 +80,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -102,6 +103,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/runtime.ts b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/runtime.ts index 18b2f64813e..c8c0c413a2b 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts index 18b2f64813e..c8c0c413a2b 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts index f02d35b1039..a34da5fccb9 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts @@ -232,7 +232,11 @@ export class FakeApi extends runtime.BaseAPI { body: requestParameters.body as any, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** @@ -290,7 +294,11 @@ export class FakeApi extends runtime.BaseAPI { body: requestParameters.body as any, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** @@ -319,7 +327,11 @@ export class FakeApi extends runtime.BaseAPI { body: requestParameters.body as any, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts index 5598e0818b1..fa437d76cba 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts @@ -254,7 +254,11 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts index 85e8df80b70..e46e834fc01 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index d0341bba887..cf07b17e74a 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -247,7 +247,11 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 353b30125b0..a1fe7aa98dd 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts index 65f8058af3a..8ec41ab00fa 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts index d0341bba887..cf07b17e74a 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts @@ -247,7 +247,11 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts index 353b30125b0..a1fe7aa98dd 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts index 158ea10d595..c4e068f2fb0 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts @@ -247,7 +247,11 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts index 353b30125b0..a1fe7aa98dd 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts index a2cb05f96ca..6c66a4223b7 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts @@ -247,7 +247,11 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts index 353b30125b0..a1fe7aa98dd 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts index 9f3b847e02a..01878bc490b 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts @@ -250,7 +250,11 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts index 353b30125b0..a1fe7aa98dd 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index 986bc1afedc..986cd8cc6df 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -380,7 +380,11 @@ export class UserApi extends runtime.BaseAPI implements UserApiInterface { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 353b30125b0..a1fe7aa98dd 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts index d0341bba887..cf07b17e74a 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts @@ -247,7 +247,11 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts index 353b30125b0..a1fe7aa98dd 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts index 65f8058af3a..8ec41ab00fa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts index 7a0175aec1e..b9f6ec2db67 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts @@ -243,7 +243,11 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.TextApiResponse(response) as any; + if (this.isJsonMime(response.headers.get('content-type'))) { + return new runtime.JSONApiResponse(response); + } else { + return new runtime.TextApiResponse(response) as any; + } } /** diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts index 3dfb66ac7be..4d355ad4aa2 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts @@ -91,6 +91,7 @@ export const DefaultConfig = new Configuration(); */ export class BaseAPI { + private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private middleware: Middleware[]; constructor(protected configuration = DefaultConfig) { @@ -113,6 +114,23 @@ export class BaseAPI { return this.withMiddleware(...middlewares); } + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * application/vnd.company+json + * @param mime - MIME (Multipurpose Internet Mail Extensions) + * @return True if the given MIME is JSON, false otherwise. + */ + protected isJsonMime(mime: string | null | undefined): boolean { + if (!mime) { + return false; + } + return BaseAPI.jsonRegex.test(mime); + } + protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise { const { url, init } = await this.createFetchParams(context, initOverrides); const response = await this.fetchApi(url, init); From b6ccf078ef17a158139396bffcaa5ebc5164f5d9 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Wed, 15 Mar 2023 20:59:12 -0400 Subject: [PATCH 053/131] fixed nrt bug (#14973) --- .../libraries/generichost/api.mustache | 2 +- ...odels-for-testing-with-http-signature.yaml | 15 ++ .../README.md | 1 + .../docs/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 170 ++++++++++++++++++ .../docs/apis/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 161 +++++++++++++++++ .../docs/apis/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 131 ++++++++++++++ .../docs/apis/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 131 ++++++++++++++ .../OpenAPIClient-httpclient/README.md | 1 + .../docs/DefaultApi.md | 91 ++++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 141 +++++++++++++++ .../OpenAPIClient-net47/README.md | 1 + .../OpenAPIClient-net47/docs/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 170 ++++++++++++++++++ .../OpenAPIClient-net48/README.md | 1 + .../OpenAPIClient-net48/docs/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 170 ++++++++++++++++++ .../OpenAPIClient-net5.0/README.md | 1 + .../OpenAPIClient-net5.0/docs/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 170 ++++++++++++++++++ .../OpenAPIClient-unityWebRequest/README.md | 1 + .../docs/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 152 ++++++++++++++++ .../csharp-netcore/OpenAPIClient/README.md | 1 + .../OpenAPIClient/docs/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 170 ++++++++++++++++++ .../OpenAPIClientCore/README.md | 1 + .../OpenAPIClientCore/docs/DefaultApi.md | 87 +++++++++ .../src/Org.OpenAPITools/Api/DefaultApi.cs | 170 ++++++++++++++++++ 32 files changed, 2721 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache index f7e0b402f1a..76f13d93240 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache @@ -167,7 +167,7 @@ namespace {{packageName}}.{{apiPackage}} #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'{{/returnTypeIsPrimitive}}{{/nrt}} throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); - return apiResponseLocalVar.Content{{#nrt}}{{#returnProperty}}{{#isPrimitiveType}}{{^isMap}}{{^isString}}.Value{{/isString}}{{/isMap}}{{/isPrimitiveType}}{{/returnProperty}}{{/nrt}}; + return apiResponseLocalVar.Content{{#nrt}}{{#returnProperty}}{{#isPrimitiveType}}{{^isMap}}{{^isString}}{{^isContainer}}.Value{{/isContainer}}{{/isString}}{{/isMap}}{{/isPrimitiveType}}{{/returnProperty}}{{/nrt}}; } {{#nrt}} diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index bfb50150a6f..289c9719314 100644 --- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -17,6 +17,21 @@ tags: - name: user description: Operations about user paths: + /hello: + get: + summary: Hello + description: Hello + operationId: Hello + responses: + '200': + description: UUIDs + content: + application/json: + schema: + type: array + items: + type: string + format: uuid /foo: get: responses: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md index 46d61ab2f54..439e572e13f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md @@ -106,6 +106,7 @@ Class | Method | HTTP request | Description *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | *DefaultApi* | [**GetCountry**](docs/DefaultApi.md#getcountry) | **POST** /country | +*DefaultApi* | [**Hello**](docs/DefaultApi.md#hello) | **GET** /hello | Hello *FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md index 265fec1a6f9..72d1733f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs index 0ae306612df..1b487bc9248 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -65,6 +65,27 @@ namespace Org.OpenAPITools.Api /// Index associated with the operation. /// ApiResponse of Object(void) ApiResponse GetCountryWithHttpInfo(string country, int operationIndex = 0); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + List Hello(int operationIndex = 0); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + ApiResponse> HelloWithHttpInfo(int operationIndex = 0); #endregion Synchronous Operations } @@ -122,6 +143,29 @@ namespace Org.OpenAPITools.Api /// Cancellation Token to cancel the request. /// Task of ApiResponse System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); #endregion Asynchronous Operations } @@ -510,5 +554,131 @@ namespace Org.OpenAPITools.Api return localVarResponse; } + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + public List Hello(int operationIndex = 0) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = HelloWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + public Org.OpenAPITools.Client.ApiResponse> HelloWithHttpInfo(int operationIndex = 0) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/hello", localVarRequestOptions, this.Configuration); + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + public async System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await HelloWithHttpInfoAsync(operationIndex, cancellationToken).ConfigureAwait(false); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + public async System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = await this.AsynchronousClient.GetAsync>("/hello", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md index 82d8c6cb2c7..fe3740c7b6e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs index 3b7f537d72e..656a95f7ea2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -95,6 +95,38 @@ namespace Org.OpenAPITools.IApi /// Cancellation Token to cancel the request. /// Task of ApiResponse<object?> Task GetCountryOrDefaultAsync(string country, System.Threading.CancellationToken? cancellationToken = null); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task<ApiResponse<List<Guid>?>> + Task?>> HelloWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse<List<Guid>> + Task> HelloAsync(System.Threading.CancellationToken? cancellationToken = null); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Cancellation Token to cancel the request. + /// Task of ApiResponse<List<Guid>?> + Task?> HelloOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null); } } @@ -454,5 +486,134 @@ namespace Org.OpenAPITools.Api throw; } } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// <> + public async Task> HelloAsync(System.Threading.CancellationToken? cancellationToken = null) + { + ApiResponse?> apiResponseLocalVar = await HelloWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + + if (apiResponseLocalVar.Content == null) + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); + + return apiResponseLocalVar.Content; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// <> + public async Task?> HelloOrDefaultAsync(System.Threading.CancellationToken? cancellationToken = null) + { + ApiResponse?>? apiResponseLocalVar = null; + try + { + apiResponseLocalVar = await HelloWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + } + catch (Exception) + { + } + + return apiResponseLocalVar != null && apiResponseLocalVar.IsSuccessStatusCode + ? apiResponseLocalVar.Content + : null; + } + + /// + /// Validates the request parameters + /// + /// + protected virtual void OnHello() + { + return; + } + + /// + /// Processes the server response + /// + /// + protected virtual void AfterHello(ApiResponse?> apiResponseLocalVar) + { + } + + /// + /// Processes the server response + /// + /// + /// + /// + protected virtual void OnErrorHello(Exception exception, string pathFormat, string path) + { + Logger.LogError(exception, "An error occurred while sending the request to the server."); + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// <> where T : + public async Task?>> HelloWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) + { + UriBuilder uriBuilderLocalVar = new UriBuilder(); + + try + { + OnHello(); + + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) + { + uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/hello"; + + + + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; + + string[] acceptLocalVars = new string[] { + "application/json" + }; + + string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); + + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); + + httpRequestMessageLocalVar.Method = HttpMethod.Get; + + DateTime requestedAtLocalVar = DateTime.UtcNow; + + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + { + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/hello", uriBuilderLocalVar.Path)); + + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + + ApiResponse?> apiResponseLocalVar = new ApiResponse?>(httpResponseMessageLocalVar, responseContentLocalVar); + + if (apiResponseLocalVar.IsSuccessStatusCode) + { + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterHello(apiResponseLocalVar); + } + + return apiResponseLocalVar; + } + } + } + catch(Exception e) + { + OnErrorHello(e, "/hello", uriBuilderLocalVar.Path); + throw; + } + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md index 82d8c6cb2c7..fe3740c7b6e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs index d8ebe474c5c..df868bb4bab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -72,6 +72,28 @@ namespace Org.OpenAPITools.IApi /// Cancellation Token to cancel the request. /// Task of ApiResponse<object> Task GetCountryAsync(string country, System.Threading.CancellationToken? cancellationToken = null); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task<ApiResponse<List<Guid>>> + Task>> HelloWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse<List<Guid>> + Task> HelloAsync(System.Threading.CancellationToken? cancellationToken = null); } } @@ -431,5 +453,114 @@ namespace Org.OpenAPITools.Api throw; } } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// <> + public async Task> HelloAsync(System.Threading.CancellationToken? cancellationToken = null) + { + ApiResponse> apiResponseLocalVar = await HelloWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + + #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (apiResponseLocalVar.Content == null) + #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); + + return apiResponseLocalVar.Content; + } + + /// + /// Validates the request parameters + /// + /// + protected virtual void OnHello() + { + return; + } + + /// + /// Processes the server response + /// + /// + protected virtual void AfterHello(ApiResponse> apiResponseLocalVar) + { + } + + /// + /// Processes the server response + /// + /// + /// + /// + protected virtual void OnErrorHello(Exception exception, string pathFormat, string path) + { + Logger.LogError(exception, "An error occurred while sending the request to the server."); + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// <> where T : + public async Task>> HelloWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) + { + UriBuilder uriBuilderLocalVar = new UriBuilder(); + + try + { + OnHello(); + + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) + { + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/hello"; + + + + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; + + string[] acceptLocalVars = new string[] { + "application/json" + }; + + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); + + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); + + httpRequestMessageLocalVar.Method = HttpMethod.Get; + + DateTime requestedAtLocalVar = DateTime.UtcNow; + + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + { + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/hello", uriBuilderLocalVar.Path)); + + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken.GetValueOrDefault()).ConfigureAwait(false); + + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); + + if (apiResponseLocalVar.IsSuccessStatusCode) + { + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterHello(apiResponseLocalVar); + } + + return apiResponseLocalVar; + } + } + } + catch(Exception e) + { + OnErrorHello(e, "/hello", uriBuilderLocalVar.Path); + throw; + } + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md index 82d8c6cb2c7..fe3740c7b6e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs index c736d802911..6382b3fb327 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -72,6 +72,28 @@ namespace Org.OpenAPITools.IApi /// Cancellation Token to cancel the request. /// Task of ApiResponse<object> Task GetCountryAsync(string country, System.Threading.CancellationToken? cancellationToken = null); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task<ApiResponse<List<Guid>>> + Task>> HelloWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse<List<Guid>> + Task> HelloAsync(System.Threading.CancellationToken? cancellationToken = null); } } @@ -431,5 +453,114 @@ namespace Org.OpenAPITools.Api throw; } } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// <> + public async Task> HelloAsync(System.Threading.CancellationToken? cancellationToken = null) + { + ApiResponse> apiResponseLocalVar = await HelloWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + + #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (apiResponseLocalVar.Content == null) + #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' + throw new ApiException(apiResponseLocalVar.ReasonPhrase, apiResponseLocalVar.StatusCode, apiResponseLocalVar.RawContent); + + return apiResponseLocalVar.Content; + } + + /// + /// Validates the request parameters + /// + /// + protected virtual void OnHello() + { + return; + } + + /// + /// Processes the server response + /// + /// + protected virtual void AfterHello(ApiResponse> apiResponseLocalVar) + { + } + + /// + /// Processes the server response + /// + /// + /// + /// + protected virtual void OnErrorHello(Exception exception, string pathFormat, string path) + { + Logger.LogError(exception, "An error occurred while sending the request to the server."); + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// <> where T : + public async Task>> HelloWithHttpInfoAsync(System.Threading.CancellationToken? cancellationToken = null) + { + UriBuilder uriBuilderLocalVar = new UriBuilder(); + + try + { + OnHello(); + + using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage()) + { + uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host; + uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port; + uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme; + uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/hello"; + + + + httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri; + + string[] acceptLocalVars = new string[] { + "application/json" + }; + + string acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars); + + if (acceptLocalVar != null) + httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar)); + + httpRequestMessageLocalVar.Method = new HttpMethod("GET"); + + DateTime requestedAtLocalVar = DateTime.UtcNow; + + using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken.GetValueOrDefault()).ConfigureAwait(false)) + { + OnApiResponded(new ApiResponseEventArgs(requestedAtLocalVar, DateTime.UtcNow, httpResponseMessageLocalVar.StatusCode, "/hello", uriBuilderLocalVar.Path)); + + string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); + + ApiResponse> apiResponseLocalVar = new ApiResponse>(httpResponseMessageLocalVar, responseContentLocalVar); + + if (apiResponseLocalVar.IsSuccessStatusCode) + { + apiResponseLocalVar.Content = JsonSerializer.Deserialize>(apiResponseLocalVar.RawContent, _jsonSerializerOptions); + AfterHello(apiResponseLocalVar); + } + + return apiResponseLocalVar; + } + } + } + catch(Exception e) + { + OnErrorHello(e, "/hello", uriBuilderLocalVar.Path); + throw; + } + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md index 15085d15425..12dad0efc22 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md @@ -131,6 +131,7 @@ Class | Method | HTTP request | Description *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | *DefaultApi* | [**GetCountry**](docs/DefaultApi.md#getcountry) | **POST** /country | +*DefaultApi* | [**Hello**](docs/DefaultApi.md#hello) | **GET** /hello | Hello *FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md index 3733b7c3ff9..7a5790f4abf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -180,3 +181,93 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using System.Net.Http; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + // create instances of HttpClient, HttpClientHandler to be reused later with different Api classes + HttpClient httpClient = new HttpClient(); + HttpClientHandler httpClientHandler = new HttpClientHandler(); + var apiInstance = new DefaultApi(httpClient, config, httpClientHandler); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs index 083dc76c26d..a6f788ddcb2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -61,6 +61,25 @@ namespace Org.OpenAPITools.Api /// /// ApiResponse of Object(void) ApiResponse GetCountryWithHttpInfo(string country); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// List<Guid> + List Hello(); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// ApiResponse of List<Guid> + ApiResponse> HelloWithHttpInfo(); #endregion Synchronous Operations } @@ -114,6 +133,27 @@ namespace Org.OpenAPITools.Api /// Cancellation Token to cancel the request. /// Task of ApiResponse System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + System.Threading.Tasks.Task> HelloAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); #endregion Asynchronous Operations } @@ -541,5 +581,106 @@ namespace Org.OpenAPITools.Api return localVarResponse; } + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// List<Guid> + public List Hello() + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = HelloWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// ApiResponse of List<Guid> + public Org.OpenAPITools.Client.ApiResponse> HelloWithHttpInfo() + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/hello", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + public async System.Threading.Tasks.Task> HelloAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await HelloWithHttpInfoAsync(cancellationToken).ConfigureAwait(false); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + public async System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + + var localVarResponse = await this.AsynchronousClient.GetAsync>("/hello", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md index 5dae7e02093..8c3ed02c372 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md @@ -118,6 +118,7 @@ Class | Method | HTTP request | Description *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | *DefaultApi* | [**GetCountry**](docs/DefaultApi.md#getcountry) | **POST** /country | +*DefaultApi* | [**Hello**](docs/DefaultApi.md#hello) | **GET** /hello | Hello *FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md index 265fec1a6f9..72d1733f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs index 0ae306612df..1b487bc9248 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -65,6 +65,27 @@ namespace Org.OpenAPITools.Api /// Index associated with the operation. /// ApiResponse of Object(void) ApiResponse GetCountryWithHttpInfo(string country, int operationIndex = 0); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + List Hello(int operationIndex = 0); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + ApiResponse> HelloWithHttpInfo(int operationIndex = 0); #endregion Synchronous Operations } @@ -122,6 +143,29 @@ namespace Org.OpenAPITools.Api /// Cancellation Token to cancel the request. /// Task of ApiResponse System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); #endregion Asynchronous Operations } @@ -510,5 +554,131 @@ namespace Org.OpenAPITools.Api return localVarResponse; } + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + public List Hello(int operationIndex = 0) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = HelloWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + public Org.OpenAPITools.Client.ApiResponse> HelloWithHttpInfo(int operationIndex = 0) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/hello", localVarRequestOptions, this.Configuration); + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + public async System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await HelloWithHttpInfoAsync(operationIndex, cancellationToken).ConfigureAwait(false); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + public async System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = await this.AsynchronousClient.GetAsync>("/hello", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md index 5dae7e02093..8c3ed02c372 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md @@ -118,6 +118,7 @@ Class | Method | HTTP request | Description *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | *DefaultApi* | [**GetCountry**](docs/DefaultApi.md#getcountry) | **POST** /country | +*DefaultApi* | [**Hello**](docs/DefaultApi.md#hello) | **GET** /hello | Hello *FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DefaultApi.md index 265fec1a6f9..72d1733f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs index 0ae306612df..1b487bc9248 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -65,6 +65,27 @@ namespace Org.OpenAPITools.Api /// Index associated with the operation. /// ApiResponse of Object(void) ApiResponse GetCountryWithHttpInfo(string country, int operationIndex = 0); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + List Hello(int operationIndex = 0); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + ApiResponse> HelloWithHttpInfo(int operationIndex = 0); #endregion Synchronous Operations } @@ -122,6 +143,29 @@ namespace Org.OpenAPITools.Api /// Cancellation Token to cancel the request. /// Task of ApiResponse System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); #endregion Asynchronous Operations } @@ -510,5 +554,131 @@ namespace Org.OpenAPITools.Api return localVarResponse; } + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + public List Hello(int operationIndex = 0) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = HelloWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + public Org.OpenAPITools.Client.ApiResponse> HelloWithHttpInfo(int operationIndex = 0) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/hello", localVarRequestOptions, this.Configuration); + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + public async System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await HelloWithHttpInfoAsync(operationIndex, cancellationToken).ConfigureAwait(false); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + public async System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = await this.AsynchronousClient.GetAsync>("/hello", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md index 5dae7e02093..8c3ed02c372 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md @@ -118,6 +118,7 @@ Class | Method | HTTP request | Description *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | *DefaultApi* | [**GetCountry**](docs/DefaultApi.md#getcountry) | **POST** /country | +*DefaultApi* | [**Hello**](docs/DefaultApi.md#hello) | **GET** /hello | Hello *FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md index 265fec1a6f9..72d1733f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs index 0ae306612df..1b487bc9248 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -65,6 +65,27 @@ namespace Org.OpenAPITools.Api /// Index associated with the operation. /// ApiResponse of Object(void) ApiResponse GetCountryWithHttpInfo(string country, int operationIndex = 0); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + List Hello(int operationIndex = 0); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + ApiResponse> HelloWithHttpInfo(int operationIndex = 0); #endregion Synchronous Operations } @@ -122,6 +143,29 @@ namespace Org.OpenAPITools.Api /// Cancellation Token to cancel the request. /// Task of ApiResponse System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); #endregion Asynchronous Operations } @@ -510,5 +554,131 @@ namespace Org.OpenAPITools.Api return localVarResponse; } + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + public List Hello(int operationIndex = 0) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = HelloWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + public Org.OpenAPITools.Client.ApiResponse> HelloWithHttpInfo(int operationIndex = 0) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/hello", localVarRequestOptions, this.Configuration); + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + public async System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await HelloWithHttpInfoAsync(operationIndex, cancellationToken).ConfigureAwait(false); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + public async System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = await this.AsynchronousClient.GetAsync>("/hello", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md index 1f3950ee5b0..c040309f5a2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md @@ -92,6 +92,7 @@ Class | Method | HTTP request | Description *AnotherFakeApi* | [**Call123TestSpecialTags**](AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | *DefaultApi* | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | +*DefaultApi* | [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello *FakeApi* | [**FakeHealthGet**](FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint *FakeApi* | [**FakeOuterBooleanSerialize**](FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeApi* | [**FakeOuterCompositeSerialize**](FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md index 265fec1a6f9..72d1733f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs index 6b7114a739b..f9182ee8f45 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -60,6 +60,25 @@ namespace Org.OpenAPITools.Api /// /// ApiResponse of Object(void) ApiResponse GetCountryWithHttpInfo(string country); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// List<Guid> + List Hello(); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// ApiResponse of List<Guid> + ApiResponse> HelloWithHttpInfo(); #endregion Synchronous Operations } @@ -113,6 +132,27 @@ namespace Org.OpenAPITools.Api /// Cancellation Token to cancel the request. /// Task of ApiResponse System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + System.Threading.Tasks.Task> HelloAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); #endregion Asynchronous Operations } @@ -493,5 +533,117 @@ namespace Org.OpenAPITools.Api return localVarResponse; } + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// List<Guid> + public List Hello() + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = HelloWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// ApiResponse of List<Guid> + public Org.OpenAPITools.Client.ApiResponse> HelloWithHttpInfo() + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/hello", localVarRequestOptions, this.Configuration); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + public async System.Threading.Tasks.Task> HelloAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + var task = HelloWithHttpInfoAsync(cancellationToken); +#if UNITY_EDITOR || !UNITY_WEBGL + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task.ConfigureAwait(false); +#else + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await task; +#endif + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + public async System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + + + + // make the HTTP request + + var task = this.AsynchronousClient.GetAsync>("/hello", localVarRequestOptions, this.Configuration, cancellationToken); + +#if UNITY_EDITOR || !UNITY_WEBGL + var localVarResponse = await task.ConfigureAwait(false); +#else + var localVarResponse = await task; +#endif + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) throw _exception; + } + + return localVarResponse; + } + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md index 46d61ab2f54..439e572e13f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md @@ -106,6 +106,7 @@ Class | Method | HTTP request | Description *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | *DefaultApi* | [**GetCountry**](docs/DefaultApi.md#getcountry) | **POST** /country | +*DefaultApi* | [**Hello**](docs/DefaultApi.md#hello) | **GET** /hello | Hello *FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md index 265fec1a6f9..72d1733f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs index 0ae306612df..1b487bc9248 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -65,6 +65,27 @@ namespace Org.OpenAPITools.Api /// Index associated with the operation. /// ApiResponse of Object(void) ApiResponse GetCountryWithHttpInfo(string country, int operationIndex = 0); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + List Hello(int operationIndex = 0); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + ApiResponse> HelloWithHttpInfo(int operationIndex = 0); #endregion Synchronous Operations } @@ -122,6 +143,29 @@ namespace Org.OpenAPITools.Api /// Cancellation Token to cancel the request. /// Task of ApiResponse System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); #endregion Asynchronous Operations } @@ -510,5 +554,131 @@ namespace Org.OpenAPITools.Api return localVarResponse; } + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + public List Hello(int operationIndex = 0) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = HelloWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + public Org.OpenAPITools.Client.ApiResponse> HelloWithHttpInfo(int operationIndex = 0) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/hello", localVarRequestOptions, this.Configuration); + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + public async System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await HelloWithHttpInfoAsync(operationIndex, cancellationToken).ConfigureAwait(false); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + public async System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = await this.AsynchronousClient.GetAsync>("/hello", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md index 5dae7e02093..8c3ed02c372 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md @@ -118,6 +118,7 @@ Class | Method | HTTP request | Description *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | *DefaultApi* | [**GetCountry**](docs/DefaultApi.md#getcountry) | **POST** /country | +*DefaultApi* | [**Hello**](docs/DefaultApi.md#hello) | **GET** /hello | Hello *FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md index 265fec1a6f9..72d1733f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md @@ -6,6 +6,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* |--------|--------------|-------------| | [**FooGet**](DefaultApi.md#fooget) | **GET** /foo | | | [**GetCountry**](DefaultApi.md#getcountry) | **POST** /country | | +| [**Hello**](DefaultApi.md#hello) | **GET** /hello | Hello | # **FooGet** @@ -172,3 +173,89 @@ 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) + +# **Hello** +> List<Guid> Hello () + +Hello + +Hello + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class HelloExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new DefaultApi(config); + + try + { + // Hello + List result = apiInstance.Hello(); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling DefaultApi.Hello: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the HelloWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Hello + ApiResponse> response = apiInstance.HelloWithHttpInfo(); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling DefaultApi.HelloWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters +This endpoint does not need any parameter. +### Return type + +**List** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | UUIDs | - | + +[[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/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs index 0ae306612df..1b487bc9248 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -65,6 +65,27 @@ namespace Org.OpenAPITools.Api /// Index associated with the operation. /// ApiResponse of Object(void) ApiResponse GetCountryWithHttpInfo(string country, int operationIndex = 0); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + List Hello(int operationIndex = 0); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + ApiResponse> HelloWithHttpInfo(int operationIndex = 0); #endregion Synchronous Operations } @@ -122,6 +143,29 @@ namespace Org.OpenAPITools.Api /// Cancellation Token to cancel the request. /// Task of ApiResponse System.Threading.Tasks.Task> GetCountryWithHttpInfoAsync(string country, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + + /// + /// Hello + /// + /// + /// Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); #endregion Asynchronous Operations } @@ -510,5 +554,131 @@ namespace Org.OpenAPITools.Api return localVarResponse; } + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// List<Guid> + public List Hello(int operationIndex = 0) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = HelloWithHttpInfo(); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// ApiResponse of List<Guid> + public Org.OpenAPITools.Client.ApiResponse> HelloWithHttpInfo(int operationIndex = 0) + { + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = this.Client.Get>("/hello", localVarRequestOptions, this.Configuration); + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of List<Guid> + public async System.Threading.Tasks.Task> HelloAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + Org.OpenAPITools.Client.ApiResponse> localVarResponse = await HelloWithHttpInfoAsync(operationIndex, cancellationToken).ConfigureAwait(false); + return localVarResponse.Data; + } + + /// + /// Hello Hello + /// + /// Thrown when fails to make API call + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (List<Guid>) + public async System.Threading.Tasks.Task>> HelloWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + { + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + + localVarRequestOptions.Operation = "DefaultApi.Hello"; + localVarRequestOptions.OperationIndex = operationIndex; + + + // make the HTTP request + var localVarResponse = await this.AsynchronousClient.GetAsync>("/hello", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("Hello", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + } } From 9787388f77c4b9a4f915a0103101658c044ed9fb Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Thu, 16 Mar 2023 04:49:21 -0400 Subject: [PATCH 054/131] removed TryGet from deserialization methods (#14974) --- .../generichost/JsonConverter.mustache | 36 ++++--------------- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 15 ++------ .../src/Org.OpenAPITools/Model/FormatTest.cs | 21 +++++------ ...dPropertiesAndAdditionalPropertiesClass.cs | 4 +-- .../Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/Name.cs | 6 ++-- .../Org.OpenAPITools/Model/NullableClass.cs | 10 ++---- .../Model/NullableGuidClass.cs | 5 +-- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../Model/ObjectWithDeprecatedFields.cs | 2 +- .../src/Org.OpenAPITools/Model/Order.cs | 6 ++-- .../Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/Return.cs | 2 +- .../Model/SpecialModelName.cs | 2 +- .../src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../src/Org.OpenAPITools/Model/User.cs | 4 +-- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 15 ++------ .../src/Org.OpenAPITools/Model/FormatTest.cs | 21 +++++------ ...dPropertiesAndAdditionalPropertiesClass.cs | 4 +-- .../Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/Name.cs | 6 ++-- .../Org.OpenAPITools/Model/NullableClass.cs | 10 ++---- .../Model/NullableGuidClass.cs | 5 +-- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../Model/ObjectWithDeprecatedFields.cs | 2 +- .../src/Org.OpenAPITools/Model/Order.cs | 6 ++-- .../Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/Return.cs | 2 +- .../Model/SpecialModelName.cs | 2 +- .../src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../src/Org.OpenAPITools/Model/User.cs | 4 +-- .../src/Org.OpenAPITools/Model/ChildAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 15 ++------ .../src/Org.OpenAPITools/Model/FormatTest.cs | 21 +++++------ ...dPropertiesAndAdditionalPropertiesClass.cs | 4 +-- .../Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/Name.cs | 6 ++-- .../Org.OpenAPITools/Model/NullableClass.cs | 10 ++---- .../Model/NullableGuidClass.cs | 5 +-- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../Model/ObjectWithDeprecatedFields.cs | 2 +- .../src/Org.OpenAPITools/Model/Order.cs | 6 ++-- .../Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/Return.cs | 2 +- .../Model/SpecialModelName.cs | 2 +- .../src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../src/Org.OpenAPITools/Model/User.cs | 4 +-- 64 files changed, 121 insertions(+), 206 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache index f89022a166e..e4a06de33c4 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache @@ -91,37 +91,26 @@ {{^isEnum}} {{#isDouble}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDouble(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetDouble(); {{/isDouble}} {{#isDecimal}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetDecimal(); {{/isDecimal}} {{#isFloat}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetDouble(out double {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result); - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = (float){{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result; - } + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = (float)utf8JsonReader.GetDouble(); {{/isFloat}} {{#isLong}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGet{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int64(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int64(); {{/isLong}} {{^isLong}} {{^isFloat}} {{^isDecimal}} {{^isDouble}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - {{#isNullable}} - { - utf8JsonReader.TryGet{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(out {{#vendorExtensions.x-unsigned}}u{{/vendorExtensions.x-unsigned}}int {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result); - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result; - } - {{/isNullable}} - {{^isNullable}} - utf8JsonReader.TryGet{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); - {{/isNullable}} + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(); {{/isDouble}} {{/isDecimal}} {{/isFloat}} @@ -140,10 +129,7 @@ {{^isMap}} {{#isNumeric}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGet{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(out {{#vendorExtensions.x-unsigned}}u{{/vendorExtensions.x-unsigned}}int {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result); - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = ({{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}){{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result; - } + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = ({{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}})utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32(); {{/isNumeric}} {{^isNumeric}} string {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue = utf8JsonReader.GetString(); @@ -158,15 +144,7 @@ {{/isEnum}} {{#isUuid}} if (utf8JsonReader.TokenType != JsonTokenType.Null) - {{#isNullable}} - { - utf8JsonReader.TryGetGuid(out Guid {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result); - {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}Result; - } - {{/isNullable}} - {{^isNullable}} - utf8JsonReader.TryGetGuid(out {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}); - {{/isNullable}} + {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = utf8JsonReader.GetGuid(); {{/isUuid}} {{^isUuid}} {{^isEnum}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs index d60aa4487db..08e878e68f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -152,7 +152,7 @@ namespace Org.OpenAPITools.Model { case "code": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out code); + code = utf8JsonReader.GetInt32(); break; case "message": message = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs index 2662d8e166b..87157888a6c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs @@ -126,7 +126,7 @@ namespace Org.OpenAPITools.Model { case "lengthCm": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out lengthCm); + lengthCm = utf8JsonReader.GetDecimal(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs index 13acd032c19..f34c6cf7a59 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs @@ -132,7 +132,7 @@ namespace Org.OpenAPITools.Model { case "lengthCm": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out lengthCm); + lengthCm = utf8JsonReader.GetDecimal(); break; case "sweet": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs index c5d8e8bd619..dee6148673d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs index e589516e041..075193452a2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs @@ -487,24 +487,15 @@ namespace Org.OpenAPITools.Model { case "enum_integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumIntegerResult); - enumInteger = (EnumTest.EnumIntegerEnum)enumIntegerResult; - } + enumInteger = (EnumTest.EnumIntegerEnum)utf8JsonReader.GetInt32(); break; case "enum_integer_only": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumIntegerOnlyResult); - enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)enumIntegerOnlyResult; - } + enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)utf8JsonReader.GetInt32(); break; case "enum_number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumNumberResult); - enumNumber = (EnumTest.EnumNumberEnum)enumNumberResult; - } + enumNumber = (EnumTest.EnumNumberEnum)utf8JsonReader.GetInt32(); break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index 2ec01bd02a3..c592f4563aa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -487,30 +487,27 @@ namespace Org.OpenAPITools.Model break; case "double": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDouble(out doubleProperty); + doubleProperty = utf8JsonReader.GetDouble(); break; case "float": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetDouble(out double floatPropertyResult); - floatProperty = (float)floatPropertyResult; - } + floatProperty = (float)utf8JsonReader.GetDouble(); break; case "int32": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out int32); + int32 = utf8JsonReader.GetInt32(); break; case "int64": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out int64); + int64 = utf8JsonReader.GetInt64(); break; case "integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out integer); + integer = utf8JsonReader.GetInt32(); break; case "number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out number); + number = utf8JsonReader.GetDecimal(); break; case "password": password = utf8JsonReader.GetString(); @@ -526,15 +523,15 @@ namespace Org.OpenAPITools.Model break; case "unsigned_integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetUInt32(out unsignedInteger); + unsignedInteger = utf8JsonReader.GetUInt32(); break; case "unsigned_long": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetUInt64(out unsignedLong); + unsignedLong = utf8JsonReader.GetUInt64(); break; case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuid); + uuid = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index a4fcf52ae21..d2a2492aa80 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -185,11 +185,11 @@ namespace Org.OpenAPITools.Model break; case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuid); + uuid = utf8JsonReader.GetGuid(); break; case "uuid_with_pattern": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuidWithPattern); + uuidWithPattern = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs index 1af87fa790b..e1db9db321c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model break; case "name": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out name); + name = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs index d3937718893..bec58518dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs @@ -202,18 +202,18 @@ namespace Org.OpenAPITools.Model { case "name": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out nameProperty); + nameProperty = utf8JsonReader.GetInt32(); break; case "property": property = utf8JsonReader.GetString(); break; case "snake_case": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out snakeCase); + snakeCase = utf8JsonReader.GetInt32(); break; case "123Number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out _123number); + _123number = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs index 6fa35f45630..b5946392c46 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs @@ -271,17 +271,11 @@ namespace Org.OpenAPITools.Model break; case "integer_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int integerPropResult); - integerProp = integerPropResult; - } + integerProp = utf8JsonReader.GetInt32(); break; case "number_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int numberPropResult); - numberProp = numberPropResult; - } + numberProp = utf8JsonReader.GetInt32(); break; case "object_and_items_nullable_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs index dc139201768..e591e719a08 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -118,10 +118,7 @@ namespace Org.OpenAPITools.Model { case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetGuid(out Guid uuidResult); - uuid = uuidResult; - } + uuid = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs index fe22e8c1313..65623db5719 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -126,7 +126,7 @@ namespace Org.OpenAPITools.Model { case "JustNumber": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out justNumber); + justNumber = utf8JsonReader.GetDecimal(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index dea9b8289db..b599e8925be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -176,7 +176,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out id); + id = utf8JsonReader.GetDecimal(); break; case "uuid": uuid = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs index dcccaeabf94..d46303f9d65 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs @@ -260,15 +260,15 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "petId": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out petId); + petId = utf8JsonReader.GetInt64(); break; case "quantity": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out quantity); + quantity = utf8JsonReader.GetInt32(); break; case "shipDate": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs index 535be6ceddd..f76d08227bf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -156,7 +156,7 @@ namespace Org.OpenAPITools.Model break; case "my_number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out myNumber); + myNumber = utf8JsonReader.GetDecimal(); break; case "my_string": myString = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs index bf7c51d54da..69bca429015 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs @@ -259,7 +259,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs index 78afa02e1d0..02a2b05fea7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs @@ -126,7 +126,7 @@ namespace Org.OpenAPITools.Model { case "return": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out returnProperty); + returnProperty = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs index 4c13346b687..8e4a3fb6c95 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model break; case "$special[property.name]": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out specialPropertyName); + specialPropertyName = utf8JsonReader.GetInt64(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs index ddf32452506..f12966b8e86 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs index 70d72c32914..622d5efd4f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs @@ -271,7 +271,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "lastName": lastName = utf8JsonReader.GetString(); @@ -288,7 +288,7 @@ namespace Org.OpenAPITools.Model break; case "userStatus": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out userStatus); + userStatus = utf8JsonReader.GetInt32(); break; case "username": username = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs index 6939e72722f..efd488d07b9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model { case "code": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out code); + code = utf8JsonReader.GetInt32(); break; case "message": message = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs index 4867e1d15d8..1c8f4a7a912 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model { case "lengthCm": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out lengthCm); + lengthCm = utf8JsonReader.GetDecimal(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs index 3ce324ab17f..014f8534eca 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -130,7 +130,7 @@ namespace Org.OpenAPITools.Model { case "lengthCm": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out lengthCm); + lengthCm = utf8JsonReader.GetDecimal(); break; case "sweet": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs index 622e22f76ae..bbb05a49ad4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs index 15ad700c0c8..2cf78a5fb13 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -485,24 +485,15 @@ namespace Org.OpenAPITools.Model { case "enum_integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumIntegerResult); - enumInteger = (EnumTest.EnumIntegerEnum)enumIntegerResult; - } + enumInteger = (EnumTest.EnumIntegerEnum)utf8JsonReader.GetInt32(); break; case "enum_integer_only": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumIntegerOnlyResult); - enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)enumIntegerOnlyResult; - } + enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)utf8JsonReader.GetInt32(); break; case "enum_number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumNumberResult); - enumNumber = (EnumTest.EnumNumberEnum)enumNumberResult; - } + enumNumber = (EnumTest.EnumNumberEnum)utf8JsonReader.GetInt32(); break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index 7bcac920ca8..75c1a8e531b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -485,30 +485,27 @@ namespace Org.OpenAPITools.Model break; case "double": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDouble(out doubleProperty); + doubleProperty = utf8JsonReader.GetDouble(); break; case "float": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetDouble(out double floatPropertyResult); - floatProperty = (float)floatPropertyResult; - } + floatProperty = (float)utf8JsonReader.GetDouble(); break; case "int32": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out int32); + int32 = utf8JsonReader.GetInt32(); break; case "int64": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out int64); + int64 = utf8JsonReader.GetInt64(); break; case "integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out integer); + integer = utf8JsonReader.GetInt32(); break; case "number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out number); + number = utf8JsonReader.GetDecimal(); break; case "password": password = utf8JsonReader.GetString(); @@ -524,15 +521,15 @@ namespace Org.OpenAPITools.Model break; case "unsigned_integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetUInt32(out unsignedInteger); + unsignedInteger = utf8JsonReader.GetUInt32(); break; case "unsigned_long": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetUInt64(out unsignedLong); + unsignedLong = utf8JsonReader.GetUInt64(); break; case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuid); + uuid = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index ceb8333b869..86c4a36a075 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -183,11 +183,11 @@ namespace Org.OpenAPITools.Model break; case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuid); + uuid = utf8JsonReader.GetGuid(); break; case "uuid_with_pattern": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuidWithPattern); + uuidWithPattern = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs index 4273d24015e..10458d40a8a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model break; case "name": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out name); + name = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs index a6e8e011688..cbf6dc94808 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs @@ -200,18 +200,18 @@ namespace Org.OpenAPITools.Model { case "name": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out nameProperty); + nameProperty = utf8JsonReader.GetInt32(); break; case "property": property = utf8JsonReader.GetString(); break; case "snake_case": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out snakeCase); + snakeCase = utf8JsonReader.GetInt32(); break; case "123Number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out _123number); + _123number = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs index 304f1fd78c2..4c5b50e7766 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -269,17 +269,11 @@ namespace Org.OpenAPITools.Model break; case "integer_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int integerPropResult); - integerProp = integerPropResult; - } + integerProp = utf8JsonReader.GetInt32(); break; case "number_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int numberPropResult); - numberProp = numberPropResult; - } + numberProp = utf8JsonReader.GetInt32(); break; case "object_and_items_nullable_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index e774aa7d9f3..f9d39dda3c4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -116,10 +116,7 @@ namespace Org.OpenAPITools.Model { case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetGuid(out Guid uuidResult); - uuid = uuidResult; - } + uuid = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs index dce27e3cf23..f207e60d900 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model { case "JustNumber": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out justNumber); + justNumber = utf8JsonReader.GetDecimal(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index d8a0bca8ef7..8fc287460d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -174,7 +174,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out id); + id = utf8JsonReader.GetDecimal(); break; case "uuid": uuid = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs index 582e2b327f6..8f05a735834 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs @@ -258,15 +258,15 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "petId": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out petId); + petId = utf8JsonReader.GetInt64(); break; case "quantity": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out quantity); + quantity = utf8JsonReader.GetInt32(); break; case "shipDate": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 7d6bd307050..082d12576b0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model break; case "my_number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out myNumber); + myNumber = utf8JsonReader.GetDecimal(); break; case "my_string": myString = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs index 205a01a0b70..75f3cb74c0d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs @@ -257,7 +257,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs index 503c768fe6d..46050586d0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model { case "return": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out returnProperty); + returnProperty = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 07bd694c8f8..454f652d615 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model break; case "$special[property.name]": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out specialPropertyName); + specialPropertyName = utf8JsonReader.GetInt64(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs index afe218563b8..7c3ae06b5bd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs index b0ffe3a0e2c..69346fa0294 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs @@ -269,7 +269,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "lastName": lastName = utf8JsonReader.GetString(); @@ -286,7 +286,7 @@ namespace Org.OpenAPITools.Model break; case "userStatus": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out userStatus); + userStatus = utf8JsonReader.GetInt32(); break; case "username": username = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs index 324296ba1ce..2a5e437e8fe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs @@ -126,7 +126,7 @@ namespace Org.OpenAPITools.Model { case "age": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out age); + age = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs index a1f7f944583..ab60fea69c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs @@ -126,7 +126,7 @@ namespace Org.OpenAPITools.Model { case "count": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out count); + count = utf8JsonReader.GetDecimal(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs index a1f7f944583..ab60fea69c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs @@ -126,7 +126,7 @@ namespace Org.OpenAPITools.Model { case "count": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out count); + count = utf8JsonReader.GetDecimal(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs index 6939e72722f..efd488d07b9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model { case "code": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out code); + code = utf8JsonReader.GetInt32(); break; case "message": message = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs index 4867e1d15d8..1c8f4a7a912 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model { case "lengthCm": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out lengthCm); + lengthCm = utf8JsonReader.GetDecimal(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs index 3ce324ab17f..014f8534eca 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -130,7 +130,7 @@ namespace Org.OpenAPITools.Model { case "lengthCm": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out lengthCm); + lengthCm = utf8JsonReader.GetDecimal(); break; case "sweet": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs index 622e22f76ae..bbb05a49ad4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs index 15ad700c0c8..2cf78a5fb13 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -485,24 +485,15 @@ namespace Org.OpenAPITools.Model { case "enum_integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumIntegerResult); - enumInteger = (EnumTest.EnumIntegerEnum)enumIntegerResult; - } + enumInteger = (EnumTest.EnumIntegerEnum)utf8JsonReader.GetInt32(); break; case "enum_integer_only": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumIntegerOnlyResult); - enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)enumIntegerOnlyResult; - } + enumIntegerOnly = (EnumTest.EnumIntegerOnlyEnum)utf8JsonReader.GetInt32(); break; case "enum_number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int enumNumberResult); - enumNumber = (EnumTest.EnumNumberEnum)enumNumberResult; - } + enumNumber = (EnumTest.EnumNumberEnum)utf8JsonReader.GetInt32(); break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index 7bcac920ca8..75c1a8e531b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -485,30 +485,27 @@ namespace Org.OpenAPITools.Model break; case "double": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDouble(out doubleProperty); + doubleProperty = utf8JsonReader.GetDouble(); break; case "float": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetDouble(out double floatPropertyResult); - floatProperty = (float)floatPropertyResult; - } + floatProperty = (float)utf8JsonReader.GetDouble(); break; case "int32": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out int32); + int32 = utf8JsonReader.GetInt32(); break; case "int64": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out int64); + int64 = utf8JsonReader.GetInt64(); break; case "integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out integer); + integer = utf8JsonReader.GetInt32(); break; case "number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out number); + number = utf8JsonReader.GetDecimal(); break; case "password": password = utf8JsonReader.GetString(); @@ -524,15 +521,15 @@ namespace Org.OpenAPITools.Model break; case "unsigned_integer": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetUInt32(out unsignedInteger); + unsignedInteger = utf8JsonReader.GetUInt32(); break; case "unsigned_long": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetUInt64(out unsignedLong); + unsignedLong = utf8JsonReader.GetUInt64(); break; case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuid); + uuid = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index ceb8333b869..86c4a36a075 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -183,11 +183,11 @@ namespace Org.OpenAPITools.Model break; case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuid); + uuid = utf8JsonReader.GetGuid(); break; case "uuid_with_pattern": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetGuid(out uuidWithPattern); + uuidWithPattern = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs index 4273d24015e..10458d40a8a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model break; case "name": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out name); + name = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs index a6e8e011688..cbf6dc94808 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs @@ -200,18 +200,18 @@ namespace Org.OpenAPITools.Model { case "name": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out nameProperty); + nameProperty = utf8JsonReader.GetInt32(); break; case "property": property = utf8JsonReader.GetString(); break; case "snake_case": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out snakeCase); + snakeCase = utf8JsonReader.GetInt32(); break; case "123Number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out _123number); + _123number = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs index 304f1fd78c2..4c5b50e7766 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -269,17 +269,11 @@ namespace Org.OpenAPITools.Model break; case "integer_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int integerPropResult); - integerProp = integerPropResult; - } + integerProp = utf8JsonReader.GetInt32(); break; case "number_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetInt32(out int numberPropResult); - numberProp = numberPropResult; - } + numberProp = utf8JsonReader.GetInt32(); break; case "object_and_items_nullable_prop": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index e774aa7d9f3..f9d39dda3c4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -116,10 +116,7 @@ namespace Org.OpenAPITools.Model { case "uuid": if (utf8JsonReader.TokenType != JsonTokenType.Null) - { - utf8JsonReader.TryGetGuid(out Guid uuidResult); - uuid = uuidResult; - } + uuid = utf8JsonReader.GetGuid(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs index dce27e3cf23..f207e60d900 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model { case "JustNumber": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out justNumber); + justNumber = utf8JsonReader.GetDecimal(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index d8a0bca8ef7..8fc287460d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -174,7 +174,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out id); + id = utf8JsonReader.GetDecimal(); break; case "uuid": uuid = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs index 582e2b327f6..8f05a735834 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs @@ -258,15 +258,15 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "petId": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out petId); + petId = utf8JsonReader.GetInt64(); break; case "quantity": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out quantity); + quantity = utf8JsonReader.GetInt32(); break; case "shipDate": if (utf8JsonReader.TokenType != JsonTokenType.Null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 7d6bd307050..082d12576b0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model break; case "my_number": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetDecimal(out myNumber); + myNumber = utf8JsonReader.GetDecimal(); break; case "my_string": myString = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs index 205a01a0b70..75f3cb74c0d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs @@ -257,7 +257,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs index 503c768fe6d..46050586d0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model { case "return": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out returnProperty); + returnProperty = utf8JsonReader.GetInt32(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 07bd694c8f8..454f652d615 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model break; case "$special[property.name]": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out specialPropertyName); + specialPropertyName = utf8JsonReader.GetInt64(); break; default: break; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs index afe218563b8..7c3ae06b5bd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model { case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "name": name = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs index b0ffe3a0e2c..69346fa0294 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs @@ -269,7 +269,7 @@ namespace Org.OpenAPITools.Model break; case "id": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt64(out id); + id = utf8JsonReader.GetInt64(); break; case "lastName": lastName = utf8JsonReader.GetString(); @@ -286,7 +286,7 @@ namespace Org.OpenAPITools.Model break; case "userStatus": if (utf8JsonReader.TokenType != JsonTokenType.Null) - utf8JsonReader.TryGetInt32(out userStatus); + userStatus = utf8JsonReader.GetInt32(); break; case "username": username = utf8JsonReader.GetString(); From 217d052bf760a8dda716efc8b969ebc6bf00fc30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 16:49:57 +0800 Subject: [PATCH 055/131] Bump actions/setup-go from 3 to 4 (#14972) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/samples-go.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/samples-go.yaml b/.github/workflows/samples-go.yaml index a46a7ea9c22..b04201d979e 100644 --- a/.github/workflows/samples-go.yaml +++ b/.github/workflows/samples-go.yaml @@ -22,7 +22,7 @@ jobs: - samples/server/petstore/go-api-server/ steps: - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '>=1.17.0' - run: go version From e626b43e27ed43a8e2df66169d95f2cf857d5a19 Mon Sep 17 00:00:00 2001 From: Riccardo Cardin Date: Thu, 16 Mar 2023 13:00:10 +0100 Subject: [PATCH 056/131] Added a property to the Spring generator to avoid the use of the `ResponseEntity` type (#11537) * Added the useResponseEntity additional parameter for Spring generator * Changed the mustache templates using the new useResponseEntity property * Added the new property to the documentation * Merging with remote master * #11537 Added missing configuration for the delegate pattern case * #11537 Added autogenerated @ResponseStatus on Spring methods * #11537 Fixed borsch comments * #11537 Added the default 200 HTTP Status for empty response HTTP code * [Java][Spring] useResponseEntity sample + remove blank line * [Java][Spring] useResponseEntity sample + remove blank line * [Java][Spring] useResponseEntity sample + remove blank line --------- Co-authored-by: Oleh Kurpiak --- .github/workflows/samples-spring.yaml | 1 + ...ring-boot-delegate-no-response-entity.yaml | 11 + docs/generators/java-camel.md | 1 + docs/generators/spring.md | 1 + .../codegen/languages/SpringCodegen.java | 19 + .../mustache/SpringHttpStatusLambda.java | 220 +++++ .../main/resources/JavaSpring/api.mustache | 12 +- .../JavaSpring/apiController.mustache | 8 +- .../resources/JavaSpring/apiDelegate.mustache | 4 +- .../resources/JavaSpring/methodBody.mustache | 10 +- .../java/spring/SpringCodegenTest.java | 127 ++- .../mustache/SpringHttpStatusLambdaTest.java | 106 +++ .../src/test/resources/bugs/issue_11537.yaml | 44 + .../java/org/openapitools/api/PetApi.java | 7 + .../java/org/openapitools/api/StoreApi.java | 4 + .../java/org/openapitools/api/UserApi.java | 8 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 26 + .../.openapi-generator/VERSION | 1 + .../README.md | 27 + .../pom.xml | 89 ++ .../OpenApiGeneratorApplication.java | 30 + .../org/openapitools/RFC3339DateFormat.java | 38 + .../java/org/openapitools/api/ApiUtil.java | 19 + .../java/org/openapitools/api/PetApi.java | 345 +++++++ .../openapitools/api/PetApiController.java | 44 + .../org/openapitools/api/PetApiDelegate.java | 231 +++++ .../java/org/openapitools/api/StoreApi.java | 160 ++++ .../openapitools/api/StoreApiController.java | 44 + .../openapitools/api/StoreApiDelegate.java | 109 +++ .../java/org/openapitools/api/UserApi.java | 294 ++++++ .../openapitools/api/UserApiController.java | 45 + .../org/openapitools/api/UserApiDelegate.java | 153 +++ .../configuration/HomeController.java | 28 + .../configuration/SpringFoxConfiguration.java | 71 ++ .../java/org/openapitools/model/Category.java | 109 +++ .../openapitools/model/ModelApiResponse.java | 135 +++ .../java/org/openapitools/model/Order.java | 246 +++++ .../main/java/org/openapitools/model/Pet.java | 279 ++++++ .../main/java/org/openapitools/model/Tag.java | 109 +++ .../java/org/openapitools/model/User.java | 253 +++++ .../src/main/resources/application.properties | 3 + .../src/main/resources/openapi.yaml | 880 ++++++++++++++++++ .../src/main/resources/static/swagger-ui.html | 60 ++ .../OpenApiGeneratorApplicationTests.java | 13 + 45 files changed, 4406 insertions(+), 41 deletions(-) create mode 100644 bin/configs/spring-boot-delegate-no-response-entity.yaml create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/SpringHttpStatusLambda.java create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/templating/mustache/SpringHttpStatusLambdaTest.java create mode 100644 modules/openapi-generator/src/test/resources/bugs/issue_11537.yaml create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator-ignore create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/FILES create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/README.md create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/pom.xml create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/OpenApiGeneratorApplication.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/RFC3339DateFormat.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/ApiUtil.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiController.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiController.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiController.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/configuration/HomeController.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/application.properties create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/openapi.yaml create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/static/swagger-ui.html create mode 100644 samples/server/petstore/springboot-delegate-no-response-entity/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/.github/workflows/samples-spring.yaml b/.github/workflows/samples-spring.yaml index 8c51f45a8c0..c3d4dac6dea 100644 --- a/.github/workflows/samples-spring.yaml +++ b/.github/workflows/samples-spring.yaml @@ -36,6 +36,7 @@ jobs: - samples/server/petstore/springboot-implicitHeaders - samples/openapi3/server/petstore/springboot-implicitHeaders - samples/server/petstore/springboot-delegate + - samples/server/petstore/springboot-delegate-no-response-entity - samples/openapi3/server/petstore/springboot-delegate - samples/server/petstore/spring-boot-nullable-set - samples/server/petstore/spring-boot-defaultInterface-unhandledException diff --git a/bin/configs/spring-boot-delegate-no-response-entity.yaml b/bin/configs/spring-boot-delegate-no-response-entity.yaml new file mode 100644 index 00000000000..f8b5cdd3c35 --- /dev/null +++ b/bin/configs/spring-boot-delegate-no-response-entity.yaml @@ -0,0 +1,11 @@ +generatorName: spring +outputDir: samples/server/petstore/springboot-delegate-no-response-entity +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring +additionalProperties: + documentationProvider: springfox + artifactId: springboot-delegate-no-response-entity + hideGenerationTimestamp: "true" + java8: true + delegatePattern: "true" + useResponseEntity: "false" diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index 394bf13dd54..73a542695ea 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -97,6 +97,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useFeignClientUrl|Whether to generate Feign client with url parameter.| |true| |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false| |useOptional|Use Optional container for optional parameters| |false| +|useResponseEntity|Use the `ResponseEntity` type to wrap return values of generated API methods. If disabled, method are annotated using a `@ResponseStatus` annotation, which has the status of the first response declared in the Api definition| |true| |useSpringBoot3|Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.| |false| |useSpringController|Annotate the generated API as a Spring Controller| |false| |useSwaggerUI|Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies| |true| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index e8bfdbc0e04..39080e801ca 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -90,6 +90,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useFeignClientUrl|Whether to generate Feign client with url parameter.| |true| |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false| |useOptional|Use Optional container for optional parameters| |false| +|useResponseEntity|Use the `ResponseEntity` type to wrap return values of generated API methods. If disabled, method are annotated using a `@ResponseStatus` annotation, which has the status of the first response declared in the Api definition| |true| |useSpringBoot3|Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.| |false| |useSpringController|Annotate the generated API as a Spring Controller| |false| |useSwaggerUI|Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies| |true| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index 2c909e8c8d6..78546738da1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -65,6 +65,7 @@ import org.openapitools.codegen.model.ModelsMap; import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.templating.mustache.SplitStringLambda; +import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; import org.openapitools.codegen.templating.mustache.TrimWhitespaceLambda; import org.openapitools.codegen.utils.URLPathUtils; import org.slf4j.Logger; @@ -110,6 +111,7 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String HATEOAS = "hateoas"; public static final String RETURN_SUCCESS_CODE = "returnSuccessCode"; public static final String UNHANDLED_EXCEPTION_HANDLING = "unhandledException"; + public static final String USE_RESPONSE_ENTITY = "useResponseEntity"; public static final String USE_SPRING_BOOT3 = "useSpringBoot3"; public static final String REQUEST_MAPPING_OPTION = "requestMappingMode"; public static final String USE_REQUEST_MAPPING_ON_CONTROLLER = "useRequestMappingOnController"; @@ -157,6 +159,7 @@ public class SpringCodegen extends AbstractJavaCodegen protected boolean unhandledException = false; protected boolean useSpringController = false; protected boolean useSwaggerUI = true; + protected boolean useResponseEntity = true; protected boolean useSpringBoot3 = false; protected boolean generatedConstructorWithRequiredArgs = true; protected RequestMappingMode requestMappingMode = RequestMappingMode.controller; @@ -247,6 +250,10 @@ public class SpringCodegen extends AbstractJavaCodegen cliOptions.add(CliOption.newBoolean(USE_SWAGGER_UI, "Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies", useSwaggerUI)); + cliOptions.add(CliOption.newBoolean(USE_RESPONSE_ENTITY, + "Use the `ResponseEntity` type to wrap return values of generated API methods. " + + "If disabled, method are annotated using a `@ResponseStatus` annotation, which has the status of the first response declared in the Api definition", + useResponseEntity)); cliOptions.add(CliOption.newBoolean(USE_SPRING_BOOT3, "Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.", useSpringBoot3)); @@ -487,6 +494,13 @@ public class SpringCodegen extends AbstractJavaCodegen } additionalProperties.put(UNHANDLED_EXCEPTION_HANDLING, this.isUnhandledException()); + if (additionalProperties.containsKey(USE_RESPONSE_ENTITY)) { + this.setUseResponseEntity( + Boolean.parseBoolean(additionalProperties.get(USE_RESPONSE_ENTITY).toString())); + } + writePropertyBack(USE_RESPONSE_ENTITY, useResponseEntity); + additionalProperties.put("springHttpStatus", new SpringHttpStatusLambda()); + if (additionalProperties.containsKey(USE_SPRING_BOOT3)) { this.setUseSpringBoot3(convertPropertyToBoolean(USE_SPRING_BOOT3)); } @@ -503,6 +517,7 @@ public class SpringCodegen extends AbstractJavaCodegen } writePropertyBack(USE_SPRING_BOOT3, isUseSpringBoot3()); + typeMapping.put("file", "org.springframework.core.io.Resource"); importMapping.put("org.springframework.core.io.Resource", "org.springframework.core.io.Resource"); importMapping.put("Pageable", "org.springframework.data.domain.Pageable"); @@ -1028,6 +1043,10 @@ public class SpringCodegen extends AbstractJavaCodegen this.unhandledException = unhandledException; } + public void setUseResponseEntity(boolean useResponseEntity) { + this.useResponseEntity = useResponseEntity; + } + @Override public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { super.postProcessModelProperty(model, property); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/SpringHttpStatusLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/SpringHttpStatusLambda.java new file mode 100644 index 00000000000..3808f78cbb3 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/SpringHttpStatusLambda.java @@ -0,0 +1,220 @@ +package org.openapitools.codegen.templating.mustache; + +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template; + +import java.io.IOException; +import java.io.Writer; + +/** + * Returns the Spring {@code org.springframework.http.HttpStatus} enumeration for the given status text. + * It throws an IllegalArgumentException if the status text is handled by the Spring framework. + * + * Register: + *
          + * additionalProperties.put("springHttpStatus", new SpringHttpStatusLambda());
          + * 
          + * + * Use: + *
          + * {{#springHttpStatus}}{{statusCode}}{{/springHttpStatus}}
          + * 
          + */ +public class SpringHttpStatusLambda implements Mustache.Lambda { + + final static String HTTP_STATUS_PREFIX = "HttpStatus."; + + @Override + public void execute(Template.Fragment fragment, Writer writer) throws IOException { + final String httpCode = fragment.execute(); + switch (httpCode) { + case "202": + writer.write(HTTP_STATUS_PREFIX + "ACCEPTED"); + break; + case "208": + writer.write(HTTP_STATUS_PREFIX + "ALREADY_REPORTED"); + break; + case "502": + writer.write(HTTP_STATUS_PREFIX + "BAD_GATEWAY"); + break; + case "400": + writer.write(HTTP_STATUS_PREFIX + "BAD_REQUEST"); + break; + case "509": + writer.write(HTTP_STATUS_PREFIX + "BANDWIDTH_LIMIT_EXCEEDED"); + break; + case "409": + writer.write(HTTP_STATUS_PREFIX + "CONFLICT"); + break; + case "100": + writer.write(HTTP_STATUS_PREFIX + "CONTINUE"); + break; + case "201": + writer.write(HTTP_STATUS_PREFIX + "CREATED"); + break; + case "103": + writer.write(HTTP_STATUS_PREFIX + "EARLY_HINTS"); + break; + case "417": + writer.write(HTTP_STATUS_PREFIX + "EXPECTATION_FAILED"); + break; + case "424": + writer.write(HTTP_STATUS_PREFIX + "FAILED_DEPENDENCY"); + break; + case "403": + writer.write(HTTP_STATUS_PREFIX + "FORBIDDEN"); + break; + case "302": + writer.write(HTTP_STATUS_PREFIX + "FOUND"); + break; + case "504": + writer.write(HTTP_STATUS_PREFIX + "GATEWAY_TIMEOUT"); + break; + case "410": + writer.write(HTTP_STATUS_PREFIX + "GONE"); + break; + case "505": + writer.write(HTTP_STATUS_PREFIX + "HTTP_VERSION_NOT_SUPPORTED"); + break; + case "418": + writer.write(HTTP_STATUS_PREFIX + "I_AM_A_TEAPOT"); + break; + case "226": + writer.write(HTTP_STATUS_PREFIX + "IM_USED"); + break; + case "507": + writer.write(HTTP_STATUS_PREFIX + "INSUFFICIENT_STORAGE"); + break; + case "500": + writer.write(HTTP_STATUS_PREFIX + "INTERNAL_SERVER_ERROR"); + break; + case "411": + writer.write(HTTP_STATUS_PREFIX + "LENGTH_REQUIRED"); + break; + case "423": + writer.write(HTTP_STATUS_PREFIX + "LOCKED"); + break; + case "508": + writer.write(HTTP_STATUS_PREFIX + "LOOP_DETECTED"); + break; + case "405": + writer.write(HTTP_STATUS_PREFIX + "METHOD_NOT_ALLOWED"); + break; + case "301": + writer.write(HTTP_STATUS_PREFIX + "MOVED_PERMANENTLY"); + break; + case "207": + writer.write(HTTP_STATUS_PREFIX + "MULTI_STATUS"); + break; + case "300": + writer.write(HTTP_STATUS_PREFIX + "MULTIPLE_CHOICES"); + break; + case "511": + writer.write(HTTP_STATUS_PREFIX + "NETWORK_AUTHENTICATION_REQUIRED"); + break; + case "204": + writer.write(HTTP_STATUS_PREFIX + "NO_CONTENT"); + break; + case "203": + writer.write(HTTP_STATUS_PREFIX + "NON_AUTHORITATIVE_INFORMATION"); + break; + case "406": + writer.write(HTTP_STATUS_PREFIX + "NOT_ACCEPTABLE"); + break; + case "510": + writer.write(HTTP_STATUS_PREFIX + "NOT_EXTENDED"); + break; + case "404": + writer.write(HTTP_STATUS_PREFIX + "NOT_FOUND"); + break; + case "501": + writer.write(HTTP_STATUS_PREFIX + "NOT_IMPLEMENTED"); + break; + case "304": + writer.write(HTTP_STATUS_PREFIX + "NOT_MODIFIED"); + break; + case "": + case "200": + writer.write(HTTP_STATUS_PREFIX + "OK"); + break; + case "206": + writer.write(HTTP_STATUS_PREFIX + "PARTIAL_CONTENT"); + break; + case "413": + writer.write(HTTP_STATUS_PREFIX + "PAYLOAD_TOO_LARGE"); + break; + case "402": + writer.write(HTTP_STATUS_PREFIX + "PAYMENT_REQUIRED"); + break; + case "308": + writer.write(HTTP_STATUS_PREFIX + "PERMANENT_REDIRECT"); + break; + case "412": + writer.write(HTTP_STATUS_PREFIX + "PRECONDITION_FAILED"); + break; + case "428": + writer.write(HTTP_STATUS_PREFIX + "PRECONDITION_REQUIRED"); + break; + case "102": + writer.write(HTTP_STATUS_PREFIX + "PROCESSING"); + break; + case "407": + writer.write(HTTP_STATUS_PREFIX + "PROXY_AUTHENTICATION_REQUIRED"); + break; + case "431": + writer.write(HTTP_STATUS_PREFIX + "REQUEST_HEADER_FIELDS_TOO_LARGE"); + break; + case "408": + writer.write(HTTP_STATUS_PREFIX + "REQUEST_TIMEOUT"); + break; + case "416": + writer.write(HTTP_STATUS_PREFIX + "REQUESTED_RANGE_NOT_SATISFIABLE"); + break; + case "205": + writer.write(HTTP_STATUS_PREFIX + "RESET_CONTENT"); + break; + case "303": + writer.write(HTTP_STATUS_PREFIX + "SEE_OTHER"); + break; + case "503": + writer.write(HTTP_STATUS_PREFIX + "SERVICE_UNAVAILABLE"); + break; + case "101": + writer.write(HTTP_STATUS_PREFIX + "SWITCHING_PROTOCOLS"); + break; + case "307": + writer.write(HTTP_STATUS_PREFIX + "TEMPORARY_REDIRECT"); + break; + case "425": + writer.write(HTTP_STATUS_PREFIX + "TOO_EARLY"); + break; + case "429": + writer.write(HTTP_STATUS_PREFIX + "TOO_MANY_REQUESTS"); + break; + case "401": + writer.write(HTTP_STATUS_PREFIX + "UNAUTHORIZED"); + break; + case "451": + writer.write(HTTP_STATUS_PREFIX + "UNAVAILABLE_FOR_LEGAL_REASONS"); + break; + case "422": + writer.write(HTTP_STATUS_PREFIX + "UNPROCESSABLE_ENTITY"); + break; + case "415": + writer.write(HTTP_STATUS_PREFIX + "UNSUPPORTED_MEDIA_TYPE"); + break; + case "426": + writer.write(HTTP_STATUS_PREFIX + "UPGRADE_REQUIRED"); + break; + case "414": + writer.write(HTTP_STATUS_PREFIX + "URI_TOO_LONG"); + break; + case "506": + writer.write(HTTP_STATUS_PREFIX + "VARIANT_ALSO_NEGOTIATES"); + break; + default: + throw new IllegalArgumentException("The given HTTP status code: " + httpCode + + " is not supported by the 'org.springframework.http.HttpStatus' enum."); + } + } +} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache index ece96d8eba1..7bf4efe7320 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache @@ -31,7 +31,12 @@ import io.virtualan.annotation.VirtualService; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; {{/jdk8-no-delegate}} +{{^useResponseEntity}} +import org.springframework.http.HttpStatus; +{{/useResponseEntity}} +{{#useResponseEntity}} import org.springframework.http.ResponseEntity; +{{/useResponseEntity}} {{#useBeanValidation}} import org.springframework.validation.annotation.Validated; {{/useBeanValidation}} @@ -222,7 +227,10 @@ public interface {{classname}} { headers = { {{#vendorExtensions.versionHeaderParamsList}}"{{baseName}}{{#defaultValue}}={{{.}}}{{/defaultValue}}"{{^-last}}, {{/-last}}{{/vendorExtensions.versionHeaderParamsList}} } {{/hasVersionHeaders}}{{#hasVersionQueryParams}}, params = { {{#vendorExtensions.versionQueryParamsList}}"{{baseName}}{{#defaultValue}}={{{.}}}{{/defaultValue}}"{{^-last}}, {{/-last}}{{/vendorExtensions.versionQueryParamsList}} } {{/hasVersionQueryParams}} ) - {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{#delegate-method}}_{{/delegate-method}}{{operationId}}( + {{^useResponseEntity}} + @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}) + {{/useResponseEntity}} + {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}{{#responseWrapper}}>{{/responseWrapper}} {{#delegate-method}}_{{/delegate-method}}{{operationId}}( {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{>cookieParams}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true){{/swagger2AnnotationLibrary}}{{#springFoxDocumentationProvider}}@ApiIgnore{{/springFoxDocumentationProvider}} final ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, @@ -233,7 +241,7 @@ public interface {{classname}} { } // Override this method - {{#jdk8-default-interface}}default {{/jdk8-default-interface}} {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}{{#springFoxDocumentationProvider}}@ApiIgnore{{/springFoxDocumentationProvider}} final ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, {{#springFoxDocumentationProvider}}@ApiIgnore{{/springFoxDocumentationProvider}} final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}} { + {{#jdk8-default-interface}}default {{/jdk8-default-interface}} {{#responseWrapper}}{{.}}<{{/responseWrapper}}{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}{{#springFoxDocumentationProvider}}@ApiIgnore{{/springFoxDocumentationProvider}} final ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, {{#springFoxDocumentationProvider}}@ApiIgnore{{/springFoxDocumentationProvider}} final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}} { {{/delegate-method}} {{^isDelegate}} {{>methodBody}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache index df224372c6e..f66ae61551f 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache @@ -21,7 +21,9 @@ import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; +{{#useResponseEntity}} import org.springframework.http.ResponseEntity; +{{/useResponseEntity}} import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -109,7 +111,7 @@ public class {{classname}}Controller implements {{classname}} { {{#isDeprecated}} @Deprecated {{/isDeprecated}} - public {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}( + public {{#responseWrapper}}{{.}}<{{/responseWrapper}}{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}( {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{>cookieParams}}{{^-last}}, {{/-last}}{{/allParams}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{#springFoxDocumentationProvider}}@ApiIgnore {{/springFoxDocumentationProvider}}final Pageable pageable{{/vendorExtensions.x-spring-paginated}} @@ -119,9 +121,9 @@ public class {{classname}}Controller implements {{classname}} { {{>methodBody}} {{/async}} {{#async}} - return new CallablereturnTypes}}>>() { + return new Callable<{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}>() { @Override - public ResponseEntity<{{>returnTypes}}> call() { + public {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}} call() { {{>methodBody}} } }; diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache index b11e41a5425..a544adc2dcc 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache @@ -4,7 +4,9 @@ package {{package}}; {{/imports}} import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; +{{#useResponseEntity}} import org.springframework.http.ResponseEntity; +{{/useResponseEntity}} import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; {{#reactive}} @@ -60,7 +62,7 @@ public interface {{classname}}Delegate { {{#isDeprecated}} @Deprecated {{/isDeprecated}} - {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#isArray}}List<{{/isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}}{{/isFile}} {{paramName}}{{^-last}}, + {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#isArray}}List<{{/isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}}{{^jdk8-default-interface}};{{/jdk8-default-interface}}{{#jdk8-default-interface}} { {{>methodBody}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache index 23dfcf6759b..0decb2314ba 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache @@ -14,14 +14,20 @@ return CompletableFuture.supplyAsync(()-> { {{#-last}} {{#async}} {{/async}}{{^async}} {{/async}} } {{#async}} {{/async}} }); -{{#async}} {{/async}} return new ResponseEntity<>({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}); +{{#async}} {{/async}} {{#useResponseEntity}}return new ResponseEntity<>({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}); +{{/useResponseEntity}} +{{^useResponseEntity}}throw new IllegalArgumentException("Not implemented"); +{{/useResponseEntity}} {{#async}} }, Runnable::run); {{/async}} {{/-last}} {{/examples}} {{^examples}} -return {{#async}}CompletableFuture.completedFuture({{/async}}new ResponseEntity<>({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}){{#async}}){{/async}}; +{{#useResponseEntity}}return {{#async}}CompletableFuture.completedFuture({{/async}}new ResponseEntity<>({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}){{#async}}){{/async}}; +{{/useResponseEntity}} +{{^useResponseEntity}}throw new IllegalArgumentException("Not implemented"); +{{/useResponseEntity}} {{/examples}} {{/reactive}} {{#reactive}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index da09be67395..c5ffa396581 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -17,16 +17,7 @@ package org.openapitools.codegen.java.spring; -import static java.util.stream.Collectors.groupingBy; -import static org.assertj.core.api.Assertions.assertThat; -import static org.openapitools.codegen.TestUtils.assertFileContains; -import static org.openapitools.codegen.TestUtils.assertFileNotContains; -import static org.openapitools.codegen.languages.SpringCodegen.*; -import static org.openapitools.codegen.languages.features.DocumentationProviderFeatures.ANNOTATION_LIBRARY; -import static org.openapitools.codegen.languages.features.DocumentationProviderFeatures.DOCUMENTATION_PROVIDER; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.fail; - +import com.google.common.collect.ImmutableMap; import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; @@ -34,28 +25,9 @@ import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.parser.core.models.ParseOptions; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.*; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.stream.Collectors; - +import org.openapitools.codegen.*; import org.openapitools.codegen.config.GlobalSettings; import org.openapitools.codegen.java.assertions.JavaFileAssert; -import org.openapitools.codegen.CliOption; -import org.openapitools.codegen.ClientOptInput; -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenModel; -import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.CodegenParameter; -import org.openapitools.codegen.CodegenProperty; -import org.openapitools.codegen.DefaultGenerator; -import org.openapitools.codegen.SupportingFile; -import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.languages.AbstractJavaCodegen; import org.openapitools.codegen.languages.SpringCodegen; import org.openapitools.codegen.languages.features.BeanValidationFeatures; @@ -66,7 +38,26 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Ignore; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableMap; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static java.util.stream.Collectors.groupingBy; +import static org.assertj.core.api.Assertions.assertThat; +import static org.openapitools.codegen.TestUtils.assertFileContains; +import static org.openapitools.codegen.TestUtils.assertFileNotContains; +import static org.openapitools.codegen.languages.SpringCodegen.*; +import static org.openapitools.codegen.languages.features.DocumentationProviderFeatures.ANNOTATION_LIBRARY; +import static org.openapitools.codegen.languages.features.DocumentationProviderFeatures.DOCUMENTATION_PROVIDER; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.fail; public class SpringCodegenTest { @@ -552,6 +543,7 @@ public class SpringCodegenTest { Assert.assertEquals(codegen.additionalProperties().get(SpringCodegen.CONFIG_PACKAGE), "org.openapitools.configuration"); Assert.assertEquals(codegen.additionalProperties().get(SpringCodegen.SERVER_PORT), "8082"); Assert.assertEquals(codegen.additionalProperties().get(SpringCodegen.UNHANDLED_EXCEPTION_HANDLING), false); + Assert.assertEquals(codegen.additionalProperties().get(SpringCodegen.USE_RESPONSE_ENTITY), true); } @Test @@ -1213,7 +1205,7 @@ public class SpringCodegenTest { codegen.setHateoas(true); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR, "false"); - + codegen.setUseOneOfInterfaces(true); codegen.setLegacyDiscriminatorBehavior(false); @@ -1574,6 +1566,75 @@ public class SpringCodegenTest { .assertMethod("getWithMapOfStrings").hasReturnType("ResponseEntity>"); } + @Test + public void shouldGenerateMethodsWithoutUsingResponseEntityAndWithoutDelegation_issue11537() throws IOException { + Map additionalProperties = new HashMap<>(); + additionalProperties.put(AbstractJavaCodegen.FULL_JAVA_UTIL, "true"); + additionalProperties.put(SpringCodegen.USE_TAGS, "true"); + additionalProperties.put(SpringCodegen.INTERFACE_ONLY, "true"); + additionalProperties.put(SpringCodegen.SKIP_DEFAULT_INTERFACE, "true"); + additionalProperties.put(SpringCodegen.PERFORM_BEANVALIDATION, "true"); + additionalProperties.put(SpringCodegen.SPRING_CONTROLLER, "true"); + additionalProperties.put(CodegenConstants.SERIALIZATION_LIBRARY, "jackson"); + additionalProperties.put(USE_RESPONSE_ENTITY, "false"); + Map files = generateFromContract("src/test/resources/bugs/issue_11537.yaml", SPRING_BOOT, additionalProperties); + + JavaFileAssert.assertThat(files.get("MetadataApi.java")) + .assertMethod("getSomething") + .hasReturnType("List") + .assertMethodAnnotations() + .containsWithNameAndAttributes( + "ResponseStatus", + ImmutableMap.of("value", "HttpStatus.OK") + ) + .toMethod() + .toFileAssert() + .assertMethod("putSomething") + .hasReturnType("String") + .assertMethodAnnotations() + .containsWithNameAndAttributes( + "ResponseStatus", + ImmutableMap.of("value", "HttpStatus.CREATED") + ); + } + + @Test + public void shouldGenerateMethodsWithoutUsingResponseEntityAndDelegation_issue11537() throws IOException { + Map additionalProperties = new HashMap<>(); + additionalProperties.put(AbstractJavaCodegen.FULL_JAVA_UTIL, "true"); + additionalProperties.put(SpringCodegen.USE_TAGS, "true"); + additionalProperties.put(SpringCodegen.SKIP_DEFAULT_INTERFACE, "true"); + additionalProperties.put(SpringCodegen.PERFORM_BEANVALIDATION, "true"); + additionalProperties.put(SpringCodegen.SPRING_CONTROLLER, "true"); + additionalProperties.put(CodegenConstants.SERIALIZATION_LIBRARY, "jackson"); + additionalProperties.put(USE_RESPONSE_ENTITY, "false"); + additionalProperties.put(DELEGATE_PATTERN, "true"); + Map files = generateFromContract("src/test/resources/bugs/issue_11537.yaml", SPRING_BOOT, additionalProperties); + + JavaFileAssert.assertThat(files.get("MetadataApiDelegate.java")) + .assertMethod("getSomething").hasReturnType("List") + .toFileAssert() + .assertMethod("putSomething").hasReturnType("String"); + + JavaFileAssert.assertThat(files.get("MetadataApi.java")) + .assertMethod("getSomething") + .hasReturnType("List") + .assertMethodAnnotations() + .containsWithNameAndAttributes( + "ResponseStatus", + ImmutableMap.of("value", "HttpStatus.OK") + ) + .toMethod() + .toFileAssert() + .assertMethod("putSomething") + .hasReturnType("String") + .assertMethodAnnotations() + .containsWithNameAndAttributes( + "ResponseStatus", + ImmutableMap.of("value", "HttpStatus.CREATED") + ); + } + @Test public void testResponseWithArray_issue12524() throws Exception { GlobalSettings.setProperty("skipFormModel", "true"); @@ -1970,7 +2031,7 @@ public class SpringCodegenTest { .assertParameterAnnotations() .containsWithNameAndAttributes("Min", ImmutableMap.of("value", "2")); } - + @Test public void shouldHandleSeparatelyInterfaceAndModelAdditionalAnnotations() throws IOException { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/templating/mustache/SpringHttpStatusLambdaTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/templating/mustache/SpringHttpStatusLambdaTest.java new file mode 100644 index 00000000000..50824c29bde --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/templating/mustache/SpringHttpStatusLambdaTest.java @@ -0,0 +1,106 @@ +package org.openapitools.codegen.templating.mustache; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import java.util.Locale; +import java.util.Map; + +import static org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda.HTTP_STATUS_PREFIX; +import static org.testng.Assert.assertThrows; + +public class SpringHttpStatusLambdaTest extends LambdaTest { + + @DataProvider(name = "springHttpStatusCodes") + public static Object[][] springHttpStatusCodes() { + return new Object[][] { + {"ACCEPTED", "202"}, + {"ALREADY_REPORTED", "208"}, + {"BAD_GATEWAY", "502"}, + {"BAD_REQUEST", "400"}, + {"BANDWIDTH_LIMIT_EXCEEDED", "509"}, + {"CONFLICT", "409"}, + {"CONTINUE", "100"}, + {"CREATED", "201"}, + {"EARLY_HINTS", "103"}, + {"EXPECTATION_FAILED", "417"}, + {"FAILED_DEPENDENCY", "424"}, + {"FORBIDDEN", "403"}, + {"FOUND", "302"}, + {"GATEWAY_TIMEOUT", "504"}, + {"GONE", "410"}, + {"HTTP_VERSION_NOT_SUPPORTED", "505"}, + {"I_AM_A_TEAPOT", "418"}, + {"IM_USED", "226"}, + {"INSUFFICIENT_STORAGE", "507"}, + {"INTERNAL_SERVER_ERROR", "500"}, + {"LENGTH_REQUIRED", "411"}, + {"LOCKED", "423"}, + {"LOOP_DETECTED", "508"}, + {"METHOD_NOT_ALLOWED", "405"}, + {"MOVED_PERMANENTLY", "301"}, + {"MULTI_STATUS", "207"}, + {"MULTIPLE_CHOICES", "300"}, + {"NETWORK_AUTHENTICATION_REQUIRED", "511"}, + {"NO_CONTENT", "204"}, + {"NON_AUTHORITATIVE_INFORMATION", "203"}, + {"NOT_ACCEPTABLE", "406"}, + {"NOT_EXTENDED", "510"}, + {"NOT_FOUND", "404"}, + {"NOT_IMPLEMENTED", "501"}, + {"NOT_MODIFIED", "304"}, + {"OK", "200"}, + {"PARTIAL_CONTENT", "206"}, + {"PAYLOAD_TOO_LARGE", "413"}, + {"PAYMENT_REQUIRED", "402"}, + {"PERMANENT_REDIRECT", "308"}, + {"PRECONDITION_FAILED", "412"}, + {"PRECONDITION_REQUIRED", "428"}, + {"PROCESSING", "102"}, + {"PROXY_AUTHENTICATION_REQUIRED", "407"}, + {"REQUEST_HEADER_FIELDS_TOO_LARGE", "431"}, + {"REQUEST_TIMEOUT", "408"}, + {"REQUESTED_RANGE_NOT_SATISFIABLE", "416"}, + {"RESET_CONTENT", "205"}, + {"SEE_OTHER", "303"}, + {"SERVICE_UNAVAILABLE", "503"}, + {"SWITCHING_PROTOCOLS", "101"}, + {"TEMPORARY_REDIRECT", "307"}, + {"TOO_EARLY", "425"}, + {"TOO_MANY_REQUESTS", "429"}, + {"UNAUTHORIZED", "401"}, + {"UNAVAILABLE_FOR_LEGAL_REASONS", "451"}, + {"UNPROCESSABLE_ENTITY", "422"}, + {"UNSUPPORTED_MEDIA_TYPE", "415"}, + {"UPGRADE_REQUIRED", "426"}, + {"URI_TOO_LONG", "414"}, + {"VARIANT_ALSO_NEGOTIATES", "506"} + }; + } + + @Test(dataProvider = "springHttpStatusCodes") + public void executeShouldConvertValues(String expectedHttpStatus, String httpCode) { + Map ctx = context("springHttpStatus", new SpringHttpStatusLambda()); + + test( + HTTP_STATUS_PREFIX + expectedHttpStatus, + String.format(Locale.ROOT, "{{#springHttpStatus}}%s{{/springHttpStatus}}", httpCode), + ctx); + } + + @Test + public void executeShouldConvertEmptyHttpStatusTo200Ok() { + Map ctx = context("springHttpStatus", new SpringHttpStatusLambda()); + + test(HTTP_STATUS_PREFIX + "OK", "{{#springHttpStatus}}{{/springHttpStatus}}", ctx); + } + + @Test + public void executeShouldConvertToHttpStatusNotImplementedAnyOtherStatus() { + Map ctx = context("springHttpStatus", new SpringHttpStatusLambda()); + + assertThrows( + IllegalArgumentException.class, + () -> execute("{{#springHttpStatus}}305{{/springHttpStatus}}", ctx)); + } +} diff --git a/modules/openapi-generator/src/test/resources/bugs/issue_11537.yaml b/modules/openapi-generator/src/test/resources/bugs/issue_11537.yaml new file mode 100644 index 00000000000..64ecabc390d --- /dev/null +++ b/modules/openapi-generator/src/test/resources/bugs/issue_11537.yaml @@ -0,0 +1,44 @@ +openapi: 3.0.1 +info: + title: metadata-svc + description: Metadata Service + contact: + name: Test Svc + email: xyz@xyz.com + version: 3.1.2 +servers: +- url: https://localhost:8080/ +tags: +- name: metadata + description: APIs to get metadata. +paths: + /v1/a-path: + get: + tags: + - metadata + summary: A generic getter operation. + description: Get something from somewhere. + operationId: getSomething + responses: + 200: + description: List of groups. + content: + application/json: + schema: + type: array + items: + type: string + /v1/another-path: + post: + tags: + - metadata + summary: Insert something. + description: Insert something somewhere. + operationId: putSomething + responses: + 201: + description: List of groups. + content: + application/json: + schema: + type: string diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index 0a62a3bb628..5caa71ce14d 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -99,6 +99,7 @@ public interface PetApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -152,6 +153,7 @@ public interface PetApi { }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -207,6 +209,7 @@ public interface PetApi { }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -258,6 +261,7 @@ public interface PetApi { }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -296,6 +300,7 @@ public interface PetApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -334,6 +339,7 @@ public interface PetApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -383,6 +389,7 @@ public interface PetApi { }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } } diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index a676f2bf4d1..408823d2b65 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -60,6 +60,7 @@ public interface StoreApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -93,6 +94,7 @@ public interface StoreApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -141,6 +143,7 @@ public interface StoreApi { }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -186,6 +189,7 @@ public interface StoreApi { }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } } diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index ed955ae4f89..bd0ed4b6551 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -59,6 +59,7 @@ public interface UserApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -86,6 +87,7 @@ public interface UserApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -113,6 +115,7 @@ public interface UserApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -143,6 +146,7 @@ public interface UserApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -190,6 +194,7 @@ public interface UserApi { }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -223,6 +228,7 @@ public interface UserApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -249,6 +255,7 @@ public interface UserApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } @@ -281,6 +288,7 @@ public interface UserApi { ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator-ignore b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/FILES new file mode 100644 index 00000000000..4e2214f1e7f --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/FILES @@ -0,0 +1,26 @@ +README.md +pom.xml +src/main/java/org/openapitools/OpenApiGeneratorApplication.java +src/main/java/org/openapitools/RFC3339DateFormat.java +src/main/java/org/openapitools/api/ApiUtil.java +src/main/java/org/openapitools/api/PetApi.java +src/main/java/org/openapitools/api/PetApiController.java +src/main/java/org/openapitools/api/PetApiDelegate.java +src/main/java/org/openapitools/api/StoreApi.java +src/main/java/org/openapitools/api/StoreApiController.java +src/main/java/org/openapitools/api/StoreApiDelegate.java +src/main/java/org/openapitools/api/UserApi.java +src/main/java/org/openapitools/api/UserApiController.java +src/main/java/org/openapitools/api/UserApiDelegate.java +src/main/java/org/openapitools/configuration/HomeController.java +src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java +src/main/java/org/openapitools/model/Category.java +src/main/java/org/openapitools/model/ModelApiResponse.java +src/main/java/org/openapitools/model/Order.java +src/main/java/org/openapitools/model/Pet.java +src/main/java/org/openapitools/model/Tag.java +src/main/java/org/openapitools/model/User.java +src/main/resources/application.properties +src/main/resources/openapi.yaml +src/main/resources/static/swagger-ui.html +src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION new file mode 100644 index 00000000000..7f4d792ec2c --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION @@ -0,0 +1 @@ +6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/README.md b/samples/server/petstore/springboot-delegate-no-response-entity/README.md new file mode 100644 index 00000000000..54292416f46 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/README.md @@ -0,0 +1,27 @@ +# OpenAPI generated server + +Spring Boot Server + +## Overview +This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. +By using the [OpenAPI-Spec](https://openapis.org), you can easily generate a server stub. +This is an example of building a OpenAPI-enabled server in Java using the SpringBoot framework. + +The underlying library integrating OpenAPI to Spring Boot is [springfox](https://github.com/springfox/springfox). +Springfox will generate an OpenAPI v2 (fka Swagger RESTful API Documentation Specification) specification based on the +generated Controller and Model classes. The specification is available to download using the following url: +http://localhost:8080/v2/api-docs/ + +**HEADS-UP**: Springfox is deprecated for removal in version 6.0.0 of openapi-generator. The project seems to be no longer +maintained (last commit is of Oct 14, 2020). It works with Spring Boot 2.5.x but not with 2.6. Spring Boot 2.5 is +supported until 2022-05-19. Users of openapi-generator should migrate to the springdoc documentation provider which is, +as an added bonus, OpenAPI v3 compatible. + + + +Start your server as a simple java application + +You can view the api documentation in swagger-ui by pointing to +http://localhost:8080/swagger-ui.html + +Change default port value in application.properties \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml b/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml new file mode 100644 index 00000000000..3800e554f56 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml @@ -0,0 +1,89 @@ + + 4.0.0 + org.openapitools + springboot-delegate-no-response-entity + jar + springboot-delegate-no-response-entity + 1.0.0 + + 1.8 + ${java.version} + ${java.version} + UTF-8 + 2.9.2 + 4.15.5 + + + org.springframework.boot + spring-boot-starter-parent + 2.5.14 + + + + src/main/java + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.data + spring-data-commons + + + + io.springfox + springfox-swagger2 + ${springfox.version} + + + org.webjars + swagger-ui + ${swagger-ui.version} + + + org.webjars + webjars-locator-core + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + + org.springframework.boot + spring-boot-starter-validation + + + com.fasterxml.jackson.core + jackson-databind + + + org.springframework.boot + spring-boot-starter-test + test + + + diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/OpenApiGeneratorApplication.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/OpenApiGeneratorApplication.java new file mode 100644 index 00000000000..97252a8a940 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/OpenApiGeneratorApplication.java @@ -0,0 +1,30 @@ +package org.openapitools; + +import com.fasterxml.jackson.databind.Module; +import org.openapitools.jackson.nullable.JsonNullableModule; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; +import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator; + +@SpringBootApplication( + nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class +) +@ComponentScan( + basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"}, + nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class +) +public class OpenApiGeneratorApplication { + + public static void main(String[] args) { + SpringApplication.run(OpenApiGeneratorApplication.class, args); + } + + @Bean(name = "org.openapitools.OpenApiGeneratorApplication.jsonNullableModule") + public Module jsonNullableModule() { + return new JsonNullableModule(); + } + +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/RFC3339DateFormat.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/RFC3339DateFormat.java new file mode 100644 index 00000000000..bcd3936d8b3 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/RFC3339DateFormat.java @@ -0,0 +1,38 @@ +package org.openapitools; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return this; + } +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/ApiUtil.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/ApiUtil.java new file mode 100644 index 00000000000..1245b1dd0cc --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/ApiUtil.java @@ -0,0 +1,19 @@ +package org.openapitools.api; + +import org.springframework.web.context.request.NativeWebRequest; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class ApiUtil { + public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { + try { + HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class); + res.setCharacterEncoding("UTF-8"); + res.addHeader("Content-Type", contentType); + res.getWriter().print(example); + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java new file mode 100644 index 00000000000..5838f12363a --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java @@ -0,0 +1,345 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; +import io.swagger.annotations.*; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.Valid; +import javax.validation.constraints.*; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@Validated +@Api(value = "pet", description = "Everything about your Pets") +public interface PetApi { + + default PetApiDelegate getDelegate() { + return new PetApiDelegate() {}; + } + + /** + * POST /pet : Add a new pet to the store + * + * + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid input (status code 405) + */ + @ApiOperation( + tags = { "pet" }, + value = "Add a new pet to the store", + nickname = "addPet", + notes = "", + response = Pet.class, + authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = Pet.class), + @ApiResponse(code = 405, message = "Invalid input") + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/pet", + produces = { "application/xml", "application/json" }, + consumes = { "application/json", "application/xml" } + ) + @ResponseStatus(HttpStatus.OK) + default Pet addPet( + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { + return getDelegate().addPet(pet); + } + + + /** + * DELETE /pet/{petId} : Deletes a pet + * + * + * @param petId Pet id to delete (required) + * @param apiKey (optional) + * @return Invalid pet value (status code 400) + */ + @ApiOperation( + tags = { "pet" }, + value = "Deletes a pet", + nickname = "deletePet", + notes = "", + authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + } + ) + @ApiResponses({ + @ApiResponse(code = 400, message = "Invalid pet value") + }) + @RequestMapping( + method = RequestMethod.DELETE, + value = "/pet/{petId}" + ) + @ResponseStatus(HttpStatus.BAD_REQUEST) + default Void deletePet( + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey + ) { + return getDelegate().deletePet(petId, apiKey); + } + + + /** + * GET /pet/findByStatus : Finds Pets by status + * Multiple status values can be provided with comma separated strings + * + * @param status Status values that need to be considered for filter (required) + * @return successful operation (status code 200) + * or Invalid status value (status code 400) + */ + @ApiOperation( + tags = { "pet" }, + value = "Finds Pets by status", + nickname = "findPetsByStatus", + notes = "Multiple status values can be provided with comma separated strings", + response = Pet.class, + responseContainer = "List", + authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 400, message = "Invalid status value") + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/pet/findByStatus", + produces = { "application/xml", "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default List findPetsByStatus( + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { + return getDelegate().findPetsByStatus(status); + } + + + /** + * GET /pet/findByTags : Finds Pets by tags + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * + * @param tags Tags to filter by (required) + * @return successful operation (status code 200) + * or Invalid tag value (status code 400) + * @deprecated + */ + @Deprecated + @ApiOperation( + tags = { "pet" }, + value = "Finds Pets by tags", + nickname = "findPetsByTags", + notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", + response = Pet.class, + responseContainer = "List", + authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 400, message = "Invalid tag value") + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/pet/findByTags", + produces = { "application/xml", "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default List findPetsByTags( + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags + ) { + return getDelegate().findPetsByTags(tags); + } + + + /** + * GET /pet/{petId} : Find pet by ID + * Returns a single pet + * + * @param petId ID of pet to return (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + */ + @ApiOperation( + tags = { "pet" }, + value = "Find pet by ID", + nickname = "getPetById", + notes = "Returns a single pet", + response = Pet.class, + authorizations = { + @Authorization(value = "api_key") + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = Pet.class), + @ApiResponse(code = 400, message = "Invalid ID supplied"), + @ApiResponse(code = 404, message = "Pet not found") + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/pet/{petId}", + produces = { "application/xml", "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default Pet getPetById( + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { + return getDelegate().getPetById(petId); + } + + + /** + * PUT /pet : Update an existing pet + * + * + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * or Validation exception (status code 405) + * API documentation for the updatePet operation + * @see Update an existing pet Documentation + */ + @ApiOperation( + tags = { "pet" }, + value = "Update an existing pet", + nickname = "updatePet", + notes = "", + response = Pet.class, + authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = Pet.class), + @ApiResponse(code = 400, message = "Invalid ID supplied"), + @ApiResponse(code = 404, message = "Pet not found"), + @ApiResponse(code = 405, message = "Validation exception") + }) + @RequestMapping( + method = RequestMethod.PUT, + value = "/pet", + produces = { "application/xml", "application/json" }, + consumes = { "application/json", "application/xml" } + ) + @ResponseStatus(HttpStatus.OK) + default Pet updatePet( + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { + return getDelegate().updatePet(pet); + } + + + /** + * POST /pet/{petId} : Updates a pet in the store with form data + * + * + * @param petId ID of pet that needs to be updated (required) + * @param name Updated name of the pet (optional) + * @param status Updated status of the pet (optional) + * @return Invalid input (status code 405) + */ + @ApiOperation( + tags = { "pet" }, + value = "Updates a pet in the store with form data", + nickname = "updatePetWithForm", + notes = "", + authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + } + ) + @ApiResponses({ + @ApiResponse(code = 405, message = "Invalid input") + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/pet/{petId}", + consumes = { "application/x-www-form-urlencoded" } + ) + @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) + default Void updatePetWithForm( + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { + return getDelegate().updatePetWithForm(petId, name, status); + } + + + /** + * POST /pet/{petId}/uploadImage : uploads an image + * + * + * @param petId ID of pet to update (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param file file to upload (optional) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "uploads an image", + nickname = "uploadFile", + notes = "", + response = ModelApiResponse.class, + authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/pet/{petId}/uploadImage", + produces = { "application/json" }, + consumes = { "multipart/form-data" } + ) + @ResponseStatus(HttpStatus.OK) + default ModelApiResponse uploadFile( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { + return getDelegate().uploadFile(petId, additionalMetadata, file); + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiController.java new file mode 100644 index 00000000000..6c1fa31b180 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiController.java @@ -0,0 +1,44 @@ +package org.openapitools.api; + +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.*; +import javax.validation.Valid; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") +public class PetApiController implements PetApi { + + private final PetApiDelegate delegate; + + public PetApiController(@Autowired(required = false) PetApiDelegate delegate) { + this.delegate = Optional.ofNullable(delegate).orElse(new PetApiDelegate() {}); + } + + @Override + public PetApiDelegate getDelegate() { + return delegate; + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java new file mode 100644 index 00000000000..77436bc931e --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -0,0 +1,231 @@ +package org.openapitools.api; + +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +/** + * A delegate to be called by the {@link PetApiController}}. + * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. + */ +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public interface PetApiDelegate { + + default Optional getRequest() { + return Optional.empty(); + } + + /** + * POST /pet : Add a new pet to the store + * + * + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid input (status code 405) + * @see PetApi#addPet + */ + default Pet addPet(Pet pet) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * DELETE /pet/{petId} : Deletes a pet + * + * + * @param petId Pet id to delete (required) + * @param apiKey (optional) + * @return Invalid pet value (status code 400) + * @see PetApi#deletePet + */ + default Void deletePet(Long petId, + String apiKey) { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * GET /pet/findByStatus : Finds Pets by status + * Multiple status values can be provided with comma separated strings + * + * @param status Status values that need to be considered for filter (required) + * @return successful operation (status code 200) + * or Invalid status value (status code 400) + * @see PetApi#findPetsByStatus + */ + default List findPetsByStatus(List status) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * GET /pet/findByTags : Finds Pets by tags + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * + * @param tags Tags to filter by (required) + * @return successful operation (status code 200) + * or Invalid tag value (status code 400) + * @deprecated + * @see PetApi#findPetsByTags + */ + @Deprecated + default List findPetsByTags(List tags) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * GET /pet/{petId} : Find pet by ID + * Returns a single pet + * + * @param petId ID of pet to return (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * @see PetApi#getPetById + */ + default Pet getPetById(Long petId) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * PUT /pet : Update an existing pet + * + * + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * or Validation exception (status code 405) + * API documentation for the updatePet operation + * @see Update an existing pet Documentation + * @see PetApi#updatePet + */ + default Pet updatePet(Pet pet) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 doggie aeiou aeiou "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * POST /pet/{petId} : Updates a pet in the store with form data + * + * + * @param petId ID of pet that needs to be updated (required) + * @param name Updated name of the pet (optional) + * @param status Updated status of the pet (optional) + * @return Invalid input (status code 405) + * @see PetApi#updatePetWithForm + */ + default Void updatePetWithForm(Long petId, + String name, + String status) { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * POST /pet/{petId}/uploadImage : uploads an image + * + * + * @param petId ID of pet to update (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param file file to upload (optional) + * @return successful operation (status code 200) + * @see PetApi#uploadFile + */ + default ModelApiResponse uploadFile(Long petId, + String additionalMetadata, + MultipartFile file) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java new file mode 100644 index 00000000000..a33be555972 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java @@ -0,0 +1,160 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import java.util.Map; +import org.openapitools.model.Order; +import io.swagger.annotations.*; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.Valid; +import javax.validation.constraints.*; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@Validated +@Api(value = "store", description = "Access to Petstore orders") +public interface StoreApi { + + default StoreApiDelegate getDelegate() { + return new StoreApiDelegate() {}; + } + + /** + * DELETE /store/order/{orderId} : Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * + * @param orderId ID of the order that needs to be deleted (required) + * @return Invalid ID supplied (status code 400) + * or Order not found (status code 404) + */ + @ApiOperation( + tags = { "store" }, + value = "Delete purchase order by ID", + nickname = "deleteOrder", + notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors" + ) + @ApiResponses({ + @ApiResponse(code = 400, message = "Invalid ID supplied"), + @ApiResponse(code = 404, message = "Order not found") + }) + @RequestMapping( + method = RequestMethod.DELETE, + value = "/store/order/{orderId}" + ) + @ResponseStatus(HttpStatus.BAD_REQUEST) + default Void deleteOrder( + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + ) { + return getDelegate().deleteOrder(orderId); + } + + + /** + * GET /store/inventory : Returns pet inventories by status + * Returns a map of status codes to quantities + * + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "store" }, + value = "Returns pet inventories by status", + nickname = "getInventory", + notes = "Returns a map of status codes to quantities", + response = Integer.class, + responseContainer = "Map", + authorizations = { + @Authorization(value = "api_key") + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/store/inventory", + produces = { "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default Map getInventory( + + ) { + return getDelegate().getInventory(); + } + + + /** + * GET /store/order/{orderId} : Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + * + * @param orderId ID of pet that needs to be fetched (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Order not found (status code 404) + */ + @ApiOperation( + tags = { "store" }, + value = "Find purchase order by ID", + nickname = "getOrderById", + notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", + response = Order.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = Order.class), + @ApiResponse(code = 400, message = "Invalid ID supplied"), + @ApiResponse(code = 404, message = "Order not found") + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/store/order/{orderId}", + produces = { "application/xml", "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default Order getOrderById( + @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + ) { + return getDelegate().getOrderById(orderId); + } + + + /** + * POST /store/order : Place an order for a pet + * + * + * @param order order placed for purchasing the pet (required) + * @return successful operation (status code 200) + * or Invalid Order (status code 400) + */ + @ApiOperation( + tags = { "store" }, + value = "Place an order for a pet", + nickname = "placeOrder", + notes = "", + response = Order.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = Order.class), + @ApiResponse(code = 400, message = "Invalid Order") + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/store/order", + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default Order placeOrder( + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { + return getDelegate().placeOrder(order); + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiController.java new file mode 100644 index 00000000000..c2133b27e23 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiController.java @@ -0,0 +1,44 @@ +package org.openapitools.api; + +import java.util.Map; +import org.openapitools.model.Order; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.*; +import javax.validation.Valid; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") +public class StoreApiController implements StoreApi { + + private final StoreApiDelegate delegate; + + public StoreApiController(@Autowired(required = false) StoreApiDelegate delegate) { + this.delegate = Optional.ofNullable(delegate).orElse(new StoreApiDelegate() {}); + } + + @Override + public StoreApiDelegate getDelegate() { + return delegate; + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java new file mode 100644 index 00000000000..c21d319e495 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -0,0 +1,109 @@ +package org.openapitools.api; + +import java.util.Map; +import org.openapitools.model.Order; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +/** + * A delegate to be called by the {@link StoreApiController}}. + * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. + */ +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public interface StoreApiDelegate { + + default Optional getRequest() { + return Optional.empty(); + } + + /** + * DELETE /store/order/{orderId} : Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * + * @param orderId ID of the order that needs to be deleted (required) + * @return Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#deleteOrder + */ + default Void deleteOrder(String orderId) { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * GET /store/inventory : Returns pet inventories by status + * Returns a map of status codes to quantities + * + * @return successful operation (status code 200) + * @see StoreApi#getInventory + */ + default Map getInventory() { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * GET /store/order/{orderId} : Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + * + * @param orderId ID of pet that needs to be fetched (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#getOrderById + */ + default Order getOrderById(Long orderId) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * POST /store/order : Place an order for a pet + * + * + * @param order order placed for purchasing the pet (required) + * @return successful operation (status code 200) + * or Invalid Order (status code 400) + * @see StoreApi#placeOrder + */ + default Order placeOrder(Order order) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java new file mode 100644 index 00000000000..fae06a7612c --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java @@ -0,0 +1,294 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import java.util.List; +import java.time.OffsetDateTime; +import org.openapitools.model.User; +import io.swagger.annotations.*; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.Valid; +import javax.validation.constraints.*; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@Validated +@Api(value = "user", description = "Operations about user") +public interface UserApi { + + default UserApiDelegate getDelegate() { + return new UserApiDelegate() {}; + } + + /** + * POST /user : Create user + * This can only be done by the logged in user. + * + * @param user Created user object (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "user" }, + value = "Create user", + nickname = "createUser", + notes = "This can only be done by the logged in user.", + authorizations = { + @Authorization(value = "api_key") + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation") + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/user", + consumes = { "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default Void createUser( + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { + return getDelegate().createUser(user); + } + + + /** + * POST /user/createWithArray : Creates list of users with given input array + * + * + * @param user List of user object (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "user" }, + value = "Creates list of users with given input array", + nickname = "createUsersWithArrayInput", + notes = "", + authorizations = { + @Authorization(value = "api_key") + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation") + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/user/createWithArray", + consumes = { "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default Void createUsersWithArrayInput( + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user + ) { + return getDelegate().createUsersWithArrayInput(user); + } + + + /** + * POST /user/createWithList : Creates list of users with given input array + * + * + * @param user List of user object (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "user" }, + value = "Creates list of users with given input array", + nickname = "createUsersWithListInput", + notes = "", + authorizations = { + @Authorization(value = "api_key") + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation") + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/user/createWithList", + consumes = { "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default Void createUsersWithListInput( + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user + ) { + return getDelegate().createUsersWithListInput(user); + } + + + /** + * DELETE /user/{username} : Delete user + * This can only be done by the logged in user. + * + * @param username The name that needs to be deleted (required) + * @return Invalid username supplied (status code 400) + * or User not found (status code 404) + */ + @ApiOperation( + tags = { "user" }, + value = "Delete user", + nickname = "deleteUser", + notes = "This can only be done by the logged in user.", + authorizations = { + @Authorization(value = "api_key") + } + ) + @ApiResponses({ + @ApiResponse(code = 400, message = "Invalid username supplied"), + @ApiResponse(code = 404, message = "User not found") + }) + @RequestMapping( + method = RequestMethod.DELETE, + value = "/user/{username}" + ) + @ResponseStatus(HttpStatus.BAD_REQUEST) + default Void deleteUser( + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { + return getDelegate().deleteUser(username); + } + + + /** + * GET /user/{username} : Get user by user name + * + * + * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @return successful operation (status code 200) + * or Invalid username supplied (status code 400) + * or User not found (status code 404) + */ + @ApiOperation( + tags = { "user" }, + value = "Get user by user name", + nickname = "getUserByName", + notes = "", + response = User.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = User.class), + @ApiResponse(code = 400, message = "Invalid username supplied"), + @ApiResponse(code = 404, message = "User not found") + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/user/{username}", + produces = { "application/xml", "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default User getUserByName( + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { + return getDelegate().getUserByName(username); + } + + + /** + * GET /user/login : Logs user into the system + * + * + * @param username The user name for login (required) + * @param password The password for login in clear text (required) + * @return successful operation (status code 200) + * or Invalid username/password supplied (status code 400) + */ + @ApiOperation( + tags = { "user" }, + value = "Logs user into the system", + nickname = "loginUser", + notes = "", + response = String.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = String.class), + @ApiResponse(code = 400, message = "Invalid username/password supplied") + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/user/login", + produces = { "application/xml", "application/json" } + ) + @ResponseStatus(HttpStatus.OK) + default String loginUser( + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { + return getDelegate().loginUser(username, password); + } + + + /** + * GET /user/logout : Logs out current logged in user session + * + * + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "user" }, + value = "Logs out current logged in user session", + nickname = "logoutUser", + notes = "", + authorizations = { + @Authorization(value = "api_key") + } + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation") + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/user/logout" + ) + @ResponseStatus(HttpStatus.OK) + default Void logoutUser( + + ) { + return getDelegate().logoutUser(); + } + + + /** + * PUT /user/{username} : Updated user + * This can only be done by the logged in user. + * + * @param username name that need to be deleted (required) + * @param user Updated user object (required) + * @return Invalid user supplied (status code 400) + * or User not found (status code 404) + */ + @ApiOperation( + tags = { "user" }, + value = "Updated user", + nickname = "updateUser", + notes = "This can only be done by the logged in user.", + authorizations = { + @Authorization(value = "api_key") + } + ) + @ApiResponses({ + @ApiResponse(code = 400, message = "Invalid user supplied"), + @ApiResponse(code = 404, message = "User not found") + }) + @RequestMapping( + method = RequestMethod.PUT, + value = "/user/{username}", + consumes = { "application/json" } + ) + @ResponseStatus(HttpStatus.BAD_REQUEST) + default Void updateUser( + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { + return getDelegate().updateUser(username, user); + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiController.java new file mode 100644 index 00000000000..5c854245036 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiController.java @@ -0,0 +1,45 @@ +package org.openapitools.api; + +import java.util.List; +import java.time.OffsetDateTime; +import org.openapitools.model.User; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.*; +import javax.validation.Valid; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@Controller +@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") +public class UserApiController implements UserApi { + + private final UserApiDelegate delegate; + + public UserApiController(@Autowired(required = false) UserApiDelegate delegate) { + this.delegate = Optional.ofNullable(delegate).orElse(new UserApiDelegate() {}); + } + + @Override + public UserApiDelegate getDelegate() { + return delegate; + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java new file mode 100644 index 00000000000..4e0a9f3fed4 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -0,0 +1,153 @@ +package org.openapitools.api; + +import java.util.List; +import java.time.OffsetDateTime; +import org.openapitools.model.User; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +/** + * A delegate to be called by the {@link UserApiController}}. + * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. + */ +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public interface UserApiDelegate { + + default Optional getRequest() { + return Optional.empty(); + } + + /** + * POST /user : Create user + * This can only be done by the logged in user. + * + * @param user Created user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUser + */ + default Void createUser(User user) { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * POST /user/createWithArray : Creates list of users with given input array + * + * + * @param user List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithArrayInput + */ + default Void createUsersWithArrayInput(List user) { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * POST /user/createWithList : Creates list of users with given input array + * + * + * @param user List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithListInput + */ + default Void createUsersWithListInput(List user) { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * DELETE /user/{username} : Delete user + * This can only be done by the logged in user. + * + * @param username The name that needs to be deleted (required) + * @return Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#deleteUser + */ + default Void deleteUser(String username) { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * GET /user/{username} : Get user by user name + * + * + * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @return successful operation (status code 200) + * or Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#getUserByName + */ + default User getUserByName(String username) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 aeiou aeiou aeiou aeiou aeiou aeiou 123 "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * GET /user/login : Logs user into the system + * + * + * @param username The user name for login (required) + * @param password The password for login in clear text (required) + * @return successful operation (status code 200) + * or Invalid username/password supplied (status code 400) + * @see UserApi#loginUser + */ + default String loginUser(String username, + String password) { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * GET /user/logout : Logs out current logged in user session + * + * + * @return successful operation (status code 200) + * @see UserApi#logoutUser + */ + default Void logoutUser() { + throw new IllegalArgumentException("Not implemented"); + + } + + /** + * PUT /user/{username} : Updated user + * This can only be done by the logged in user. + * + * @param username name that need to be deleted (required) + * @param user Updated user object (required) + * @return Invalid user supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#updateUser + */ + default Void updateUser(String username, + User user) { + throw new IllegalArgumentException("Not implemented"); + + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/configuration/HomeController.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/configuration/HomeController.java new file mode 100644 index 00000000000..e390f86f5b7 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/configuration/HomeController.java @@ -0,0 +1,28 @@ +package org.openapitools.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * Home redirection to OpenAPI api documentation + */ +@Controller +public class HomeController { + + static final String API_DOCS_PATH = "/v2/api-docs"; + + @GetMapping(value = "/swagger-config.yaml", produces = "text/plain") + @ResponseBody + public String swaggerConfig() { + return "url: " + API_DOCS_PATH + "\n"; + } + + @RequestMapping("/") + public String index() { + return "redirect:swagger-ui.html"; + } + +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java new file mode 100644 index 00000000000..1fc96305a3e --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java @@ -0,0 +1,71 @@ +package org.openapitools.configuration; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import org.springframework.web.util.UriComponentsBuilder; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.paths.Paths; +import springfox.documentation.spring.web.paths.RelativePathProvider; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import javax.annotation.Generated; +import javax.servlet.ServletContext; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +@Configuration +@EnableSwagger2 +public class SpringFoxConfiguration { + + ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("OpenAPI Petstore") + .description("This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.") + .license("Apache-2.0") + .licenseUrl("https://www.apache.org/licenses/LICENSE-2.0.html") + .termsOfServiceUrl("") + .version("1.0.0") + .contact(new Contact("","", "")) + .build(); + } + + @Bean + public Docket customImplementation(ServletContext servletContext, @Value("${openapi.openAPIPetstore.base-path:/v2}") String basePath) { + return new Docket(DocumentationType.SWAGGER_2) + .select() + .apis(RequestHandlerSelectors.basePackage("org.openapitools.api")) + .build() + .pathProvider(new BasePathAwareRelativePathProvider(servletContext, basePath)) + .directModelSubstitute(java.time.LocalDate.class, java.sql.Date.class) + .directModelSubstitute(java.time.OffsetDateTime.class, java.util.Date.class) + .apiInfo(apiInfo()); + } + + class BasePathAwareRelativePathProvider extends RelativePathProvider { + private String basePath; + + public BasePathAwareRelativePathProvider(ServletContext servletContext, String basePath) { + super(servletContext); + this.basePath = basePath; + } + + @Override + protected String applicationPath() { + return Paths.removeAdjacentForwardSlashes(UriComponentsBuilder.fromPath(super.applicationPath()).path(basePath).build().toString()); + } + + @Override + public String getOperationPath(String operationPath) { + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromPath("/"); + return Paths.removeAdjacentForwardSlashes( + uriComponentsBuilder.path(operationPath.replaceFirst("^" + basePath, "")).build().toString()); + } + } + +} diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java new file mode 100644 index 00000000000..909b0aba4e3 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java @@ -0,0 +1,109 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * A category for a pet + */ + +@ApiModel(description = "A category for a pet") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class Category { + + @JsonProperty("id") + private Long id; + + @JsonProperty("name") + private String name; + + public Category id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + */ + + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Category name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @ApiModelProperty(value = "") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Category category = (Category) o; + return Objects.equals(this.id, category.id) && + Objects.equals(this.name, category.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Category {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java new file mode 100644 index 00000000000..52fb11fd3cf --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -0,0 +1,135 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * Describes the result of uploading an image resource + */ + +@ApiModel(description = "Describes the result of uploading an image resource") +@JsonTypeName("ApiResponse") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ModelApiResponse { + + @JsonProperty("code") + private Integer code; + + @JsonProperty("type") + private String type; + + @JsonProperty("message") + private String message; + + public ModelApiResponse code(Integer code) { + this.code = code; + return this; + } + + /** + * Get code + * @return code + */ + + @ApiModelProperty(value = "") + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public ModelApiResponse type(String type) { + this.type = type; + return this; + } + + /** + * Get type + * @return type + */ + + @ApiModelProperty(value = "") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public ModelApiResponse message(String message) { + this.message = message; + return this; + } + + /** + * Get message + * @return message + */ + + @ApiModelProperty(value = "") + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ModelApiResponse _apiResponse = (ModelApiResponse) o; + return Objects.equals(this.code, _apiResponse.code) && + Objects.equals(this.type, _apiResponse.type) && + Objects.equals(this.message, _apiResponse.message); + } + + @Override + public int hashCode() { + return Objects.hash(code, type, message); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ModelApiResponse {\n"); + sb.append(" code: ").append(toIndentedString(code)).append("\n"); + sb.append(" type: ").append(toIndentedString(type)).append("\n"); + sb.append(" message: ").append(toIndentedString(message)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java new file mode 100644 index 00000000000..66d9df6dfd9 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java @@ -0,0 +1,246 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; +import org.springframework.format.annotation.DateTimeFormat; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * An order for a pets from the pet store + */ + +@ApiModel(description = "An order for a pets from the pet store") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class Order { + + @JsonProperty("id") + private Long id; + + @JsonProperty("petId") + private Long petId; + + @JsonProperty("quantity") + private Integer quantity; + + @JsonProperty("shipDate") + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private OffsetDateTime shipDate; + + /** + * Order Status + */ + public enum StatusEnum { + PLACED("placed"), + + APPROVED("approved"), + + DELIVERED("delivered"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + @JsonProperty("status") + private StatusEnum status; + + @JsonProperty("complete") + private Boolean complete = false; + + public Order id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + */ + + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Order petId(Long petId) { + this.petId = petId; + return this; + } + + /** + * Get petId + * @return petId + */ + + @ApiModelProperty(value = "") + public Long getPetId() { + return petId; + } + + public void setPetId(Long petId) { + this.petId = petId; + } + + public Order quantity(Integer quantity) { + this.quantity = quantity; + return this; + } + + /** + * Get quantity + * @return quantity + */ + + @ApiModelProperty(value = "") + public Integer getQuantity() { + return quantity; + } + + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + public Order shipDate(OffsetDateTime shipDate) { + this.shipDate = shipDate; + return this; + } + + /** + * Get shipDate + * @return shipDate + */ + @Valid + @ApiModelProperty(value = "") + public OffsetDateTime getShipDate() { + return shipDate; + } + + public void setShipDate(OffsetDateTime shipDate) { + this.shipDate = shipDate; + } + + public Order status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * Order Status + * @return status + */ + + @ApiModelProperty(value = "Order Status") + public StatusEnum getStatus() { + return status; + } + + public void setStatus(StatusEnum status) { + this.status = status; + } + + public Order complete(Boolean complete) { + this.complete = complete; + return this; + } + + /** + * Get complete + * @return complete + */ + + @ApiModelProperty(value = "") + public Boolean getComplete() { + return complete; + } + + public void setComplete(Boolean complete) { + this.complete = complete; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Order order = (Order) o; + return Objects.equals(this.id, order.id) && + Objects.equals(this.petId, order.petId) && + Objects.equals(this.quantity, order.quantity) && + Objects.equals(this.shipDate, order.shipDate) && + Objects.equals(this.status, order.status) && + Objects.equals(this.complete, order.complete); + } + + @Override + public int hashCode() { + return Objects.hash(id, petId, quantity, shipDate, status, complete); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Order {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); + sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); + sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java new file mode 100644 index 00000000000..60af3a5b92a --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java @@ -0,0 +1,279 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.model.Category; +import org.openapitools.model.Tag; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * A pet for sale in the pet store + */ + +@ApiModel(description = "A pet for sale in the pet store") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class Pet { + + @JsonProperty("id") + private Long id; + + @JsonProperty("category") + private Category category; + + @JsonProperty("name") + private String name; + + @JsonProperty("photoUrls") + @Valid + private List photoUrls = new ArrayList<>(); + + @JsonProperty("tags") + @Valid + private List<@Valid Tag> tags = null; + + /** + * pet status in the store + */ + public enum StatusEnum { + AVAILABLE("available"), + + PENDING("pending"), + + SOLD("sold"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + @JsonProperty("status") + private StatusEnum status; + + /** + * Default constructor + * @deprecated Use {@link Pet#Pet(String, List)} + */ + @Deprecated + public Pet() { + super(); + } + + /** + * Constructor with only required parameters + */ + public Pet(String name, List photoUrls) { + this.name = name; + this.photoUrls = photoUrls; + } + + public Pet id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + */ + + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Pet category(Category category) { + this.category = category; + return this; + } + + /** + * Get category + * @return category + */ + @Valid + @ApiModelProperty(value = "") + public Category getCategory() { + return category; + } + + public void setCategory(Category category) { + this.category = category; + } + + public Pet name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @NotNull + @ApiModelProperty(example = "doggie", required = true, value = "") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Pet photoUrls(List photoUrls) { + this.photoUrls = photoUrls; + return this; + } + + public Pet addPhotoUrlsItem(String photoUrlsItem) { + this.photoUrls.add(photoUrlsItem); + return this; + } + + /** + * Get photoUrls + * @return photoUrls + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getPhotoUrls() { + return photoUrls; + } + + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + public Pet tags(List<@Valid Tag> tags) { + this.tags = tags; + return this; + } + + public Pet addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = new ArrayList<>(); + } + this.tags.add(tagsItem); + return this; + } + + /** + * Get tags + * @return tags + */ + @Valid + @ApiModelProperty(value = "") + public List<@Valid Tag> getTags() { + return tags; + } + + public void setTags(List<@Valid Tag> tags) { + this.tags = tags; + } + + public Pet status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * pet status in the store + * @return status + */ + + @ApiModelProperty(value = "pet status in the store") + public StatusEnum getStatus() { + return status; + } + + public void setStatus(StatusEnum status) { + this.status = status; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pet pet = (Pet) o; + return Objects.equals(this.id, pet.id) && + Objects.equals(this.category, pet.category) && + Objects.equals(this.name, pet.name) && + Objects.equals(this.photoUrls, pet.photoUrls) && + Objects.equals(this.tags, pet.tags) && + Objects.equals(this.status, pet.status); + } + + @Override + public int hashCode() { + return Objects.hash(id, category, name, photoUrls, tags, status); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pet {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" category: ").append(toIndentedString(category)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java new file mode 100644 index 00000000000..b30aa3fd9a2 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java @@ -0,0 +1,109 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * A tag for a pet + */ + +@ApiModel(description = "A tag for a pet") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class Tag { + + @JsonProperty("id") + private Long id; + + @JsonProperty("name") + private String name; + + public Tag id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + */ + + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Tag name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Tag tag = (Tag) o; + return Objects.equals(this.id, tag.id) && + Objects.equals(this.name, tag.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Tag {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java new file mode 100644 index 00000000000..8d71f0fcc04 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java @@ -0,0 +1,253 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * A User who is purchasing from the pet store + */ + +@ApiModel(description = "A User who is purchasing from the pet store") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class User { + + @JsonProperty("id") + private Long id; + + @JsonProperty("username") + private String username; + + @JsonProperty("firstName") + private String firstName; + + @JsonProperty("lastName") + private String lastName; + + @JsonProperty("email") + private String email; + + @JsonProperty("password") + private String password; + + @JsonProperty("phone") + private String phone; + + @JsonProperty("userStatus") + private Integer userStatus; + + public User id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + */ + + @ApiModelProperty(value = "") + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public User username(String username) { + this.username = username; + return this; + } + + /** + * Get username + * @return username + */ + + @ApiModelProperty(value = "") + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public User firstName(String firstName) { + this.firstName = firstName; + return this; + } + + /** + * Get firstName + * @return firstName + */ + + @ApiModelProperty(value = "") + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public User lastName(String lastName) { + this.lastName = lastName; + return this; + } + + /** + * Get lastName + * @return lastName + */ + + @ApiModelProperty(value = "") + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public User email(String email) { + this.email = email; + return this; + } + + /** + * Get email + * @return email + */ + + @ApiModelProperty(value = "") + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public User password(String password) { + this.password = password; + return this; + } + + /** + * Get password + * @return password + */ + + @ApiModelProperty(value = "") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public User phone(String phone) { + this.phone = phone; + return this; + } + + /** + * Get phone + * @return phone + */ + + @ApiModelProperty(value = "") + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public User userStatus(Integer userStatus) { + this.userStatus = userStatus; + return this; + } + + /** + * User Status + * @return userStatus + */ + + @ApiModelProperty(value = "User Status") + public Integer getUserStatus() { + return userStatus; + } + + public void setUserStatus(Integer userStatus) { + this.userStatus = userStatus; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(this.id, user.id) && + Objects.equals(this.username, user.username) && + Objects.equals(this.firstName, user.firstName) && + Objects.equals(this.lastName, user.lastName) && + Objects.equals(this.email, user.email) && + Objects.equals(this.password, user.password) && + Objects.equals(this.phone, user.phone) && + Objects.equals(this.userStatus, user.userStatus); + } + + @Override + public int hashCode() { + return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class User {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" username: ").append(toIndentedString(username)).append("\n"); + sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); + sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); + sb.append(" email: ").append(toIndentedString(email)).append("\n"); + sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); + sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/application.properties b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/application.properties new file mode 100644 index 00000000000..7e90813e59b --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/application.properties @@ -0,0 +1,3 @@ +server.port=8080 +spring.jackson.date-format=org.openapitools.RFC3339DateFormat +spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/openapi.yaml new file mode 100644 index 00000000000..65092456cbd --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/openapi.yaml @@ -0,0 +1,880 @@ +openapi: 3.0.0 +info: + description: "This is a sample server Petstore server. For this sample, you can\ + \ use the api key `special-key` to test the authorization filters." + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +externalDocs: + description: Find out more about Swagger + url: http://swagger.io +servers: +- url: http://petstore.swagger.io/v2 +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + x-content-type: application/json + x-accepts: application/json + x-tags: + - tag: pet + put: + description: "" + externalDocs: + description: API documentation for the updatePet operation + url: http://petstore.swagger.io/v2/doc/updatePet + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + x-content-type: application/json + x-accepts: application/json + x-tags: + - tag: pet + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - petstore_auth: + - read:pets + summary: Finds Pets by status + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - petstore_auth: + - read:pets + summary: Finds Pets by tags + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + x-content-type: application/x-www-form-urlencoded + x-accepts: application/json + x-tags: + - tag: pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + x-content-type: multipart/form-data + x-accepts: application/json + x-tags: + - tag: pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + x-accepts: application/json + x-tags: + - tag: store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + x-content-type: application/json + x-accepts: application/json + x-tags: + - tag: store + /store/order/{orderId}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: orderId + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + x-accepts: application/json + x-tags: + - tag: store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: orderId + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + x-accepts: application/json + x-tags: + - tag: store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Create user + tags: + - user + x-content-type: application/json + x-accepts: application/json + x-tags: + - tag: user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Creates list of users with given input array + tags: + - user + x-content-type: application/json + x-accepts: application/json + x-tags: + - tag: user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Creates list of users with given input array + tags: + - user + x-content-type: application/json + x-accepts: application/json + x-tags: + - tag: user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + pattern: "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$" + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + Set-Cookie: + description: Cookie authentication key for use with the `api_key` apiKey + authentication. + explode: false + schema: + example: AUTH_KEY=abcde12345; Path=/; HttpOnly + type: string + style: simple + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + x-accepts: application/json + x-tags: + - tag: user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Logs out current logged in user session + tags: + - user + x-accepts: application/json + x-tags: + - tag: user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - api_key: [] + summary: Delete user + tags: + - user + x-accepts: application/json + x-tags: + - tag: user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + x-accepts: application/json + x-tags: + - tag: user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + security: + - api_key: [] + summary: Updated user + tags: + - user + x-content-type: application/json + x-accepts: application/json + x-tags: + - tag: user +components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Order: + description: An order for a pets from the pet store + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2000-01-23T04:56:07.000+00:00 + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + title: Pet Order + type: object + xml: + name: Order + Category: + description: A category for a pet + example: + name: name + id: 6 + properties: + id: + format: int64 + type: integer + name: + pattern: "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$" + type: string + title: Pet category + type: object + xml: + name: Category + User: + description: A User who is purchasing from the pet store + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + phone: phone + id: 0 + email: email + username: username + properties: + id: + format: int64 + type: integer + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + title: a User + type: object + xml: + name: User + Tag: + description: A tag for a pet + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + title: Pet Tag + type: object + xml: + name: Tag + Pet: + description: A pet for sale in the pet store + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + deprecated: true + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + title: a Pet + type: object + xml: + name: Pet + ApiResponse: + description: Describes the result of uploading an image resource + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + title: An uploaded response + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/static/swagger-ui.html b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/static/swagger-ui.html new file mode 100644 index 00000000000..f85b6654f67 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/static/swagger-ui.html @@ -0,0 +1,60 @@ + + + + + + Swagger UI + + + + + + + +
          + + + + + + diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java new file mode 100644 index 00000000000..3681f67e770 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java @@ -0,0 +1,13 @@ +package org.openapitools; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class OpenApiGeneratorApplicationTests { + + @Test + void contextLoads() { + } + +} \ No newline at end of file From d0f7bd18ba157845358954877fa0ad021e0f7da6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 17 Mar 2023 10:16:17 +0800 Subject: [PATCH 057/131] [spring] fix default value for nullable containers (#14959) * fix default value, update spec to 3.0 * add tests for container default value * update java camel samples * remove samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable * remove ./bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml * remove samples/openapi3/server/petstore/springboot-useoptional * remove samples/openapi3/server/petstore/springboot-reactive * update github workflow * fix default in add, put operation --- .github/workflows/samples-spring.yaml | 2 - ...-boot-beanvalidation-no-nullable-oas3.yaml | 13 - ...pring-boot-beanvalidation-no-nullable.yaml | 3 +- bin/configs/spring-boot-beanvalidation.yaml | 2 +- ...t-defaultInterface-unhandledException.yaml | 2 +- bin/configs/spring-boot-delegate-j8.yaml | 2 +- bin/configs/spring-boot-delegate-oas3.yaml | 2 +- bin/configs/spring-boot-delegate.yaml | 2 +- .../spring-boot-implicitHeaders-oas3.yaml | 2 +- bin/configs/spring-boot-implicitHeaders.yaml | 2 +- bin/configs/spring-boot-reactive-oas3.yaml | 11 - bin/configs/spring-boot-reactive.yaml | 3 +- bin/configs/spring-boot-useoptional-oas3.yaml | 10 - bin/configs/spring-boot-useoptional.yaml | 3 +- bin/configs/spring-boot-virtualan.yaml | 2 +- bin/configs/spring-boot.yaml | 2 +- bin/configs/spring-cloud-oas3-fakeapi.yaml | 2 +- .../spring-http-interface-reactive.yaml | 2 +- bin/configs/spring-http-interface.yaml | 2 +- .../main/resources/JavaSpring/pojo.mustache | 10 +- ...ith-fake-endpoints-models-for-testing.yaml | 2417 ++++++++--------- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 32 +- .../api/FakeClassnameTags123Api.java | 4 +- .../java/org/openapitools/api/PetApi.java | 14 +- .../java/org/openapitools/api/StoreApi.java | 7 +- .../java/org/openapitools/api/UserApi.java | 29 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 218 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 36 +- .../api/FakeClassnameTags123Api.java | 4 +- .../java/org/openapitools/api/PetApi.java | 14 +- .../java/org/openapitools/api/StoreApi.java | 7 +- .../java/org/openapitools/api/UserApi.java | 29 +- .../model/AdditionalPropertiesClassDto.java | 42 +- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 6 +- .../model/ContainerDefaultValueDto.java | 203 ++ .../org/openapitools/model/EnumArraysDto.java | 2 +- .../model/FileSchemaTestClassDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 8 +- ...ertiesAndAdditionalPropertiesClassDto.java | 2 +- .../java/org/openapitools/model/PetDto.java | 5 +- .../model/SpecialModelNameDto.java | 6 +- .../model/TypeHolderDefaultDto.java | 9 +- .../model/TypeHolderExampleDto.java | 3 + .../org/openapitools/model/XmlItemDto.java | 18 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 38 +- .../api/FakeClassnameTags123Api.java | 4 +- .../java/org/openapitools/api/PetApi.java | 20 +- .../java/org/openapitools/api/StoreApi.java | 9 +- .../java/org/openapitools/api/UserApi.java | 38 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 207 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../.openapi-generator-ignore | 23 - .../.openapi-generator/FILES | 71 - .../.openapi-generator/VERSION | 1 - .../README.md | 21 - .../pom.xml | 75 - .../OpenApiGeneratorApplication.java | 24 - .../org/openapitools/RFC3339DateFormat.java | 38 - .../org/openapitools/api/AnotherFakeApi.java | 84 - .../api/AnotherFakeApiController.java | 46 - .../java/org/openapitools/api/ApiUtil.java | 19 - .../java/org/openapitools/api/FakeApi.java | 588 ---- .../openapitools/api/FakeApiController.java | 56 - .../api/FakeClassnameTestApi.java | 87 - .../api/FakeClassnameTestApiController.java | 46 - .../java/org/openapitools/api/PetApi.java | 383 --- .../openapitools/api/PetApiController.java | 48 - .../java/org/openapitools/api/StoreApi.java | 203 -- .../openapitools/api/StoreApiController.java | 47 - .../java/org/openapitools/api/UserApi.java | 294 -- .../openapitools/api/UserApiController.java | 48 - .../EnumConverterConfiguration.java | 32 - .../configuration/HomeController.java | 20 - .../configuration/SpringDocConfiguration.java | 52 - .../model/AdditionalPropertiesAnyType.java | 86 - .../model/AdditionalPropertiesArray.java | 87 - .../model/AdditionalPropertiesBoolean.java | 86 - .../model/AdditionalPropertiesClass.java | 398 --- .../model/AdditionalPropertiesInteger.java | 86 - .../model/AdditionalPropertiesNumber.java | 87 - .../model/AdditionalPropertiesObject.java | 86 - .../model/AdditionalPropertiesString.java | 86 - .../java/org/openapitools/model/Animal.java | 139 - .../model/ArrayOfArrayOfNumberOnly.java | 94 - .../openapitools/model/ArrayOfNumberOnly.java | 94 - .../org/openapitools/model/ArrayTest.java | 160 -- .../java/org/openapitools/model/BigCat.java | 160 -- .../org/openapitools/model/BigCatAllOf.java | 124 - .../openapitools/model/Capitalization.java | 202 -- .../main/java/org/openapitools/model/Cat.java | 124 - .../java/org/openapitools/model/CatAllOf.java | 84 - .../java/org/openapitools/model/Category.java | 122 - .../org/openapitools/model/ClassModel.java | 83 - .../java/org/openapitools/model/Client.java | 82 - .../main/java/org/openapitools/model/Dog.java | 115 - .../java/org/openapitools/model/DogAllOf.java | 84 - .../org/openapitools/model/EnumArrays.java | 188 -- .../org/openapitools/model/EnumClass.java | 57 - .../java/org/openapitools/model/EnumTest.java | 342 --- .../java/org/openapitools/model/File.java | 83 - .../model/FileSchemaTestClass.java | 118 - .../org/openapitools/model/FormatTest.java | 433 --- .../openapitools/model/HasOnlyReadOnly.java | 108 - .../java/org/openapitools/model/MapTest.java | 228 -- ...ropertiesAndAdditionalPropertiesClass.java | 146 - .../openapitools/model/Model200Response.java | 109 - .../openapitools/model/ModelApiResponse.java | 132 - .../org/openapitools/model/ModelFile.java | 82 - .../org/openapitools/model/ModelList.java | 84 - .../org/openapitools/model/ModelReturn.java | 85 - .../java/org/openapitools/model/Name.java | 171 -- .../org/openapitools/model/NumberOnly.java | 83 - .../java/org/openapitools/model/Order.java | 243 -- .../openapitools/model/OuterComposite.java | 131 - .../org/openapitools/model/OuterEnum.java | 57 - .../main/java/org/openapitools/model/Pet.java | 283 -- .../org/openapitools/model/ReadOnlyFirst.java | 106 - .../openapitools/model/SpecialModelName.java | 84 - .../main/java/org/openapitools/model/Tag.java | 106 - .../openapitools/model/TypeHolderDefault.java | 210 -- .../openapitools/model/TypeHolderExample.java | 235 -- .../java/org/openapitools/model/User.java | 250 -- .../java/org/openapitools/model/XmlItem.java | 838 ------ .../src/main/resources/application.properties | 3 - .../OpenApiGeneratorApplicationTests.java | 13 - .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 6 +- .../api/AnotherFakeApiDelegate.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 52 +- .../org/openapitools/api/FakeApiDelegate.java | 25 +- .../api/FakeClassnameTestApi.java | 6 +- .../api/FakeClassnameTestApiDelegate.java | 4 +- .../java/org/openapitools/api/PetApi.java | 22 +- .../org/openapitools/api/PetApiDelegate.java | 13 +- .../java/org/openapitools/api/StoreApi.java | 11 +- .../openapitools/api/StoreApiDelegate.java | 5 +- .../java/org/openapitools/api/UserApi.java | 46 +- .../org/openapitools/api/UserApiDelegate.java | 21 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 224 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 40 +- .../api/FakeClassnameTestApi.java | 4 +- .../java/org/openapitools/api/PetApi.java | 18 +- .../java/org/openapitools/api/StoreApi.java | 9 +- .../java/org/openapitools/api/UserApi.java | 38 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 224 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../.openapi-generator-ignore | 23 - .../.openapi-generator/FILES | 76 - .../.openapi-generator/VERSION | 1 - .../petstore/springboot-reactive/README.md | 21 - .../petstore/springboot-reactive/pom.xml | 80 - .../OpenApiGeneratorApplication.java | 30 - .../org/openapitools/RFC3339DateFormat.java | 38 - .../org/openapitools/api/AnotherFakeApi.java | 75 - .../api/AnotherFakeApiController.java | 44 - .../api/AnotherFakeApiDelegate.java | 53 - .../java/org/openapitools/api/ApiUtil.java | 20 - .../java/org/openapitools/api/FakeApi.java | 561 ---- .../openapitools/api/FakeApiController.java | 54 - .../org/openapitools/api/FakeApiDelegate.java | 365 --- .../api/FakeClassnameTestApi.java | 78 - .../api/FakeClassnameTestApiController.java | 44 - .../api/FakeClassnameTestApiDelegate.java | 53 - .../java/org/openapitools/api/PetApi.java | 332 --- .../openapitools/api/PetApiController.java | 46 - .../org/openapitools/api/PetApiDelegate.java | 219 -- .../java/org/openapitools/api/StoreApi.java | 174 -- .../openapitools/api/StoreApiController.java | 45 - .../openapitools/api/StoreApiDelegate.java | 120 - .../java/org/openapitools/api/UserApi.java | 279 -- .../openapitools/api/UserApiController.java | 46 - .../org/openapitools/api/UserApiDelegate.java | 174 -- .../EnumConverterConfiguration.java | 32 - .../configuration/HomeController.java | 29 - .../model/AdditionalPropertiesAnyType.java | 87 - .../model/AdditionalPropertiesArray.java | 88 - .../model/AdditionalPropertiesBoolean.java | 87 - .../model/AdditionalPropertiesClass.java | 399 --- .../model/AdditionalPropertiesInteger.java | 87 - .../model/AdditionalPropertiesNumber.java | 88 - .../model/AdditionalPropertiesObject.java | 87 - .../model/AdditionalPropertiesString.java | 87 - .../java/org/openapitools/model/Animal.java | 140 - .../model/ArrayOfArrayOfNumberOnly.java | 95 - .../openapitools/model/ArrayOfNumberOnly.java | 95 - .../org/openapitools/model/ArrayTest.java | 161 -- .../java/org/openapitools/model/BigCat.java | 161 -- .../org/openapitools/model/BigCatAllOf.java | 125 - .../openapitools/model/Capitalization.java | 203 -- .../main/java/org/openapitools/model/Cat.java | 125 - .../java/org/openapitools/model/CatAllOf.java | 85 - .../java/org/openapitools/model/Category.java | 123 - .../org/openapitools/model/ClassModel.java | 84 - .../java/org/openapitools/model/Client.java | 83 - .../main/java/org/openapitools/model/Dog.java | 116 - .../java/org/openapitools/model/DogAllOf.java | 85 - .../org/openapitools/model/EnumArrays.java | 189 -- .../org/openapitools/model/EnumClass.java | 58 - .../java/org/openapitools/model/EnumTest.java | 343 --- .../java/org/openapitools/model/File.java | 84 - .../model/FileSchemaTestClass.java | 119 - .../org/openapitools/model/FormatTest.java | 434 --- .../openapitools/model/HasOnlyReadOnly.java | 109 - .../java/org/openapitools/model/MapTest.java | 229 -- ...ropertiesAndAdditionalPropertiesClass.java | 147 - .../openapitools/model/Model200Response.java | 110 - .../openapitools/model/ModelApiResponse.java | 133 - .../org/openapitools/model/ModelFile.java | 84 - .../org/openapitools/model/ModelList.java | 85 - .../org/openapitools/model/ModelReturn.java | 86 - .../java/org/openapitools/model/Name.java | 172 -- .../org/openapitools/model/NumberOnly.java | 84 - .../java/org/openapitools/model/Order.java | 244 -- .../openapitools/model/OuterComposite.java | 132 - .../org/openapitools/model/OuterEnum.java | 58 - .../main/java/org/openapitools/model/Pet.java | 281 -- .../org/openapitools/model/ReadOnlyFirst.java | 107 - .../openapitools/model/SpecialModelName.java | 85 - .../main/java/org/openapitools/model/Tag.java | 107 - .../openapitools/model/TypeHolderDefault.java | 208 -- .../openapitools/model/TypeHolderExample.java | 233 -- .../java/org/openapitools/model/User.java | 251 -- .../java/org/openapitools/model/XmlItem.java | 839 ------ .../src/main/resources/application.properties | 3 - .../src/main/resources/openapi.yaml | 2285 ---------------- .../OpenApiGeneratorApplicationTests.java | 13 - .../main/java/org/openapitools/model/Pet.java | 5 +- .../.openapi-generator-ignore | 23 - .../.openapi-generator/FILES | 71 - .../.openapi-generator/VERSION | 1 - .../petstore/springboot-useoptional/README.md | 21 - .../petstore/springboot-useoptional/pom.xml | 80 - .../OpenApiGeneratorApplication.java | 30 - .../org/openapitools/RFC3339DateFormat.java | 38 - .../org/openapitools/api/AnotherFakeApi.java | 84 - .../api/AnotherFakeApiController.java | 46 - .../java/org/openapitools/api/ApiUtil.java | 19 - .../java/org/openapitools/api/FakeApi.java | 588 ---- .../openapitools/api/FakeApiController.java | 56 - .../api/FakeClassnameTestApi.java | 87 - .../api/FakeClassnameTestApiController.java | 46 - .../java/org/openapitools/api/PetApi.java | 383 --- .../openapitools/api/PetApiController.java | 48 - .../java/org/openapitools/api/StoreApi.java | 203 -- .../openapitools/api/StoreApiController.java | 47 - .../java/org/openapitools/api/UserApi.java | 294 -- .../openapitools/api/UserApiController.java | 48 - .../EnumConverterConfiguration.java | 32 - .../configuration/HomeController.java | 20 - .../configuration/SpringDocConfiguration.java | 52 - .../model/AdditionalPropertiesAnyType.java | 87 - .../model/AdditionalPropertiesArray.java | 88 - .../model/AdditionalPropertiesBoolean.java | 87 - .../model/AdditionalPropertiesClass.java | 399 --- .../model/AdditionalPropertiesInteger.java | 87 - .../model/AdditionalPropertiesNumber.java | 88 - .../model/AdditionalPropertiesObject.java | 87 - .../model/AdditionalPropertiesString.java | 87 - .../java/org/openapitools/model/Animal.java | 140 - .../model/ArrayOfArrayOfNumberOnly.java | 95 - .../openapitools/model/ArrayOfNumberOnly.java | 95 - .../org/openapitools/model/ArrayTest.java | 161 -- .../java/org/openapitools/model/BigCat.java | 161 -- .../org/openapitools/model/BigCatAllOf.java | 125 - .../openapitools/model/Capitalization.java | 203 -- .../main/java/org/openapitools/model/Cat.java | 125 - .../java/org/openapitools/model/CatAllOf.java | 85 - .../java/org/openapitools/model/Category.java | 123 - .../org/openapitools/model/ClassModel.java | 84 - .../java/org/openapitools/model/Client.java | 83 - .../main/java/org/openapitools/model/Dog.java | 116 - .../java/org/openapitools/model/DogAllOf.java | 85 - .../org/openapitools/model/EnumArrays.java | 189 -- .../org/openapitools/model/EnumClass.java | 58 - .../java/org/openapitools/model/EnumTest.java | 343 --- .../java/org/openapitools/model/File.java | 84 - .../model/FileSchemaTestClass.java | 119 - .../org/openapitools/model/FormatTest.java | 434 --- .../openapitools/model/HasOnlyReadOnly.java | 109 - .../java/org/openapitools/model/MapTest.java | 229 -- ...ropertiesAndAdditionalPropertiesClass.java | 147 - .../openapitools/model/Model200Response.java | 110 - .../openapitools/model/ModelApiResponse.java | 133 - .../org/openapitools/model/ModelFile.java | 84 - .../org/openapitools/model/ModelList.java | 85 - .../org/openapitools/model/ModelReturn.java | 86 - .../java/org/openapitools/model/Name.java | 172 -- .../org/openapitools/model/NumberOnly.java | 84 - .../java/org/openapitools/model/Order.java | 244 -- .../openapitools/model/OuterComposite.java | 132 - .../org/openapitools/model/OuterEnum.java | 58 - .../main/java/org/openapitools/model/Pet.java | 281 -- .../org/openapitools/model/ReadOnlyFirst.java | 107 - .../openapitools/model/SpecialModelName.java | 85 - .../main/java/org/openapitools/model/Tag.java | 107 - .../openapitools/model/TypeHolderDefault.java | 208 -- .../openapitools/model/TypeHolderExample.java | 233 -- .../java/org/openapitools/model/User.java | 251 -- .../java/org/openapitools/model/XmlItem.java | 839 ------ .../src/main/resources/application.properties | 3 - .../src/main/resources/openapi.yaml | 2285 ---------------- .../OpenApiGeneratorApplicationTests.java | 13 - .../main/java/org/openapitools/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 40 +- .../api/FakeClassnameTestApi.java | 4 +- .../java/org/openapitools/api/PetApi.java | 18 +- .../java/org/openapitools/api/StoreApi.java | 9 +- .../java/org/openapitools/api/UserApi.java | 38 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 224 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ObjectWithUniqueItems.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../.openapi-generator/FILES | 1 + .../pom.xml | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 37 +- .../api/FakeClassnameTestApi.java | 4 +- .../java/org/openapitools/api/PetApi.java | 13 +- .../java/org/openapitools/api/StoreApi.java | 8 +- .../java/org/openapitools/api/UserApi.java | 33 +- .../model/AdditionalPropertiesClass.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 210 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 8 +- .../openapitools/model/TypeHolderExample.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 37 +- .../api/FakeClassnameTestApi.java | 4 +- .../java/org/openapitools/api/PetApi.java | 13 +- .../java/org/openapitools/api/StoreApi.java | 8 +- .../java/org/openapitools/api/UserApi.java | 33 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 225 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 6 +- .../api/AnotherFakeApiDelegate.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 49 +- .../org/openapitools/api/FakeApiDelegate.java | 25 +- .../api/FakeClassnameTestApi.java | 6 +- .../api/FakeClassnameTestApiDelegate.java | 4 +- .../java/org/openapitools/api/PetApi.java | 17 +- .../org/openapitools/api/PetApiDelegate.java | 13 +- .../java/org/openapitools/api/StoreApi.java | 10 +- .../openapitools/api/StoreApiDelegate.java | 5 +- .../java/org/openapitools/api/UserApi.java | 41 +- .../org/openapitools/api/UserApiDelegate.java | 21 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 225 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 6 +- .../api/AnotherFakeApiDelegate.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 49 +- .../org/openapitools/api/FakeApiDelegate.java | 25 +- .../api/FakeClassnameTestApi.java | 6 +- .../api/FakeClassnameTestApiDelegate.java | 4 +- .../java/org/openapitools/api/PetApi.java | 17 +- .../org/openapitools/api/PetApiDelegate.java | 13 +- .../java/org/openapitools/api/StoreApi.java | 10 +- .../openapitools/api/StoreApiDelegate.java | 5 +- .../java/org/openapitools/api/UserApi.java | 41 +- .../org/openapitools/api/UserApiDelegate.java | 21 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 225 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../main/java/org/openapitools/model/Pet.java | 5 +- .../.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 37 +- .../api/FakeClassnameTestApi.java | 4 +- .../java/org/openapitools/api/PetApi.java | 13 +- .../java/org/openapitools/api/StoreApi.java | 8 +- .../java/org/openapitools/api/UserApi.java | 33 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 225 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../.openapi-generator/FILES | 1 + .../petstore/springboot-reactive/pom.xml | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 6 +- .../api/AnotherFakeApiDelegate.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 49 +- .../org/openapitools/api/FakeApiDelegate.java | 35 +- .../api/FakeClassnameTestApi.java | 6 +- .../api/FakeClassnameTestApiDelegate.java | 6 +- .../java/org/openapitools/api/PetApi.java | 17 +- .../org/openapitools/api/PetApiDelegate.java | 17 +- .../java/org/openapitools/api/StoreApi.java | 10 +- .../openapitools/api/StoreApiDelegate.java | 7 +- .../java/org/openapitools/api/UserApi.java | 41 +- .../org/openapitools/api/UserApiDelegate.java | 29 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 225 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../model/AdditionalPropertiesClass.java | 16 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/AdditionalPropertiesClass.java | 16 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/AdditionalPropertiesClass.java | 16 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/AdditionalPropertiesClass.java | 16 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../.openapi-generator/FILES | 1 + .../petstore/springboot-useoptional/pom.xml | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 37 +- .../api/FakeClassnameTestApi.java | 4 +- .../java/org/openapitools/api/PetApi.java | 13 +- .../java/org/openapitools/api/StoreApi.java | 8 +- .../java/org/openapitools/api/UserApi.java | 33 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 225 ++ .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 9 +- .../openapitools/model/TypeHolderExample.java | 5 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../.openapi-generator/FILES | 1 + .../virtualan/api/AnotherFakeApi.java | 4 +- .../openapitools/virtualan/api/FakeApi.java | 40 +- .../virtualan/api/FakeClassnameTestApi.java | 4 +- .../openapitools/virtualan/api/PetApi.java | 18 +- .../openapitools/virtualan/api/StoreApi.java | 9 +- .../openapitools/virtualan/api/UserApi.java | 38 +- .../model/AdditionalPropertiesClass.java | 42 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayTest.java | 6 +- .../model/ContainerDefaultValue.java | 224 ++ .../virtualan/model/EnumArrays.java | 2 +- .../virtualan/model/FileSchemaTestClass.java | 2 +- .../openapitools/virtualan/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../org/openapitools/virtualan/model/Pet.java | 5 +- .../virtualan/model/SpecialModelName.java | 6 +- .../virtualan/model/TypeHolderDefault.java | 9 +- .../virtualan/model/TypeHolderExample.java | 5 +- .../openapitools/virtualan/model/XmlItem.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- .../springboot/.openapi-generator/FILES | 1 + .../org/openapitools/api/AnotherFakeApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 41 +- .../api/FakeClassnameTestApi.java | 4 +- .../java/org/openapitools/api/PetApi.java | 13 +- .../java/org/openapitools/api/StoreApi.java | 8 +- .../java/org/openapitools/api/UserApi.java | 33 +- .../model/AdditionalPropertiesClassDto.java | 42 +- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 6 +- .../model/ContainerDefaultValueDto.java | 227 ++ .../org/openapitools/model/EnumArraysDto.java | 2 +- .../model/FileSchemaTestClassDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 8 +- ...ertiesAndAdditionalPropertiesClassDto.java | 2 +- .../java/org/openapitools/model/PetDto.java | 5 +- .../model/SpecialModelNameDto.java | 6 +- .../model/TypeHolderDefaultDto.java | 9 +- .../model/TypeHolderExampleDto.java | 5 +- .../org/openapitools/model/XmlItemDto.java | 18 +- .../src/main/resources/openapi.yaml | 347 +-- 669 files changed, 8763 insertions(+), 40246 deletions(-) delete mode 100644 bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml delete mode 100644 bin/configs/spring-boot-reactive-oas3.yaml delete mode 100644 bin/configs/spring-boot-useoptional-oas3.yaml rename samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml => modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml (57%) create mode 100644 samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java create mode 100644 samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator-ignore delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/README.md delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/pom.xml delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/OpenApiGeneratorApplication.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/RFC3339DateFormat.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/ApiUtil.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/HomeController.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelFile.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterEnum.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/application.properties delete mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java create mode 100644 samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/.openapi-generator-ignore delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/README.md delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/pom.xml delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/OpenApiGeneratorApplication.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/RFC3339DateFormat.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/ApiUtil.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/HomeController.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelFile.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterEnum.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/resources/application.properties delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml delete mode 100644 samples/openapi3/server/petstore/springboot-reactive/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator-ignore delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/README.md delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/pom.xml delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/OpenApiGeneratorApplication.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/RFC3339DateFormat.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/ApiUtil.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/HomeController.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelFile.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterEnum.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/application.properties delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml delete mode 100644 samples/openapi3/server/petstore/springboot-useoptional/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java create mode 100644 samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java create mode 100644 samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java diff --git a/.github/workflows/samples-spring.yaml b/.github/workflows/samples-spring.yaml index c3d4dac6dea..104e244a112 100644 --- a/.github/workflows/samples-spring.yaml +++ b/.github/workflows/samples-spring.yaml @@ -30,9 +30,7 @@ jobs: - samples/openapi3/server/petstore/springboot - samples/server/petstore/springboot-beanvalidation - samples/server/petstore/springboot-useoptional - - samples/openapi3/server/petstore/springboot-useoptional - samples/server/petstore/springboot-reactive - - samples/openapi3/server/petstore/springboot-reactive - samples/server/petstore/springboot-implicitHeaders - samples/openapi3/server/petstore/springboot-implicitHeaders - samples/server/petstore/springboot-delegate diff --git a/bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml b/bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml deleted file mode 100644 index b1e5245ae85..00000000000 --- a/bin/configs/spring-boot-beanvalidation-no-nullable-oas3.yaml +++ /dev/null @@ -1,13 +0,0 @@ -generatorName: spring -outputDir: samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable -library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -additionalProperties: - groupId: org.openapitools.openapi3 - documentationProvider: springdoc - java8: "false" - useBeanValidation: true - artifactId: spring-boot-beanvalidation-no-nullable - hideGenerationTimestamp: "true" - openApiNullable: "false" diff --git a/bin/configs/spring-boot-beanvalidation-no-nullable.yaml b/bin/configs/spring-boot-beanvalidation-no-nullable.yaml index 1457469bc72..718b0a87e9d 100644 --- a/bin/configs/spring-boot-beanvalidation-no-nullable.yaml +++ b/bin/configs/spring-boot-beanvalidation-no-nullable.yaml @@ -1,9 +1,10 @@ generatorName: spring outputDir: samples/server/petstore/springboot-beanvalidation-no-nullable library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + groupId: org.openapitools.openapi3 documentationProvider: springfox java8: "false" useBeanValidation: true diff --git a/bin/configs/spring-boot-beanvalidation.yaml b/bin/configs/spring-boot-beanvalidation.yaml index 4a5daef5845..b43f22721a1 100644 --- a/bin/configs/spring-boot-beanvalidation.yaml +++ b/bin/configs/spring-boot-beanvalidation.yaml @@ -1,7 +1,7 @@ generatorName: spring outputDir: samples/server/petstore/springboot-beanvalidation library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: documentationProvider: springfox diff --git a/bin/configs/spring-boot-defaultInterface-unhandledException.yaml b/bin/configs/spring-boot-defaultInterface-unhandledException.yaml index 3d492c12f76..9e096062883 100644 --- a/bin/configs/spring-boot-defaultInterface-unhandledException.yaml +++ b/bin/configs/spring-boot-defaultInterface-unhandledException.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/server/petstore/spring-boot-defaultInterface-unhandledException -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: spring-boot-defaultInterface-unhandledException diff --git a/bin/configs/spring-boot-delegate-j8.yaml b/bin/configs/spring-boot-delegate-j8.yaml index e1fae5805cd..be11dd0dec0 100644 --- a/bin/configs/spring-boot-delegate-j8.yaml +++ b/bin/configs/spring-boot-delegate-j8.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/server/petstore/springboot-delegate-j8 -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: documentationProvider: springfox diff --git a/bin/configs/spring-boot-delegate-oas3.yaml b/bin/configs/spring-boot-delegate-oas3.yaml index 8b604d558a9..28ba653ad08 100644 --- a/bin/configs/spring-boot-delegate-oas3.yaml +++ b/bin/configs/spring-boot-delegate-oas3.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/openapi3/server/petstore/springboot-delegate -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: groupId: org.openapitools.openapi3 diff --git a/bin/configs/spring-boot-delegate.yaml b/bin/configs/spring-boot-delegate.yaml index 228b14d823e..56199a182d1 100644 --- a/bin/configs/spring-boot-delegate.yaml +++ b/bin/configs/spring-boot-delegate.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/server/petstore/springboot-delegate -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: documentationProvider: springfox diff --git a/bin/configs/spring-boot-implicitHeaders-oas3.yaml b/bin/configs/spring-boot-implicitHeaders-oas3.yaml index 3d9423cd326..6d204b53c55 100644 --- a/bin/configs/spring-boot-implicitHeaders-oas3.yaml +++ b/bin/configs/spring-boot-implicitHeaders-oas3.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/openapi3/server/petstore/springboot-implicitHeaders -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: groupId: org.openapitools.openapi3 diff --git a/bin/configs/spring-boot-implicitHeaders.yaml b/bin/configs/spring-boot-implicitHeaders.yaml index d870353a0ff..b9a1a81c146 100644 --- a/bin/configs/spring-boot-implicitHeaders.yaml +++ b/bin/configs/spring-boot-implicitHeaders.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/server/petstore/springboot-implicitHeaders -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: springboot-implicitHeaders diff --git a/bin/configs/spring-boot-reactive-oas3.yaml b/bin/configs/spring-boot-reactive-oas3.yaml deleted file mode 100644 index 3e3fb91657b..00000000000 --- a/bin/configs/spring-boot-reactive-oas3.yaml +++ /dev/null @@ -1,11 +0,0 @@ -generatorName: spring -outputDir: samples/openapi3/server/petstore/springboot-reactive -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -additionalProperties: - groupId: org.openapitools.openapi3 - documentationProvider: springdoc - artifactId: springboot-reactive - reactive: "true" - hideGenerationTimestamp: "true" - delegatePattern: "true" diff --git a/bin/configs/spring-boot-reactive.yaml b/bin/configs/spring-boot-reactive.yaml index b3edff7de11..ed5a1e56239 100644 --- a/bin/configs/spring-boot-reactive.yaml +++ b/bin/configs/spring-boot-reactive.yaml @@ -1,8 +1,9 @@ generatorName: spring outputDir: samples/server/petstore/springboot-reactive -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + groupId: org.openapitools.openapi3 artifactId: springboot-reactive documentationProvider: springfox reactive: "true" diff --git a/bin/configs/spring-boot-useoptional-oas3.yaml b/bin/configs/spring-boot-useoptional-oas3.yaml deleted file mode 100644 index ac66d1df148..00000000000 --- a/bin/configs/spring-boot-useoptional-oas3.yaml +++ /dev/null @@ -1,10 +0,0 @@ -generatorName: spring -outputDir: samples/openapi3/server/petstore/springboot-useoptional -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -additionalProperties: - groupId: org.openapitools.openapi3 - documentationProvider: springdoc - useOptional: true - artifactId: spring-boot-useoptional - hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-boot-useoptional.yaml b/bin/configs/spring-boot-useoptional.yaml index 1e028977898..2b3dbdc1a86 100644 --- a/bin/configs/spring-boot-useoptional.yaml +++ b/bin/configs/spring-boot-useoptional.yaml @@ -1,8 +1,9 @@ generatorName: spring outputDir: samples/server/petstore/springboot-useoptional -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + groupId: org.openapitools.openapi3 documentationProvider: springfox useOptional: true artifactId: spring-boot-useoptional diff --git a/bin/configs/spring-boot-virtualan.yaml b/bin/configs/spring-boot-virtualan.yaml index f1ae90fa859..87a2e30fb91 100644 --- a/bin/configs/spring-boot-virtualan.yaml +++ b/bin/configs/spring-boot-virtualan.yaml @@ -1,7 +1,7 @@ generatorName: spring outputDir: samples/server/petstore/springboot-virtualan library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: documentationProvider: springdoc diff --git a/bin/configs/spring-boot.yaml b/bin/configs/spring-boot.yaml index 8d3e101cead..3480d1ba174 100644 --- a/bin/configs/spring-boot.yaml +++ b/bin/configs/spring-boot.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/server/petstore/springboot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: documentationProvider: springfox diff --git a/bin/configs/spring-cloud-oas3-fakeapi.yaml b/bin/configs/spring-cloud-oas3-fakeapi.yaml index 5d919d03f24..810aeff5997 100644 --- a/bin/configs/spring-cloud-oas3-fakeapi.yaml +++ b/bin/configs/spring-cloud-oas3-fakeapi.yaml @@ -1,7 +1,7 @@ generatorName: spring library: spring-cloud outputDir: samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: groupId: org.openapitools.openapi3 diff --git a/bin/configs/spring-http-interface-reactive.yaml b/bin/configs/spring-http-interface-reactive.yaml index 749d6fbf08d..d3cbf25f547 100644 --- a/bin/configs/spring-http-interface-reactive.yaml +++ b/bin/configs/spring-http-interface-reactive.yaml @@ -1,7 +1,7 @@ generatorName: spring library: spring-http-interface outputDir: samples/client/petstore/spring-http-interface-reactive -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: spring-http-interface-reactive diff --git a/bin/configs/spring-http-interface.yaml b/bin/configs/spring-http-interface.yaml index 9c92a629592..39cfec2307f 100644 --- a/bin/configs/spring-http-interface.yaml +++ b/bin/configs/spring-http-interface.yaml @@ -1,7 +1,7 @@ generatorName: spring library: spring-http-interface outputDir: samples/client/petstore/spring-http-interface -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: spring-http-interface diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 5d1e340e754..796178329b6 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -59,10 +59,10 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{#isContainer}} {{#useBeanValidation}}@Valid{{/useBeanValidation}} {{#openApiNullable}} - private {{>nullableDataType}} {{name}} = {{#isNullable}}JsonNullable.undefined(){{/isNullable}}{{^isNullable}}{{#required}}{{{defaultValue}}}{{/required}}{{^required}}null{{/required}}{{/isNullable}}; + private {{>nullableDataType}} {{name}}{{#isNullable}} = JsonNullable.undefined(){{/isNullable}}{{^isNullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isNullable}}; {{/openApiNullable}} {{^openApiNullable}} - private {{>nullableDataType}} {{name}} = {{#required}}{{{defaultValue}}}{{/required}}{{^required}}null{{/required}}; + private {{>nullableDataType}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; {{/openApiNullable}} {{/isContainer}} {{^isContainer}} @@ -128,16 +128,14 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#openApiNullable}} - {{^required}} if (this.{{name}} == null{{#isNullable}} || !this.{{name}}.isPresent(){{/isNullable}}) { this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}{{#isNullable}}){{/isNullable}}; } - {{/required}} this.{{name}}{{#isNullable}}.get(){{/isNullable}}.add({{name}}Item); {{/openApiNullable}} {{^openApiNullable}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } this.{{name}}.add({{name}}Item); {{/openApiNullable}} @@ -147,11 +145,9 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml similarity index 57% rename from samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml rename to modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml index 658d8a96b30..7f51877150e 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1,840 +1,675 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: - description: "This spec is mainly for testing Petstore server and contains fake\ - \ endpoints, models. Please do not use this for any other purpose. Special characters:\ - \ \" \\" + description: 'This spec is mainly for testing Petstore server and contains fake + endpoints, models. Please do not use this for any other purpose. Special + characters: " \' + version: 1.0.0 + title: OpenAPI Petstore license: name: Apache-2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html - title: OpenAPI Petstore - version: 1.0.0 -servers: -- url: http://petstore.swagger.io:80/v2 tags: -- description: Everything about your Pets - name: pet -- description: Access to Petstore orders - name: store -- description: Operations about user - name: user + - name: pet + description: Everything about your Pets + - name: store + description: Access to Petstore orders + - name: user + description: Operations about user paths: /pet: post: + tags: + - pet + summary: Add a new pet to the store + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: "#/components/requestBodies/Pet" responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - - petstore_auth: - - write:pets - - read:pets - summary: Add a new pet to the store - tags: - - pet - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: pet + - petstore_auth: + - write:pets + - read:pets put: + tags: + - pet + summary: Update an existing pet + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: "#/components/requestBodies/Pet" responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - - petstore_auth: - - write:pets - - read:pets - summary: Update an existing pet - tags: - - pet - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: pet + - petstore_auth: + - write:pets + - read:pets /pet/findByStatus: get: + tags: + - pet + summary: Finds Pets by status description: Multiple status values can be provided with comma separated strings operationId: findPetsByStatus parameters: - - description: Status values that need to be considered for filter - explode: false - in: query - name: status - required: true - schema: - items: - default: available - enum: - - available - - pending - - sold - type: string - type: array - style: form + - name: status + in: query + description: Status values that need to be considered for filter + required: true + style: form + explode: false + schema: + type: array + items: + type: string + enum: + - available + - pending + - sold + default: available responses: "200": + description: successful operation content: application/xml: schema: - items: - $ref: '#/components/schemas/Pet' type: array + items: + $ref: "#/components/schemas/Pet" application/json: schema: - items: - $ref: '#/components/schemas/Pet' type: array - description: successful operation + items: + $ref: "#/components/schemas/Pet" "400": - content: {} description: Invalid status value security: - - petstore_auth: - - write:pets - - read:pets - summary: Finds Pets by status - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet + - petstore_auth: + - write:pets + - read:pets /pet/findByTags: get: - deprecated: true - description: "Multiple tags can be provided with comma separated strings. Use\ - \ tag1, tag2, tag3 for testing." + tags: + - pet + summary: Finds Pets by tags + description: Multiple tags can be provided with comma separated strings. Use tag1, + tag2, tag3 for testing. operationId: findPetsByTags parameters: - - description: Tags to filter by - explode: false - in: query - name: tags - required: true - schema: - items: - type: string - type: array - uniqueItems: true - style: form + - name: tags + in: query + description: Tags to filter by + required: true + style: form + explode: false + schema: + type: array + items: + type: string + uniqueItems: true responses: "200": + description: successful operation content: application/xml: schema: - items: - $ref: '#/components/schemas/Pet' type: array uniqueItems: true + items: + $ref: "#/components/schemas/Pet" application/json: schema: - items: - $ref: '#/components/schemas/Pet' type: array uniqueItems: true - description: successful operation + items: + $ref: "#/components/schemas/Pet" "400": - content: {} description: Invalid tag value security: - - petstore_auth: - - write:pets - - read:pets - summary: Finds Pets by tags - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - /pet/{petId}: - delete: - operationId: deletePet - parameters: - - in: header - name: api_key - schema: - type: string - - description: Pet id to delete - in: path - name: petId - required: true - schema: - format: int64 - type: integer - responses: - "200": - content: {} - description: successful operation - "400": - content: {} - description: Invalid pet value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Deletes a pet - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet + - petstore_auth: + - write:pets + - read:pets + deprecated: true + "/pet/{petId}": get: + tags: + - pet + summary: Find pet by ID description: Returns a single pet operationId: getPetById parameters: - - description: ID of pet to return - in: path - name: petId - required: true - schema: - format: int64 - type: integer + - name: petId + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 responses: "200": + description: successful operation content: application/xml: schema: - $ref: '#/components/schemas/Pet' + $ref: "#/components/schemas/Pet" application/json: schema: - $ref: '#/components/schemas/Pet' - description: successful operation + $ref: "#/components/schemas/Pet" "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - - api_key: [] - summary: Find pet by ID - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet + - api_key: [] post: + tags: + - pet + summary: Updates a pet in the store with form data + description: "" operationId: updatePetWithForm parameters: - - description: ID of pet that needs to be updated - in: path - name: petId - required: true - schema: - format: int64 - type: integer + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + schema: + type: integer + format: int64 requestBody: content: application/x-www-form-urlencoded: schema: - $ref: '#/components/schemas/updatePetWithForm_request' + type: object + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string responses: "405": - content: {} description: Invalid input security: - - petstore_auth: - - write:pets - - read:pets - summary: Updates a pet in the store with form data + - petstore_auth: + - write:pets + - read:pets + delete: tags: - - pet - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: pet - /pet/{petId}/uploadImage: + - pet + summary: Deletes a pet + description: "" + operationId: deletePet + parameters: + - name: api_key + in: header + required: false + schema: + type: string + - name: petId + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + "200": + description: successful operation + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + "/pet/{petId}/uploadImage": post: + tags: + - pet + summary: uploads an image + description: "" operationId: uploadFile parameters: - - description: ID of pet to update - in: path - name: petId - required: true - schema: - format: int64 - type: integer + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 requestBody: content: multipart/form-data: schema: - $ref: '#/components/schemas/uploadFile_request' + type: object + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + type: string + format: binary responses: "200": + description: successful operation content: application/json: schema: - $ref: '#/components/schemas/ApiResponse' - description: successful operation + $ref: "#/components/schemas/ApiResponse" security: - - petstore_auth: - - write:pets - - read:pets - summary: uploads an image - tags: - - pet - x-content-type: multipart/form-data - x-accepts: application/json - x-tags: - - tag: pet + - petstore_auth: + - write:pets + - read:pets /store/inventory: get: + tags: + - store + summary: Returns pet inventories by status description: Returns a map of status codes to quantities operationId: getInventory responses: "200": + description: successful operation content: application/json: schema: - additionalProperties: - format: int32 - type: integer type: object - description: successful operation + additionalProperties: + type: integer + format: int32 security: - - api_key: [] - summary: Returns pet inventories by status - tags: - - store - x-accepts: application/json - x-tags: - - tag: store + - api_key: [] /store/order: post: + tags: + - store + summary: Place an order for a pet + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: - $ref: '#/components/schemas/Order' + $ref: "#/components/schemas/Order" description: order placed for purchasing the pet required: true responses: "200": + description: successful operation content: application/xml: schema: - $ref: '#/components/schemas/Order' + $ref: "#/components/schemas/Order" application/json: schema: - $ref: '#/components/schemas/Order' - description: successful operation + $ref: "#/components/schemas/Order" "400": - content: {} description: Invalid Order - summary: Place an order for a pet - tags: - - store - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: store - /store/order/{order_id}: - delete: - description: For valid response try integer IDs with value < 1000. Anything - above 1000 or nonintegers will generate API errors - operationId: deleteOrder - parameters: - - description: ID of the order that needs to be deleted - in: path - name: order_id - required: true - schema: - type: string - responses: - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Order not found - summary: Delete purchase order by ID - tags: - - store - x-accepts: application/json - x-tags: - - tag: store + "/store/order/{order_id}": get: - description: For valid response try integer IDs with value <= 5 or > 10. Other - values will generate exceptions + tags: + - store + summary: Find purchase order by ID + description: For valid response try integer IDs with value <= 5 or > 10. Other values + will generate exceptions operationId: getOrderById parameters: - - description: ID of pet that needs to be fetched - in: path - name: order_id - required: true - schema: - format: int64 - maximum: 5 - minimum: 1 - type: integer + - name: order_id + in: path + description: ID of pet that needs to be fetched + required: true + schema: + type: integer + format: int64 + minimum: 1 + maximum: 5 responses: "200": + description: successful operation content: application/xml: schema: - $ref: '#/components/schemas/Order' + $ref: "#/components/schemas/Order" application/json: schema: - $ref: '#/components/schemas/Order' - description: successful operation + $ref: "#/components/schemas/Order" "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found - summary: Find purchase order by ID + delete: tags: - - store - x-accepts: application/json - x-tags: - - tag: store + - store + summary: Delete purchase order by ID + description: For valid response try integer IDs with value < 1000. Anything above + 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - name: order_id + in: path + description: ID of the order that needs to be deleted + required: true + schema: + type: string + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found /user: post: + tags: + - user + summary: Create user description: This can only be done by the logged in user. operationId: createUser requestBody: content: - '*/*': + application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" description: Created user object required: true responses: default: - content: {} description: successful operation - summary: Create user - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user /user/createWithArray: post: + tags: + - user + summary: Creates list of users with given input array + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: "#/components/requestBodies/UserArray" responses: default: - content: {} description: successful operation - summary: Creates list of users with given input array - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user /user/createWithList: post: + tags: + - user + summary: Creates list of users with given input array + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: "#/components/requestBodies/UserArray" responses: default: - content: {} description: successful operation - summary: Creates list of users with given input array - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user /user/login: get: + tags: + - user + summary: Logs user into the system + description: "" operationId: loginUser parameters: - - description: The user name for login - in: query - name: username - required: true - schema: - type: string - - description: The password for login in clear text - in: query - name: password - required: true - schema: - type: string + - name: username + in: query + description: The user name for login + required: true + schema: + type: string + - name: password + in: query + description: The password for login in clear text + required: true + schema: + type: string responses: "200": - content: - application/xml: - schema: - type: string - application/json: - schema: - type: string description: successful operation headers: X-Rate-Limit: description: calls per hour allowed by the user schema: - format: int32 type: integer + format: int32 X-Expires-After: description: date in UTC when token expires schema: - format: date-time type: string - "400": - content: {} - description: Invalid username/password supplied - summary: Logs user into the system - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - /user/logout: - get: - operationId: logoutUser - responses: - default: - content: {} - description: successful operation - summary: Logs out current logged in user session - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - /user/{username}: - delete: - description: This can only be done by the logged in user. - operationId: deleteUser - parameters: - - description: The name that needs to be deleted - in: path - name: username - required: true - schema: - type: string - responses: - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - summary: Delete user - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - get: - operationId: getUserByName - parameters: - - description: The name that needs to be fetched. Use user1 for testing. - in: path - name: username - required: true - schema: - type: string - responses: - "200": + format: date-time content: application/xml: schema: - $ref: '#/components/schemas/User' + type: string application/json: schema: - $ref: '#/components/schemas/User' - description: successful operation + type: string + "400": + description: Invalid username/password supplied + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + "/user/{username}": + get: + tags: + - user + summary: Get user by user name + description: "" + operationId: getUserByName + parameters: + - name: username + in: path + description: The name that needs to be fetched. Use user1 for testing. + required: true + schema: + type: string + responses: + "200": + description: successful operation + content: + application/xml: + schema: + $ref: "#/components/schemas/User" + application/json: + schema: + $ref: "#/components/schemas/User" "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found - summary: Get user by user name - tags: - - user - x-accepts: application/json - x-tags: - - tag: user put: + tags: + - user + summary: Updated user description: This can only be done by the logged in user. operationId: updateUser parameters: - - description: name that need to be deleted - in: path - name: username - required: true - schema: - type: string + - name: username + in: path + description: name that need to be deleted + required: true + schema: + type: string requestBody: content: - '*/*': + application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found - summary: Updated user + delete: tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + schema: + type: string + responses: + "400": + description: Invalid username supplied + "404": + description: User not found /fake_classname_test: patch: + tags: + - fake_classname_tags 123#$%^ + summary: To test class name in snake case description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: "#/components/requestBodies/Client" responses: "200": + description: successful operation content: application/json: schema: - $ref: '#/components/schemas/Client' - description: successful operation + $ref: "#/components/schemas/Client" security: - - api_key_query: [] - summary: To test class name in snake case - tags: - - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake_classname_tags 123#$%^ + - api_key_query: [] /fake: - delete: - description: Fake endpoint to test group parameters (optional) - operationId: testGroupParameters - parameters: - - description: Required String in group parameters - in: query - name: required_string_group - required: true - schema: - type: integer - - description: Required Boolean in group parameters - in: header - name: required_boolean_group - required: true - schema: - type: boolean - - description: Required Integer in group parameters - in: query - name: required_int64_group - required: true - schema: - format: int64 - type: integer - - description: String in group parameters - in: query - name: string_group - schema: - type: integer - - description: Boolean in group parameters - in: header - name: boolean_group - schema: - type: boolean - - description: Integer in group parameters - in: query - name: int64_group - schema: - format: int64 - type: integer - responses: - "400": - content: {} - description: Something wrong - summary: Fake endpoint to test group parameters (optional) + patch: tags: - - fake - x-group-parameters: true - x-accepts: application/json - x-tags: - - tag: fake + - fake + summary: To test "client" model + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: "#/components/requestBodies/Client" + responses: + "200": + description: successful operation + content: + application/json: + schema: + $ref: "#/components/schemas/Client" get: + tags: + - fake + summary: To test enum parameters description: To test enum parameters operationId: testEnumParameters parameters: - - description: Header parameter enum test (string array) - explode: false - in: header - name: enum_header_string_array - schema: - items: - default: $ - enum: - - '>' - - $ + - name: enum_header_string_array + in: header + description: Header parameter enum test (string array) + schema: + type: array + items: + type: string + default: $ + enum: + - ">" + - $ + - name: enum_header_string + in: header + description: Header parameter enum test (string) + schema: type: string - type: array - style: simple - - description: Header parameter enum test (string) - in: header - name: enum_header_string - schema: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string - - description: Query parameter enum test (string array) - explode: false - in: query - name: enum_query_string_array - schema: - items: - default: $ enum: - - '>' - - $ + - _abc + - -efg + - (xyz) + default: -efg + - name: enum_query_string_array + in: query + description: Query parameter enum test (string array) + schema: + type: array + items: + type: string + default: $ + enum: + - ">" + - $ + - name: enum_query_string + in: query + description: Query parameter enum test (string) + schema: type: string - type: array - style: form - - description: Query parameter enum test (string) - in: query - name: enum_query_string - schema: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string - - description: Query parameter enum test (double) - in: query - name: enum_query_integer - schema: - enum: - - 1 - - -2 - format: int32 - type: integer - - description: Query parameter enum test (double) - in: query - name: enum_query_double - schema: - enum: - - 1.1 - - -1.2 - format: double - type: number + enum: + - _abc + - -efg + - (xyz) + default: -efg + - name: enum_query_integer + in: query + description: Query parameter enum test (double) + schema: + type: integer + format: int32 + enum: + - 1 + - -2 + - name: enum_query_double + in: query + description: Query parameter enum test (double) + schema: + type: number + format: double + enum: + - 1.1 + - -1.2 requestBody: content: application/x-www-form-urlencoded: schema: - $ref: '#/components/schemas/testEnumParameters_request' + type: object + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + type: array + items: + type: string + default: $ + enum: + - ">" + - $ + enum_form_string: + description: Form parameter enum test (string) + type: string + enum: + - _abc + - -efg + - (xyz) + default: -efg responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found - summary: To test enum parameters - tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake - patch: - description: To test "client" model - operationId: testClientModel - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: successful operation - summary: To test "client" model - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake post: + tags: + - fake + summary: |- + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 description: |- Fake endpoint for testing various parameters 假端點 @@ -845,441 +680,514 @@ paths: content: application/x-www-form-urlencoded: schema: - $ref: '#/components/schemas/testEndpointParameters_request' - required: true + type: object + properties: + integer: + description: None + type: integer + minimum: 10 + maximum: 100 + int32: + description: None + type: integer + format: int32 + minimum: 20 + maximum: 200 + int64: + description: None + type: integer + format: int64 + number: + description: None + type: number + minimum: 32.1 + maximum: 543.2 + float: + description: None + type: number + format: float + maximum: 987.6 + double: + description: None + type: number + format: double + minimum: 67.8 + maximum: 123.4 + string: + description: None + type: string + pattern: /[a-z]/i + pattern_without_delimiter: + description: None + type: string + pattern: ^[A-Z].* + byte: + description: None + type: string + format: byte + binary: + description: None + type: string + format: binary + date: + description: None + type: string + format: date + dateTime: + description: None + type: string + format: date-time + password: + description: None + type: string + format: password + minLength: 10 + maxLength: 64 + callback: + description: None + type: string + required: + - number + - double + - pattern_without_delimiter + - byte responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - - http_basic_test: [] - summary: |- - Fake endpoint for testing various parameters - 假端點 - 偽のエンドポイント - 가짜 엔드 포인트 + - http_basic_test: [] + delete: tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake + - fake + summary: Fake endpoint to test group parameters (optional) + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + x-group-parameters: true + parameters: + - name: required_string_group + in: query + description: Required String in group parameters + required: true + schema: + type: integer + - name: required_boolean_group + in: header + description: Required Boolean in group parameters + required: true + schema: + type: boolean + - name: required_int64_group + in: query + description: Required Integer in group parameters + required: true + schema: + type: integer + format: int64 + - name: string_group + in: query + description: String in group parameters + schema: + type: integer + - name: boolean_group + in: header + description: Boolean in group parameters + schema: + type: boolean + - name: int64_group + in: query + description: Integer in group parameters + schema: + type: integer + format: int64 + responses: + "400": + description: Something wrong /fake/outer/number: post: + tags: + - fake description: Test serialization of outer number types operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: - $ref: '#/components/schemas/OuterNumber' + $ref: "#/components/schemas/OuterNumber" description: Input number as post body - required: false responses: "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterNumber' description: Output number - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake + content: + "*/*": + schema: + $ref: "#/components/schemas/OuterNumber" /fake/outer/string: post: + tags: + - fake description: Test serialization of outer string types operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: - $ref: '#/components/schemas/OuterString' + $ref: "#/components/schemas/OuterString" description: Input string as post body - required: false responses: "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterString' description: Output string - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake + content: + "*/*": + schema: + $ref: "#/components/schemas/OuterString" /fake/outer/boolean: post: + tags: + - fake description: Test serialization of outer boolean types operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: - $ref: '#/components/schemas/OuterBoolean' + $ref: "#/components/schemas/OuterBoolean" description: Input boolean as post body - required: false responses: "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterBoolean' description: Output boolean - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake + content: + "*/*": + schema: + $ref: "#/components/schemas/OuterBoolean" /fake/outer/composite: post: + tags: + - fake description: Test serialization of object with outer number type operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: - $ref: '#/components/schemas/OuterComposite' + $ref: "#/components/schemas/OuterComposite" description: Input composite as post body - required: false responses: "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterComposite' description: Output composite - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake + content: + "*/*": + schema: + $ref: "#/components/schemas/OuterComposite" /fake/jsonFormData: get: + tags: + - fake + summary: test json serialization of form data + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: - $ref: '#/components/schemas/testJsonFormData_request' - required: true + type: object + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 responses: "200": - content: {} description: successful operation - summary: test json serialization of form data - tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake /fake/inline-additionalProperties: post: + tags: + - fake + summary: test inline additionalProperties + description: "" operationId: testInlineAdditionalProperties requestBody: content: application/json: schema: + type: object additionalProperties: type: string - type: object description: request body required: true responses: "200": - content: {} description: successful operation - summary: test inline additionalProperties - tags: - - fake - x-codegen-request-body-name: param - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake /fake/body-with-query-params: put: + tags: + - fake operationId: testBodyWithQueryParams parameters: - - in: query - name: query - required: true - schema: - type: string + - name: query + in: query + required: true + schema: + type: string requestBody: content: application/json: schema: - $ref: '#/components/schemas/User' + $ref: "#/components/schemas/User" required: true responses: "200": - content: {} description: Success - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake /fake/create_xml_item: post: - description: this route creates an XmlItem + tags: + - fake operationId: createXmlItem + summary: creates an XmlItem + description: this route creates an XmlItem requestBody: content: application/xml: schema: - $ref: '#/components/schemas/XmlItem' + $ref: "#/components/schemas/XmlItem" application/xml; charset=utf-8: schema: - $ref: '#/components/schemas/XmlItem' + $ref: "#/components/schemas/XmlItem" application/xml; charset=utf-16: schema: - $ref: '#/components/schemas/XmlItem' + $ref: "#/components/schemas/XmlItem" text/xml: schema: - $ref: '#/components/schemas/XmlItem' + $ref: "#/components/schemas/XmlItem" text/xml; charset=utf-8: schema: - $ref: '#/components/schemas/XmlItem' + $ref: "#/components/schemas/XmlItem" text/xml; charset=utf-16: schema: - $ref: '#/components/schemas/XmlItem' + $ref: "#/components/schemas/XmlItem" description: XmlItem Body required: true responses: "200": - content: {} description: successful operation - summary: creates an XmlItem - tags: - - fake - x-codegen-request-body-name: XmlItem - x-content-type: application/xml - x-accepts: application/json - x-tags: - - tag: fake /another-fake/dummy: patch: + tags: + - $another-fake? + summary: To test special tags description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: "#/components/requestBodies/Client" responses: "200": + description: successful operation content: application/json: schema: - $ref: '#/components/schemas/Client' - description: successful operation - summary: To test special tags - tags: - - $another-fake? - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: $another-fake? + $ref: "#/components/schemas/Client" /fake/body-with-file-schema: put: - description: "For this test, the body for this request much reference a schema\ - \ named `File`." + tags: + - fake + description: For this test, the body for this request much reference a schema named + `File`. operationId: testBodyWithFileSchema requestBody: content: application/json: schema: - $ref: '#/components/schemas/FileSchemaTestClass' + $ref: "#/components/schemas/FileSchemaTestClass" required: true responses: "200": - content: {} description: Success - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake /fake/test-query-parameters: put: + tags: + - fake description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false - in: query - name: pipe - required: true - schema: - items: - type: string - type: array - style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query - name: http - required: true - schema: - items: - type: string - type: array - style: spaceDelimited - - explode: false - in: query - name: url - required: true - schema: - items: - type: string - type: array - style: form - - explode: true - in: query - name: context - required: true - schema: - items: - type: string - type: array - style: form + - name: pipe + in: query + required: true + schema: + type: array + items: + type: string + - name: http + in: query + required: true + style: spaceDelimited + schema: + type: array + items: + type: string + - name: url + in: query + required: true + style: form + explode: false + schema: + type: array + items: + type: string + - name: context + in: query + required: true + explode: true + schema: + type: array + items: + type: string responses: "200": - content: {} description: Success - tags: - - fake - x-accepts: application/json - x-tags: - - tag: fake - /fake/{petId}/uploadImageWithRequiredFile: + "/fake/{petId}/uploadImageWithRequiredFile": post: + tags: + - pet + summary: uploads an image (required) + description: "" operationId: uploadFileWithRequiredFile parameters: - - description: ID of pet to update - in: path - name: petId - required: true - schema: - format: int64 - type: integer + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 requestBody: content: multipart/form-data: schema: - $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true + type: object + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + type: string + format: binary + required: + - requiredFile responses: "200": + description: successful operation content: application/json: schema: - $ref: '#/components/schemas/ApiResponse' - description: successful operation + $ref: "#/components/schemas/ApiResponse" security: - - petstore_auth: - - write:pets - - read:pets - summary: uploads an image (required) - tags: - - pet - x-content-type: multipart/form-data - x-accepts: application/json - x-tags: - - tag: pet + - petstore_auth: + - write:pets + - read:pets +servers: + - url: http://petstore.swagger.io:80/v2 components: + requestBodies: + UserArray: + content: + application/json: + schema: + type: array + items: + $ref: "#/components/schemas/User" + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: "#/components/schemas/Client" + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: "#/components/schemas/Pet" + application/xml: + schema: + $ref: "#/components/schemas/Pet" + description: Pet object that needs to be added to the store + required: true + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + api_key: + type: apiKey + name: api_key + in: header + api_key_query: + type: apiKey + name: api_key_query + in: query + http_basic_test: + type: http + scheme: basic schemas: Order: - example: - petId: 6 - quantity: 1 - id: 0 - shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false - status: placed + type: object properties: id: - format: int64 type: integer + format: int64 petId: + type: integer format: int64 - type: integer quantity: - format: int32 type: integer + format: int32 shipDate: - format: date-time type: string + format: date-time status: + type: string description: Order Status enum: - - placed - - approved - - delivered - type: string + - placed + - approved + - delivered complete: - default: false type: boolean - type: object + default: false xml: name: Order Category: - example: - name: default-name - id: 6 + type: object + required: + - name properties: id: - format: int64 type: integer + format: int64 name: - default: default-name type: string - required: - - name - type: object + default: default-name xml: name: Category User: - example: - firstName: firstName - lastName: lastName - password: password - userStatus: 6 - phone: phone - id: 0 - email: email - username: username + type: object properties: id: - format: int64 type: integer + format: int64 x-is-unique: true username: type: string @@ -1294,139 +1202,106 @@ components: phone: type: string userStatus: - description: User Status - format: int32 type: integer - type: object + format: int32 + description: User Status xml: name: User Tag: - example: - name: name - id: 1 + type: object properties: id: - format: int64 type: integer + format: int64 name: type: string - type: object xml: name: Tag Pet: - example: - photoUrls: + type: object + required: + - name - photoUrls - - photoUrls - name: doggie - id: 0 - category: - name: default-name - id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available properties: id: - format: int64 type: integer + format: int64 x-is-unique: true category: - $ref: '#/components/schemas/Category' + $ref: "#/components/schemas/Category" name: - example: doggie type: string + example: doggie photoUrls: - items: - type: string type: array uniqueItems: true xml: name: photoUrl wrapped: true - tags: items: - $ref: '#/components/schemas/Tag' + type: string + tags: type: array xml: name: tag wrapped: true + items: + $ref: "#/components/schemas/Tag" status: - description: pet status in the store - enum: - - available - - pending - - sold type: string - required: - - name - - photoUrls - type: object + description: pet status in the store + deprecated: true + enum: + - available + - pending + - sold xml: name: Pet ApiResponse: - example: - code: 0 - type: type - message: message + type: object properties: code: - format: int32 type: integer + format: int32 type: type: string message: type: string - type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: - format: int32 type: integer - type: object + format: int32 xml: name: Return Name: description: Model for testing model name same as property name + required: + - name properties: name: - format: int32 type: integer - snake_case: format: int32 + snake_case: readOnly: true type: integer + format: int32 property: type: string - "123Number": - readOnly: true + 123Number: type: integer - required: - - name - type: object + readOnly: true xml: name: Name - "200_response": + 200_response: description: Model for testing model name starting with number properties: name: - format: int32 type: integer + format: int32 class: type: string - type: object xml: name: Name ClassModel: @@ -1434,287 +1309,291 @@ components: properties: _class: type: string - type: object Dog: allOf: - - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' + - $ref: "#/components/schemas/Animal" + - type: object + properties: + breed: + type: string Cat: allOf: - - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Cat_allOf' + - $ref: "#/components/schemas/Animal" + - type: object + properties: + declawed: + type: boolean BigCat: allOf: - - $ref: '#/components/schemas/Cat' - - $ref: '#/components/schemas/BigCat_allOf' + - $ref: "#/components/schemas/Cat" + - type: object + properties: + kind: + type: string + enum: + - lions + - tigers + - leopards + - jaguars Animal: + type: object discriminator: propertyName: className + required: + - className properties: className: type: string color: - default: red type: string - required: - - className - type: object + default: red AnimalFarm: - items: - $ref: '#/components/schemas/Animal' type: array + items: + $ref: "#/components/schemas/Animal" format_test: + type: object + required: + - number + - byte + - date + - password properties: integer: + type: integer maximum: 100 minimum: 10 - type: integer int32: + type: integer format: int32 maximum: 200 minimum: 20 - type: integer int64: - format: int64 type: integer + format: int64 number: maximum: 543.2 minimum: 32.1 type: number float: + type: number format: float maximum: 987.6 minimum: 54.3 - type: number double: + type: number format: double maximum: 123.4 minimum: 67.8 - type: number string: - pattern: "/[a-z]/i" type: string + pattern: /[a-z]/i byte: + type: string format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" - type: string binary: + type: string format: binary - type: string date: + type: string format: date - type: string dateTime: + type: string format: date-time - type: string uuid: - example: 72f98069-206d-4f12-9f12-3d1e525a8e84 - format: uuid type: string + format: uuid + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 password: + type: string format: password maxLength: 64 minLength: 10 - type: string BigDecimal: - format: number type: string - required: - - byte - - date - - number - - password - type: object + format: number EnumClass: + type: string default: -efg enum: - - _abc - - -efg - - (xyz) - type: string + - _abc + - -efg + - (xyz) Enum_Test: + type: object + required: + - enum_string_required properties: enum_string: - enum: - - UPPER - - lower - - "" type: string + enum: + - UPPER + - lower + - "" enum_string_required: - enum: - - UPPER - - lower - - "" type: string + enum: + - UPPER + - lower + - "" enum_integer: - enum: - - 1 - - -1 - format: int32 type: integer - enum_number: + format: int32 enum: - - 1.1 - - -1.2 - format: double + - 1 + - -1 + enum_number: type: number + format: double + enum: + - 1.1 + - -1.2 outerEnum: - $ref: '#/components/schemas/OuterEnum' - required: - - enum_string_required - type: object + $ref: "#/components/schemas/OuterEnum" AdditionalPropertiesClass: + type: object properties: map_string: + type: object additionalProperties: type: string - type: object map_number: + type: object additionalProperties: type: number - type: object map_integer: + type: object additionalProperties: type: integer - type: object map_boolean: + type: object additionalProperties: type: boolean - type: object map_array_integer: + type: object additionalProperties: + type: array items: type: integer - type: array - type: object map_array_anytype: - additionalProperties: - items: - properties: {} - type: object - type: array type: object - map_map_string: additionalProperties: + type: array + items: + type: object + map_map_string: + type: object + additionalProperties: + type: object additionalProperties: type: string - type: object - type: object map_map_anytype: + type: object additionalProperties: - additionalProperties: - properties: {} - type: object type: object - type: object + additionalProperties: + type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: - properties: {} type: object - type: object + properties: {} AdditionalPropertiesString: + type: object + properties: + name: + type: string additionalProperties: type: string + AdditionalPropertiesInteger: + type: object properties: name: type: string - type: object - AdditionalPropertiesInteger: additionalProperties: type: integer + AdditionalPropertiesNumber: + type: object properties: name: type: string - type: object - AdditionalPropertiesNumber: additionalProperties: type: number + AdditionalPropertiesBoolean: + type: object properties: name: type: string - type: object - AdditionalPropertiesBoolean: additionalProperties: type: boolean - properties: - name: - type: string - type: object AdditionalPropertiesArray: + type: object + properties: + name: + type: string additionalProperties: - items: - properties: {} - type: object type: array - properties: - name: - type: string - type: object - AdditionalPropertiesObject: - additionalProperties: - additionalProperties: - properties: {} + items: type: object - type: object + AdditionalPropertiesObject: + type: object properties: name: type: string - type: object - AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object + additionalProperties: + type: object + AdditionalPropertiesAnyType: + type: object properties: name: type: string - type: object + additionalProperties: + type: object MixedPropertiesAndAdditionalPropertiesClass: + type: object properties: uuid: + type: string format: uuid - type: string dateTime: + type: string format: date-time - type: string map: - additionalProperties: - $ref: '#/components/schemas/Animal' type: object - type: object + additionalProperties: + $ref: "#/components/schemas/Animal" List: - properties: - "123-list": - type: string type: object + properties: + 123-list: + type: string Client: - example: - client: client + type: object properties: client: type: string - type: object ReadOnlyFirst: + type: object properties: bar: - readOnly: true type: string + readOnly: true baz: type: string - type: object hasOnlyReadOnly: + type: object properties: bar: - readOnly: true type: string + readOnly: true foo: - readOnly: true type: string - type: object + readOnly: true Capitalization: + type: object properties: smallCamel: type: string @@ -1730,107 +1609,99 @@ components: description: | Name of the pet type: string - type: object MapTest: + type: object properties: map_map_of_string: + type: object additionalProperties: + type: object additionalProperties: type: string - type: object - type: object map_of_enum_string: + type: object additionalProperties: - enum: - - UPPER - - lower type: string - type: object + enum: + - UPPER + - lower direct_map: + type: object additionalProperties: type: boolean - type: object indirect_map: - additionalProperties: - type: boolean - type: object - type: object + $ref: "#/components/schemas/StringBooleanMap" ArrayTest: + type: object properties: array_of_string: + type: array items: type: string - type: array array_array_of_integer: + type: array items: + type: array items: - format: int64 type: integer - type: array - type: array + format: int64 array_array_of_model: - items: - items: - $ref: '#/components/schemas/ReadOnlyFirst' - type: array type: array - type: object + items: + type: array + items: + $ref: "#/components/schemas/ReadOnlyFirst" NumberOnly: + type: object properties: JustNumber: type: number - type: object ArrayOfNumberOnly: + type: object properties: ArrayNumber: + type: array items: type: number - type: array - type: object ArrayOfArrayOfNumberOnly: + type: object properties: ArrayArrayNumber: + type: array items: + type: array items: type: number - type: array - type: array - type: object EnumArrays: + type: object properties: just_symbol: - enum: - - '>=' - - $ type: string + enum: + - ">=" + - $ array_enum: - items: - enum: - - fish - - crab - type: string type: array - type: object + items: + type: string + enum: + - fish + - crab OuterEnum: - enum: - - placed - - approved - - delivered type: string + enum: + - placed + - approved + - delivered OuterComposite: - example: - my_string: my_string - my_number: 0.8008281904610115 - my_boolean: true + type: object properties: my_number: - type: number + $ref: "#/components/schemas/OuterNumber" my_string: - type: string + $ref: "#/components/schemas/OuterString" my_boolean: - type: boolean - x-codegen-body-parameter-name: boolean_post_body - type: object + $ref: "#/components/schemas/OuterBoolean" OuterNumber: type: number OuterString: @@ -1841,445 +1712,297 @@ components: StringBooleanMap: additionalProperties: type: boolean - type: object FileSchemaTestClass: - example: - file: - sourceURI: sourceURI - files: - - sourceURI: sourceURI - - sourceURI: sourceURI + type: object properties: file: - $ref: '#/components/schemas/File' + $ref: "#/components/schemas/File" files: - items: - $ref: '#/components/schemas/File' type: array - type: object + items: + $ref: "#/components/schemas/File" File: + type: object description: Must be named `File` for test. - example: - sourceURI: sourceURI properties: sourceURI: description: Test capitalization type: string - type: object TypeHolderDefault: + type: object + required: + - string_item + - number_item + - integer_item + - bool_item + - array_item properties: string_item: - default: what type: string + default: what number_item: type: number + default: 1.234 integer_item: type: integer + default: -2 bool_item: - default: true type: boolean + default: true array_item: + type: array items: type: integer - type: array - required: - - array_item - - bool_item - - integer_item - - number_item - - string_item - type: object + default: + - 0 + - 1 + - 2 + - 3 TypeHolderExample: + type: object + required: + - string_item + - number_item + - float_item + - integer_item + - bool_item + - array_item properties: string_item: - example: what type: string + example: what number_item: - example: 1.234 type: number + example: 1.234 float_item: + type: number example: 1.234 format: float - type: number integer_item: - example: -2 type: integer + example: -2 bool_item: - example: true type: boolean + example: true array_item: - example: - - 0 - - 1 - - 2 - - 3 + type: array items: type: integer - type: array - required: - - array_item - - bool_item - - float_item - - integer_item - - number_item - - string_item - type: object + example: + - 0 + - 1 + - 2 + - 3 XmlItem: + type: object + xml: + namespace: http://a.com/schema + prefix: pre properties: attribute_string: - example: string type: string + example: string xml: attribute: true attribute_number: - example: 1.234 type: number + example: 1.234 xml: attribute: true attribute_integer: - example: -2 type: integer + example: -2 xml: attribute: true attribute_boolean: - example: true type: boolean + example: true xml: attribute: true wrapped_array: - items: - type: integer type: array xml: wrapped: true + items: + type: integer name_string: - example: string type: string + example: string xml: name: xml_name_string name_number: - example: 1.234 type: number + example: 1.234 xml: name: xml_name_number name_integer: - example: -2 type: integer + example: -2 xml: name: xml_name_integer name_boolean: - example: true type: boolean + example: true xml: name: xml_name_boolean name_array: + type: array items: type: integer xml: name: xml_name_array_item - type: array name_wrapped_array: + type: array + xml: + wrapped: true + name: xml_name_wrapped_array items: type: integer xml: name: xml_name_wrapped_array_item - type: array - xml: - name: xml_name_wrapped_array - wrapped: true prefix_string: - example: string type: string + example: string xml: prefix: ab prefix_number: - example: 1.234 type: number + example: 1.234 xml: prefix: cd prefix_integer: - example: -2 type: integer + example: -2 xml: prefix: ef prefix_boolean: - example: true type: boolean + example: true xml: prefix: gh prefix_array: + type: array items: type: integer xml: prefix: ij - type: array prefix_wrapped_array: + type: array + xml: + wrapped: true + prefix: kl items: type: integer xml: prefix: mn - type: array - xml: - prefix: kl - wrapped: true namespace_string: - example: string type: string + example: string xml: namespace: http://a.com/schema namespace_number: - example: 1.234 type: number + example: 1.234 xml: namespace: http://b.com/schema namespace_integer: - example: -2 type: integer + example: -2 xml: namespace: http://c.com/schema namespace_boolean: - example: true type: boolean + example: true xml: namespace: http://d.com/schema namespace_array: + type: array items: type: integer xml: namespace: http://e.com/schema - type: array namespace_wrapped_array: + type: array + xml: + wrapped: true + namespace: http://f.com/schema items: type: integer xml: namespace: http://g.com/schema - type: array - xml: - namespace: http://f.com/schema - wrapped: true prefix_ns_string: - example: string type: string + example: string xml: namespace: http://a.com/schema prefix: a prefix_ns_number: - example: 1.234 type: number + example: 1.234 xml: namespace: http://b.com/schema prefix: b prefix_ns_integer: - example: -2 type: integer + example: -2 xml: namespace: http://c.com/schema prefix: c prefix_ns_boolean: - example: true type: boolean + example: true xml: namespace: http://d.com/schema prefix: d prefix_ns_array: + type: array items: type: integer xml: namespace: http://e.com/schema prefix: e - type: array prefix_ns_wrapped_array: + type: array + xml: + wrapped: true + namespace: http://f.com/schema + prefix: f items: type: integer xml: namespace: http://g.com/schema prefix: g - type: array - xml: - namespace: http://f.com/schema - prefix: f - wrapped: true - type: object - xml: - namespace: http://a.com/schema - prefix: pre - updatePetWithForm_request: + _special_model.name_: properties: - name: - description: Updated name of the pet - type: string - status: - description: Updated status of the pet - type: string - type: object - uploadFile_request: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - file: - description: file to upload - format: binary - type: string - type: object - testEnumParameters_request: - properties: - enum_form_string_array: - description: Form parameter enum test (string array) - items: - default: $ - enum: - - '>' - - $ - type: string - type: array - enum_form_string: - default: -efg - description: Form parameter enum test (string) - enum: - - _abc - - -efg - - (xyz) - type: string - type: object - testEndpointParameters_request: - properties: - integer: - description: None - format: int32 - maximum: 100 - minimum: 10 + "$special[property.name]": type: integer - int32: - description: None - format: int32 - maximum: 200 - minimum: 20 - type: integer - int64: - description: None format: int64 - type: integer - number: - description: None - maximum: 543.2 - minimum: 32.1 - type: number - float: - description: None - format: float - maximum: 987.6 - type: number - double: - description: None - format: double - maximum: 123.4 - minimum: 67.8 - type: number - string: - description: None - pattern: "/[a-z]/i" - type: string - pattern_without_delimiter: - description: None - pattern: "^[A-Z].*" - type: string - byte: - description: None - format: byte - type: string - binary: - description: None - format: binary - type: string - date: - description: None - format: date - type: string - dateTime: - description: None - format: date-time - type: string - password: - description: None - format: password - maxLength: 64 - minLength: 10 - type: string - callback: - description: None - type: string + xml: + name: $special[model.name] + ContainerDefaultValue: + type: object required: - - byte - - double - - number - - pattern_without_delimiter - type: object - testJsonFormData_request: + - required_array + - nullable_required_array properties: - param: - description: field1 - type: string - param2: - description: field2 - type: string - required: - - param - - param2 - type: object - uploadFileWithRequiredFile_request: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - requiredFile: - description: file to upload - format: binary - type: string - required: - - requiredFile - type: object - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - BigCat_allOf: - properties: - kind: - enum: - - lions - - tigers - - leopards - - jaguars - type: string - type: object - example: null - securitySchemes: - petstore_auth: - flows: - implicit: - authorizationUrl: http://petstore.swagger.io/api/oauth/dialog - scopes: - write:pets: modify pets in your account - read:pets: read your pets - type: oauth2 - api_key: - in: header - name: api_key - type: apiKey - api_key_query: - in: query - name: api_key_query - type: apiKey - http_basic_test: - scheme: basic - type: http -x-original-swagger-version: "2.0" + nullable_array: + type: array + nullable: true + items: + type: string + nullable_required_array: + type: array + nullable: true + items: + type: string + required_array: + type: array + nullable: false + items: + type: string + nullable_array_with_default: + type: array + nullable: true + items: + type: string + default: ["foo", "bar"] diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index 60af3a5b92a..1f114e8f347 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -165,6 +165,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java index 60af3a5b92a..1f114e8f347 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -165,6 +165,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 60af3a5b92a..1f114e8f347 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -165,6 +165,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index 60af3a5b92a..1f114e8f347 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -165,6 +165,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES index 1249969fa6d..8f0d232df2e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES +++ b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES @@ -27,6 +27,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index eb4acdaeeb3..468c8d88bff 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -28,7 +28,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -38,7 +38,7 @@ public interface AnotherFakeApi { contentType = "application/json" ) Mono> call123testSpecialTags( - @RequestBody Mono body + @RequestBody Mono client ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java index 36f82654d0a..4589c980658 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -62,7 +62,7 @@ public interface FakeApi { method = "POST", value = "/fake/outer/boolean", accept = "*/*", - contentType = "*/*" + contentType = "application/json" ) Mono> fakeOuterBooleanSerialize( @RequestBody(required = false) Mono body @@ -73,17 +73,17 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @HttpExchange( method = "POST", value = "/fake/outer/composite", accept = "*/*", - contentType = "*/*" + contentType = "application/json" ) Mono> fakeOuterCompositeSerialize( - @RequestBody(required = false) Mono body + @RequestBody(required = false) Mono outerComposite ); @@ -98,7 +98,7 @@ public interface FakeApi { method = "POST", value = "/fake/outer/number", accept = "*/*", - contentType = "*/*" + contentType = "application/json" ) Mono> fakeOuterNumberSerialize( @RequestBody(required = false) Mono body @@ -116,7 +116,7 @@ public interface FakeApi { method = "POST", value = "/fake/outer/string", accept = "*/*", - contentType = "*/*" + contentType = "application/json" ) Mono> fakeOuterStringSerialize( @RequestBody(required = false) Mono body @@ -127,7 +127,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @HttpExchange( @@ -137,7 +137,7 @@ public interface FakeApi { contentType = "application/json" ) Mono> testBodyWithFileSchema( - @RequestBody Mono body + @RequestBody Mono fileSchemaTestClass ); @@ -145,7 +145,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @HttpExchange( @@ -156,7 +156,7 @@ public interface FakeApi { ) Mono> testBodyWithQueryParams( @RequestParam(value = "query", required = true) String query, - @RequestBody Mono body + @RequestBody Mono user ); @@ -164,7 +164,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -174,7 +174,7 @@ public interface FakeApi { contentType = "application/json" ) Mono> testClientModel( - @RequestBody Mono body + @RequestBody Mono client ); @@ -285,8 +285,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -296,12 +297,13 @@ public interface FakeApi { contentType = "application/json" ) Mono> testInlineAdditionalProperties( - @RequestBody Mono> param + @RequestBody Mono> requestBody ); /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -324,7 +326,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -337,7 +338,6 @@ public interface FakeApi { ) Mono> testQueryParameterCollectionFormat( @RequestParam(value = "pipe", required = true) List pipe, - @RequestParam(value = "ioutil", required = true) List ioutil, @RequestParam(value = "http", required = true) List http, @RequestParam(value = "url", required = true) List url, @RequestParam(value = "context", required = true) List context diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 4823b25802c..eba62384f1f 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -28,7 +28,7 @@ public interface FakeClassnameTags123Api { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -38,7 +38,7 @@ public interface FakeClassnameTags123Api { contentType = "application/json" ) Mono> testClassname( - @RequestBody Mono body + @RequestBody Mono client ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java index 48294145ebe..9e4acf4039d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -28,8 +28,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -40,12 +41,13 @@ public interface PetApi { contentType = "application/json" ) Mono> addPet( - @RequestBody Mono body + @RequestBody Mono pet ); /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -122,8 +124,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -136,12 +139,13 @@ public interface PetApi { contentType = "application/json" ) Mono> updatePet( - @RequestBody Mono body + @RequestBody Mono pet ); /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -163,6 +167,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -184,6 +189,7 @@ public interface PetApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java index bce45b2badd..7c390c674f6 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -80,8 +80,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -89,10 +90,10 @@ public interface StoreApi { method = "POST", value = "/store/order", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) Mono> placeOrder( - @RequestBody Mono body + @RequestBody Mono order ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java index 79dda760d32..d895641b2e6 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -30,51 +30,53 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @HttpExchange( method = "POST", value = "/user", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) Mono> createUser( - @RequestBody Mono body + @RequestBody Mono user ); /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @HttpExchange( method = "POST", value = "/user/createWithArray", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) Mono> createUsersWithArrayInput( - @RequestBody Flux body + @RequestBody Flux user ); /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @HttpExchange( method = "POST", value = "/user/createWithList", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) Mono> createUsersWithListInput( - @RequestBody Flux body + @RequestBody Flux user ); @@ -98,6 +100,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -116,6 +119,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -135,6 +139,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -153,7 +158,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -161,11 +166,11 @@ public interface UserApi { method = "PUT", value = "/user/{username}", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) Mono> updateUser( @PathVariable("username") String username, - @RequestBody Mono body + @RequestBody Mono user ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 169b7406f56..446381cac9d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -5,10 +5,13 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -25,41 +28,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -291,7 +294,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -300,11 +303,11 @@ public class AdditionalPropertiesClass { * @return anytype2 */ - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -344,13 +347,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index b37936c2134..c5b2fefbaf6 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index eb820544e7d..36367225a25 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 8caa5447995..7d80d25c0ae 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,15 @@ public class ArrayTest { @JsonProperty("array_of_string") - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..22b58754add --- /dev/null +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,218 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import jakarta.validation.constraints.NotNull; + + +import java.util.*; +import jakarta.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java index 8440fe77122..76034eff1ac 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -97,7 +97,7 @@ public class EnumArrays { @JsonProperty("array_enum") - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index b0d309b5765..b830e931ec5 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -27,7 +27,7 @@ public class FileSchemaTestClass { @JsonProperty("files") - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java index f9c40fdd60e..1b90373038e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,7 @@ public class MapTest { @JsonProperty("map_map_of_string") - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -63,15 +63,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1affd5d8362..efa8052677e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -34,7 +34,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java index 417eda278e2..c1a92c2d5e9 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store @@ -161,6 +161,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index 90be05037e4..d99aa571dcc 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -17,7 +17,7 @@ import jakarta.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -50,8 +50,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 8701e55eaa3..799aa25fccd 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -26,17 +26,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -136,6 +136,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 7b3eb0aec7f..ef2f61f81be 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -158,6 +158,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java index e93ad13b463..0a516da0c77 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -36,7 +36,7 @@ public class XmlItem { @JsonProperty("wrapped_array") - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -52,11 +52,11 @@ public class XmlItem { @JsonProperty("name_array") - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -72,11 +72,11 @@ public class XmlItem { @JsonProperty("prefix_array") - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -92,11 +92,11 @@ public class XmlItem { @JsonProperty("namespace_array") - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -112,11 +112,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/client/petstore/spring-http-interface/.openapi-generator/FILES b/samples/client/petstore/spring-http-interface/.openapi-generator/FILES index 9c06c7689f4..057a6b03c61 100644 --- a/samples/client/petstore/spring-http-interface/.openapi-generator/FILES +++ b/samples/client/petstore/spring-http-interface/.openapi-generator/FILES @@ -28,6 +28,7 @@ src/main/java/org/openapitools/model/CatDto.java src/main/java/org/openapitools/model/CategoryDto.java src/main/java/org/openapitools/model/ClassModelDto.java src/main/java/org/openapitools/model/ClientDto.java +src/main/java/org/openapitools/model/ContainerDefaultValueDto.java src/main/java/org/openapitools/model/DogAllOfDto.java src/main/java/org/openapitools/model/DogDto.java src/main/java/org/openapitools/model/EnumArraysDto.java diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java index e665db6842b..89b413cf6df 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -24,7 +24,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param clientDto client model (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -34,7 +34,7 @@ public interface AnotherFakeApi { contentType = "application/json" ) ResponseEntity call123testSpecialTags( - @RequestBody ClientDto body + @RequestBody ClientDto clientDto ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java index 15e5bfa51f6..a6e1f4d89ab 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java @@ -33,7 +33,7 @@ public interface FakeApi { * POST /fake/create_xml_item : creates an XmlItem * this route creates an XmlItem * - * @param xmlItem XmlItem Body (required) + * @param xmlItemDto XmlItem Body (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -43,7 +43,7 @@ public interface FakeApi { contentType = "application/xml" ) ResponseEntity createXmlItem( - @RequestBody XmlItemDto xmlItem + @RequestBody XmlItemDto xmlItemDto ); @@ -58,7 +58,7 @@ public interface FakeApi { method = "POST", value = "/fake/outer/boolean", accept = "*/*", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity fakeOuterBooleanSerialize( @RequestBody(required = false) Boolean body @@ -69,17 +69,17 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerCompositeDto Input composite as post body (optional) * @return Output composite (status code 200) */ @HttpExchange( method = "POST", value = "/fake/outer/composite", accept = "*/*", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity fakeOuterCompositeSerialize( - @RequestBody(required = false) OuterCompositeDto body + @RequestBody(required = false) OuterCompositeDto outerCompositeDto ); @@ -94,7 +94,7 @@ public interface FakeApi { method = "POST", value = "/fake/outer/number", accept = "*/*", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity fakeOuterNumberSerialize( @RequestBody(required = false) BigDecimal body @@ -112,7 +112,7 @@ public interface FakeApi { method = "POST", value = "/fake/outer/string", accept = "*/*", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity fakeOuterStringSerialize( @RequestBody(required = false) String body @@ -123,7 +123,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClassDto (required) * @return Success (status code 200) */ @HttpExchange( @@ -133,7 +133,7 @@ public interface FakeApi { contentType = "application/json" ) ResponseEntity testBodyWithFileSchema( - @RequestBody FileSchemaTestClassDto body + @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto ); @@ -141,7 +141,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param userDto (required) * @return Success (status code 200) */ @HttpExchange( @@ -152,7 +152,7 @@ public interface FakeApi { ) ResponseEntity testBodyWithQueryParams( @RequestParam(value = "query", required = true) String query, - @RequestBody UserDto body + @RequestBody UserDto userDto ); @@ -160,7 +160,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param clientDto client model (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -170,7 +170,7 @@ public interface FakeApi { contentType = "application/json" ) ResponseEntity testClientModel( - @RequestBody ClientDto body + @RequestBody ClientDto clientDto ); @@ -281,8 +281,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -292,12 +293,13 @@ public interface FakeApi { contentType = "application/json" ) ResponseEntity testInlineAdditionalProperties( - @RequestBody Map param + @RequestBody Map requestBody ); /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -320,7 +322,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -333,7 +334,6 @@ public interface FakeApi { ) ResponseEntity testQueryParameterCollectionFormat( @RequestParam(value = "pipe", required = true) List pipe, - @RequestParam(value = "ioutil", required = true) List ioutil, @RequestParam(value = "http", required = true) List http, @RequestParam(value = "url", required = true) List url, @RequestParam(value = "context", required = true) List context diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 5238a57c11a..9c7b1c807b6 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -24,7 +24,7 @@ public interface FakeClassnameTags123Api { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param clientDto client model (required) * @return successful operation (status code 200) */ @HttpExchange( @@ -34,7 +34,7 @@ public interface FakeClassnameTags123Api { contentType = "application/json" ) ResponseEntity testClassname( - @RequestBody ClientDto body + @RequestBody ClientDto clientDto ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java index eb00021ccd6..4cdaa75682a 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java @@ -24,8 +24,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param petDto Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -36,12 +37,13 @@ public interface PetApi { contentType = "application/json" ) ResponseEntity addPet( - @RequestBody PetDto body + @RequestBody PetDto petDto ); /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -118,8 +120,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param petDto Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -132,12 +135,13 @@ public interface PetApi { contentType = "application/json" ) ResponseEntity updatePet( - @RequestBody PetDto body + @RequestBody PetDto petDto ); /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -159,6 +163,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -180,6 +185,7 @@ public interface PetApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java index cadcceedb8a..c68eda93b70 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -76,8 +76,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param orderDto order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -85,10 +86,10 @@ public interface StoreApi { method = "POST", value = "/store/order", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity placeOrder( - @RequestBody OrderDto body + @RequestBody OrderDto orderDto ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java index 423d95850d7..8e230a58c04 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java @@ -26,51 +26,53 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param userDto Created user object (required) * @return successful operation (status code 200) */ @HttpExchange( method = "POST", value = "/user", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity createUser( - @RequestBody UserDto body + @RequestBody UserDto userDto ); /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param userDto List of user object (required) * @return successful operation (status code 200) */ @HttpExchange( method = "POST", value = "/user/createWithArray", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity createUsersWithArrayInput( - @RequestBody List body + @RequestBody List userDto ); /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param userDto List of user object (required) * @return successful operation (status code 200) */ @HttpExchange( method = "POST", value = "/user/createWithList", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity createUsersWithListInput( - @RequestBody List body + @RequestBody List userDto ); @@ -94,6 +96,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -112,6 +115,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -131,6 +135,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -149,7 +154,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param userDto Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -157,11 +162,11 @@ public interface UserApi { method = "PUT", value = "/user/{username}", accept = "application/json", - contentType = "*/*" + contentType = "application/json" ) ResponseEntity updateUser( @PathVariable("username") String username, - @RequestBody UserDto body + @RequestBody UserDto userDto ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 6dc80fc64c5..e2aa343d20f 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -6,10 +6,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -27,41 +30,41 @@ public class AdditionalPropertiesClassDto { @JsonProperty("map_string") - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -293,7 +296,7 @@ public class AdditionalPropertiesClassDto { } public AdditionalPropertiesClassDto anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -302,11 +305,11 @@ public class AdditionalPropertiesClassDto { * @return anytype2 */ - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -346,13 +349,24 @@ public class AdditionalPropertiesClassDto { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 0e954981dc9..3ae3538469a 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnlyDto { @JsonProperty("ArrayArrayNumber") - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 26e8636a6a7..b9ac23c6661 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnlyDto { @JsonProperty("ArrayNumber") - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java index ab8e5b17537..cbf7877faf1 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -26,15 +26,15 @@ public class ArrayTestDto { @JsonProperty("array_of_string") - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java new file mode 100644 index 00000000000..9d13d762de9 --- /dev/null +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -0,0 +1,203 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import jakarta.validation.constraints.NotNull; + + +import java.util.*; +import jakarta.annotation.Generated; + +/** + * ContainerDefaultValueDto + */ + +@JsonTypeName("ContainerDefaultValue") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValueDto { + + @JsonProperty("nullable_array") + + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + public ContainerDefaultValueDto nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValueDto nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValueDto requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValueDto nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValueDto containerDefaultValue = (ContainerDefaultValueDto) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValueDto {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java index b01e1a1b904..123810c921e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -99,7 +99,7 @@ public class EnumArraysDto { @JsonProperty("array_enum") - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 916fb159a1c..a7fb42c1980 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -29,7 +29,7 @@ public class FileSchemaTestClassDto { @JsonProperty("files") - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClassDto file(FileDto file) { this.file = file; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java index ea2eed82d1d..82a99c07ad9 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java @@ -26,7 +26,7 @@ public class MapTestDto { @JsonProperty("map_map_of_string") - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -65,15 +65,15 @@ public class MapTestDto { @JsonProperty("map_of_enum_string") - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 8622ea861da..c5a17c21d44 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { @JsonProperty("map") - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java index 4cb33158086..f2536180600 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java @@ -44,7 +44,7 @@ public class PetDto { @JsonProperty("tags") - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store @@ -146,6 +146,9 @@ public class PetDto { } public PetDto addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java index 6afd2e37646..1818d96452c 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -17,7 +17,7 @@ import jakarta.annotation.Generated; * SpecialModelNameDto */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelNameDto { @@ -50,8 +50,8 @@ public class SpecialModelNameDto { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelNameDto $specialModelName = (SpecialModelNameDto) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelNameDto specialModelName = (SpecialModelNameDto) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 37047d9a2e2..989330c9165 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -28,17 +28,17 @@ public class TypeHolderDefaultDto { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto stringItem(String stringItem) { this.stringItem = stringItem; @@ -118,6 +118,9 @@ public class TypeHolderDefaultDto { } public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 6ca0eb07b4e..dc6721ab240 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -139,6 +139,9 @@ public class TypeHolderExampleDto { } public TypeHolderExampleDto addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java index d88463882e3..416ed86b17f 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java @@ -38,7 +38,7 @@ public class XmlItemDto { @JsonProperty("wrapped_array") - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItemDto { @JsonProperty("name_array") - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItemDto { @JsonProperty("prefix_array") - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItemDto { @JsonProperty("namespace_array") - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItemDto { @JsonProperty("prefix_ns_array") - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java index 16a192536ec..aa414f42c1e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index ad48ebd85eb..ce65ccc5025 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES index 682ec1ebc9a..bdc0d268f43 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES @@ -26,6 +26,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index fba9ca70891..cc888cde0fc 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -41,7 +41,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -62,7 +62,7 @@ public interface AnotherFakeApi { consumes = "application/json" ) ResponseEntity call123testSpecialTags( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index 6ad68cc2eb0..0d3020ab885 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -92,7 +92,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = "*/*" + produces = "*/*", + consumes = "application/json" ) ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -103,7 +104,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @Operation( @@ -119,10 +120,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = "*/*" + produces = "*/*", + consumes = "application/json" ) ResponseEntity fakeOuterCompositeSerialize( - @Parameter(name = "body", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ); @@ -146,7 +148,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = "*/*" + produces = "*/*", + consumes = "application/json" ) ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -173,7 +176,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = "*/*" + produces = "*/*", + consumes = "application/json" ) ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -184,7 +188,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @Operation( @@ -201,7 +205,7 @@ public interface FakeApi { consumes = "application/json" ) ResponseEntity testBodyWithFileSchema( - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ); @@ -209,7 +213,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @Operation( @@ -226,7 +230,7 @@ public interface FakeApi { ) ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ); @@ -234,7 +238,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -255,7 +259,7 @@ public interface FakeApi { consumes = "application/json" ) ResponseEntity testClientModel( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); @@ -395,13 +399,15 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @Operation( operationId = "testInlineAdditionalProperties", summary = "test inline additionalProperties", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -413,12 +419,13 @@ public interface FakeApi { consumes = "application/json" ) ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ); /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -427,6 +434,7 @@ public interface FakeApi { @Operation( operationId = "testJsonFormData", summary = "test json serialization of form data", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -448,7 +456,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -468,7 +475,6 @@ public interface FakeApi { ) ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index b6709980d6b..a26836600fe 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -41,7 +41,7 @@ public interface FakeClassnameTags123Api { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -65,7 +65,7 @@ public interface FakeClassnameTags123Api { consumes = "application/json" ) ResponseEntity testClassname( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java index 07ead4fcb75..52b514af35a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java @@ -41,14 +41,16 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @Operation( operationId = "addPet", summary = "Add a new pet to the store", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -64,12 +66,13 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -79,6 +82,7 @@ public interface PetApi { @Operation( operationId = "deletePet", summary = "Deletes a pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -206,8 +210,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -216,6 +221,7 @@ public interface PetApi { @Operation( operationId = "updatePet", summary = "Update an existing pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -233,12 +239,13 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -248,6 +255,7 @@ public interface PetApi { @Operation( operationId = "updatePetWithForm", summary = "Updates a pet in the store with form data", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "405", description = "Invalid input") @@ -270,6 +278,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -279,6 +288,7 @@ public interface PetApi { @Operation( operationId = "uploadFile", summary = "uploads an image", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -304,6 +314,7 @@ public interface PetApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) @@ -313,6 +324,7 @@ public interface PetApi { @Operation( operationId = "uploadFileWithRequiredFile", summary = "uploads an image (required)", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index 951cd7a58b6..818c087c562 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -130,14 +130,16 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @Operation( operationId = "placeOrder", summary = "Place an order for a pet", + description = "", tags = { "store" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -150,10 +152,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = "application/json" + produces = "application/json", + consumes = "application/json" ) ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index 501ff9a7a28..24f42ea5dde 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java @@ -43,7 +43,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @Operation( @@ -57,22 +57,25 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = "application/json" ) ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithArrayInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -80,22 +83,25 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ); /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithListInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -103,10 +109,11 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ); @@ -139,6 +146,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -148,6 +156,7 @@ public interface UserApi { @Operation( operationId = "getUserByName", summary = "Get user by user name", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -170,6 +179,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -179,6 +189,7 @@ public interface UserApi { @Operation( operationId = "loginUser", summary = "Logs user into the system", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -201,12 +212,14 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @Operation( operationId = "logoutUser", summary = "Logs out current logged in user session", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -226,7 +239,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -242,11 +255,12 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = "application/json" ) ResponseEntity updateUser( @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 14e13504a8c..66e0aed61c6 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -5,10 +5,13 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -27,41 +30,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -302,7 +305,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -312,11 +315,11 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -357,13 +360,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 42600354f74..ead205932fa 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 2f6c19a8344..7ab62ebdb8f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java index 23ee84ce8b5..4c5a142ddca 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..ae4b8d558ca --- /dev/null +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,207 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java index 2720e81c227..696d07582b9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 8b196d5d7de..9b9f087aaa7 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java index 9811806e0c8..74cab2e2f8c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java @@ -26,7 +26,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -65,15 +65,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index bcf0155a1b2..d6b45daabd7 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java index acb7ce6b37b..13d4b0b04b9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -149,6 +149,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java index c3d3aa9182e..e0a16a7b89a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -53,8 +53,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java index e37caaf5784..76919cfbaaf 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -28,17 +28,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault stringItem(String stringItem) { this.stringItem = stringItem; @@ -122,6 +122,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java index c821c0257d2..6bcf2fdb5ef 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -144,6 +144,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -153,7 +156,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @Schema(name = "array_item", example = "[0, 1, 2, 3]", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java index 1a4455cdaa8..03f777866d6 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index ad48ebd85eb..ce65ccc5025 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index ad48ebd85eb..ce65ccc5025 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java index ad48ebd85eb..ce65ccc5025 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index ad48ebd85eb..ce65ccc5025 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java index ad48ebd85eb..ce65ccc5025 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java index 16a192536ec..aa414f42c1e 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator-ignore b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator-ignore deleted file mode 100644 index 7484ee590a3..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES deleted file mode 100644 index 5d716a83385..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ /dev/null @@ -1,71 +0,0 @@ -README.md -pom.xml -src/main/java/org/openapitools/OpenApiGeneratorApplication.java -src/main/java/org/openapitools/RFC3339DateFormat.java -src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java -src/main/java/org/openapitools/api/ApiUtil.java -src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java -src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java -src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java -src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java -src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java -src/main/java/org/openapitools/configuration/HomeController.java -src/main/java/org/openapitools/configuration/SpringDocConfiguration.java -src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java -src/main/java/org/openapitools/model/AdditionalPropertiesArray.java -src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java -src/main/java/org/openapitools/model/AdditionalPropertiesClass.java -src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java -src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java -src/main/java/org/openapitools/model/AdditionalPropertiesObject.java -src/main/java/org/openapitools/model/AdditionalPropertiesString.java -src/main/java/org/openapitools/model/Animal.java -src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java -src/main/java/org/openapitools/model/ArrayOfNumberOnly.java -src/main/java/org/openapitools/model/ArrayTest.java -src/main/java/org/openapitools/model/BigCat.java -src/main/java/org/openapitools/model/BigCatAllOf.java -src/main/java/org/openapitools/model/Capitalization.java -src/main/java/org/openapitools/model/Cat.java -src/main/java/org/openapitools/model/CatAllOf.java -src/main/java/org/openapitools/model/Category.java -src/main/java/org/openapitools/model/ClassModel.java -src/main/java/org/openapitools/model/Client.java -src/main/java/org/openapitools/model/Dog.java -src/main/java/org/openapitools/model/DogAllOf.java -src/main/java/org/openapitools/model/EnumArrays.java -src/main/java/org/openapitools/model/EnumClass.java -src/main/java/org/openapitools/model/EnumTest.java -src/main/java/org/openapitools/model/File.java -src/main/java/org/openapitools/model/FileSchemaTestClass.java -src/main/java/org/openapitools/model/FormatTest.java -src/main/java/org/openapitools/model/HasOnlyReadOnly.java -src/main/java/org/openapitools/model/MapTest.java -src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java -src/main/java/org/openapitools/model/Model200Response.java -src/main/java/org/openapitools/model/ModelApiResponse.java -src/main/java/org/openapitools/model/ModelList.java -src/main/java/org/openapitools/model/ModelReturn.java -src/main/java/org/openapitools/model/Name.java -src/main/java/org/openapitools/model/NumberOnly.java -src/main/java/org/openapitools/model/Order.java -src/main/java/org/openapitools/model/OuterComposite.java -src/main/java/org/openapitools/model/OuterEnum.java -src/main/java/org/openapitools/model/Pet.java -src/main/java/org/openapitools/model/ReadOnlyFirst.java -src/main/java/org/openapitools/model/SpecialModelName.java -src/main/java/org/openapitools/model/Tag.java -src/main/java/org/openapitools/model/TypeHolderDefault.java -src/main/java/org/openapitools/model/TypeHolderExample.java -src/main/java/org/openapitools/model/User.java -src/main/java/org/openapitools/model/XmlItem.java -src/main/resources/application.properties -src/main/resources/openapi.yaml -src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION deleted file mode 100644 index 7f4d792ec2c..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/README.md b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/README.md deleted file mode 100644 index e6de7e038ce..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# OpenAPI generated server - -Spring Boot Server - -## Overview -This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. -By using the [OpenAPI-Spec](https://openapis.org), you can easily generate a server stub. -This is an example of building a OpenAPI-enabled server in Java using the SpringBoot framework. - - -The underlying library integrating OpenAPI to Spring Boot is [springdoc](https://springdoc.org). -Springdoc will generate an OpenAPI v3 specification based on the generated Controller and Model classes. -The specification is available to download using the following url: -http://localhost:80/v3/api-docs/ - -Start your server as a simple java application - -You can view the api documentation in swagger-ui by pointing to -http://localhost:80/swagger-ui.html - -Change default port value in application.properties \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/pom.xml b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/pom.xml deleted file mode 100644 index 8a69ba3cda0..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - 4.0.0 - org.openapitools.openapi3 - spring-boot-beanvalidation-no-nullable - jar - spring-boot-beanvalidation-no-nullable - 1.0.0 - - 1.8 - ${java.version} - ${java.version} - UTF-8 - 1.6.14 - 4.15.5 - - - org.springframework.boot - spring-boot-starter-parent - 2.7.6 - - - - src/main/java - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.data - spring-data-commons - - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - - org.springframework.boot - spring-boot-starter-validation - - - com.fasterxml.jackson.core - jackson-databind - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/OpenApiGeneratorApplication.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/OpenApiGeneratorApplication.java deleted file mode 100644 index 63641a4e97a..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/OpenApiGeneratorApplication.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.openapitools; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.FilterType; -import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator; - -@SpringBootApplication( - nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class -) -@ComponentScan( - basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"}, - nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class -) -public class OpenApiGeneratorApplication { - - public static void main(String[] args) { - SpringApplication.run(OpenApiGeneratorApplication.class, args); - } - - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/RFC3339DateFormat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/RFC3339DateFormat.java deleted file mode 100644 index bcd3936d8b3..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/RFC3339DateFormat.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.openapitools; - -import com.fasterxml.jackson.databind.util.StdDateFormat; - -import java.text.DateFormat; -import java.text.FieldPosition; -import java.text.ParsePosition; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; - -public class RFC3339DateFormat extends DateFormat { - private static final long serialVersionUID = 1L; - private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); - - private final StdDateFormat fmt = new StdDateFormat() - .withTimeZone(TIMEZONE_Z) - .withColonInTimeZone(true); - - public RFC3339DateFormat() { - this.calendar = new GregorianCalendar(); - } - - @Override - public Date parse(String source, ParsePosition pos) { - return fmt.parse(source, pos); - } - - @Override - public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { - return fmt.format(date, toAppendTo, fieldPosition); - } - - @Override - public Object clone() { - return this; - } -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java deleted file mode 100644 index 608a1aeac6e..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.Client; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "$another-fake?", description = "the $another-fake? API") -public interface AnotherFakeApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * PATCH /another-fake/dummy : To test special tags - * To test special tags and operation ID starting with number - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "call123testSpecialTags", - summary = "To test special tags", - description = "To test special tags and operation ID starting with number", - tags = { "$another-fake?" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/another-fake/dummy", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default ResponseEntity call123testSpecialTags( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java deleted file mode 100644 index c2db7ca5a81..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class AnotherFakeApiController implements AnotherFakeApi { - - private final NativeWebRequest request; - - @Autowired - public AnotherFakeApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/ApiUtil.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/ApiUtil.java deleted file mode 100644 index 1245b1dd0cc..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/ApiUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.openapitools.api; - -import org.springframework.web.context.request.NativeWebRequest; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -public class ApiUtil { - public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { - try { - HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class); - res.setCharacterEncoding("UTF-8"); - res.addHeader("Content-Type", contentType); - res.getWriter().print(example); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java deleted file mode 100644 index 2fb1c8141af..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ /dev/null @@ -1,588 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "fake", description = "the fake API") -public interface FakeApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /fake/create_xml_item : creates an XmlItem - * this route creates an XmlItem - * - * @param xmlItem XmlItem Body (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createXmlItem", - summary = "creates an XmlItem", - description = "this route creates an XmlItem", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/create_xml_item", - consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } - ) - default ResponseEntity createXmlItem( - @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/outer/boolean - * Test serialization of outer boolean types - * - * @param body Input boolean as post body (optional) - * @return Output boolean (status code 200) - */ - @Operation( - operationId = "fakeOuterBooleanSerialize", - description = "Test serialization of outer boolean types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output boolean", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = Boolean.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/boolean", - produces = { "*/*" } - ) - default ResponseEntity fakeOuterBooleanSerialize( - @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/outer/composite - * Test serialization of object with outer number type - * - * @param body Input composite as post body (optional) - * @return Output composite (status code 200) - */ - @Operation( - operationId = "fakeOuterCompositeSerialize", - description = "Test serialization of object with outer number type", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output composite", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = OuterComposite.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/composite", - produces = { "*/*" } - ) - default ResponseEntity fakeOuterCompositeSerialize( - @Parameter(name = "body", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; - ApiUtil.setExampleResponse(request, "*/*", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/outer/number - * Test serialization of outer number types - * - * @param body Input number as post body (optional) - * @return Output number (status code 200) - */ - @Operation( - operationId = "fakeOuterNumberSerialize", - description = "Test serialization of outer number types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output number", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = BigDecimal.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/number", - produces = { "*/*" } - ) - default ResponseEntity fakeOuterNumberSerialize( - @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/outer/string - * Test serialization of outer string types - * - * @param body Input string as post body (optional) - * @return Output string (status code 200) - */ - @Operation( - operationId = "fakeOuterStringSerialize", - description = "Test serialization of outer string types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output string", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = String.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/string", - produces = { "*/*" } - ) - default ResponseEntity fakeOuterStringSerialize( - @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) String body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /fake/body-with-file-schema - * For this test, the body for this request much reference a schema named `File`. - * - * @param body (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testBodyWithFileSchema", - description = "For this test, the body for this request much reference a schema named `File`.", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/body-with-file-schema", - consumes = { "application/json" } - ) - default ResponseEntity testBodyWithFileSchema( - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody FileSchemaTestClass body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /fake/body-with-query-params - * - * @param query (required) - * @param body (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testBodyWithQueryParams", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/body-with-query-params", - consumes = { "application/json" } - ) - default ResponseEntity testBodyWithQueryParams( - @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody User body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PATCH /fake : To test \"client\" model - * To test \"client\" model - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testClientModel", - summary = "To test \"client\" model", - description = "To test \"client\" model", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/fake", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default ResponseEntity testClientModel( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake : Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * - * @param number None (required) - * @param _double None (required) - * @param patternWithoutDelimiter None (required) - * @param _byte None (required) - * @param integer None (optional) - * @param int32 None (optional) - * @param int64 None (optional) - * @param _float None (optional) - * @param string None (optional) - * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) - * @param password None (optional) - * @param paramCallback None (optional) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "testEndpointParameters", - summary = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트", - description = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - }, - security = { - @SecurityRequirement(name = "http_basic_test") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake", - consumes = { "application/x-www-form-urlencoded" } - ) - default ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, - @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, - @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string, - @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password, - @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /fake : To test enum parameters - * To test enum parameters - * - * @param enumHeaderStringArray Header parameter enum test (string array) (optional) - * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional) - * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) - * @param enumQueryInteger Query parameter enum test (double) (optional) - * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) - * @param enumFormString Form parameter enum test (string) (optional, default to -efg) - * @return Invalid request (status code 400) - * or Not found (status code 404) - */ - @Operation( - operationId = "testEnumParameters", - summary = "To test enum parameters", - description = "To test enum parameters", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid request"), - @ApiResponse(responseCode = "404", description = "Not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/fake", - consumes = { "application/x-www-form-urlencoded" } - ) - default ResponseEntity testEnumParameters( - @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) List enumHeaderStringArray, - @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) List enumQueryStringArray, - @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger, - @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) Double enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * DELETE /fake : Fake endpoint to test group parameters (optional) - * Fake endpoint to test group parameters (optional) - * - * @param requiredStringGroup Required String in group parameters (required) - * @param requiredBooleanGroup Required Boolean in group parameters (required) - * @param requiredInt64Group Required Integer in group parameters (required) - * @param stringGroup String in group parameters (optional) - * @param booleanGroup Boolean in group parameters (optional) - * @param int64Group Integer in group parameters (optional) - * @return Something wrong (status code 400) - */ - @Operation( - operationId = "testGroupParameters", - summary = "Fake endpoint to test group parameters (optional)", - description = "Fake endpoint to test group parameters (optional)", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Something wrong") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/fake" - ) - default ResponseEntity testGroupParameters( - @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup, - @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) Boolean booleanGroup, - @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) Long int64Group - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/inline-additionalProperties : test inline additionalProperties - * - * @param param request body (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testInlineAdditionalProperties", - summary = "test inline additionalProperties", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/inline-additionalProperties", - consumes = { "application/json" } - ) - default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /fake/jsonFormData : test json serialization of form data - * - * @param param field1 (required) - * @param param2 field2 (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testJsonFormData", - summary = "test json serialization of form data", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/fake/jsonFormData", - consumes = { "application/x-www-form-urlencoded" } - ) - default ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, - @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /fake/test-query-parameters - * To test the collection format in query parameters - * - * @param pipe (required) - * @param ioutil (required) - * @param http (required) - * @param url (required) - * @param context (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testQueryParameterCollectionFormat", - description = "To test the collection format in query parameters", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/test-query-parameters" - ) - default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) - * - * @param petId ID of pet to update (required) - * @param requiredFile file to upload (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "uploadFileWithRequiredFile", - summary = "uploads an image (required)", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = ModelApiResponse.class)) - }) - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/{petId}/uploadImageWithRequiredFile", - produces = { "application/json" }, - consumes = { "multipart/form-data" } - ) - default ResponseEntity uploadFileWithRequiredFile( - @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java deleted file mode 100644 index 5ae5d5fed98..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.openapitools.api; - -import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class FakeApiController implements FakeApi { - - private final NativeWebRequest request; - - @Autowired - public FakeApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java deleted file mode 100644 index 29936566e75..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.Client; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "fake_classname_tags 123#$%^", description = "the fake_classname_tags 123#$%^ API") -public interface FakeClassnameTestApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * PATCH /fake_classname_test : To test class name in snake case - * To test class name in snake case - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testClassname", - summary = "To test class name in snake case", - description = "To test class name in snake case", - tags = { "fake_classname_tags 123#$%^" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - }, - security = { - @SecurityRequirement(name = "api_key_query") - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/fake_classname_test", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default ResponseEntity testClassname( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java deleted file mode 100644 index 65b695629d4..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class FakeClassnameTestApiController implements FakeClassnameTestApi { - - private final NativeWebRequest request; - - @Autowired - public FakeClassnameTestApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java deleted file mode 100644 index 41c3a646f9a..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ /dev/null @@ -1,383 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import java.util.Set; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "pet", description = "Everything about your Pets") -public interface PetApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /pet : Add a new pet to the store - * - * @param body Pet object that needs to be added to the store (required) - * @return successful operation (status code 200) - * or Invalid input (status code 405) - */ - @Operation( - operationId = "addPet", - summary = "Add a new pet to the store", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "405", description = "Invalid input") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet", - consumes = { "application/json", "application/xml" } - ) - default ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * DELETE /pet/{petId} : Deletes a pet - * - * @param petId Pet id to delete (required) - * @param apiKey (optional) - * @return successful operation (status code 200) - * or Invalid pet value (status code 400) - */ - @Operation( - operationId = "deletePet", - summary = "Deletes a pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "400", description = "Invalid pet value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/pet/{petId}" - ) - default ResponseEntity deletePet( - @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) String apiKey - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/findByStatus : Finds Pets by status - * Multiple status values can be provided with comma separated strings - * - * @param status Status values that need to be considered for filter (required) - * @return successful operation (status code 200) - * or Invalid status value (status code 400) - */ - @Operation( - operationId = "findPetsByStatus", - summary = "Finds Pets by status", - description = "Multiple status values can be provided with comma separated strings", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", array = @ArraySchema(schema = @Schema(implementation = Pet.class))), - @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = Pet.class))) - }), - @ApiResponse(responseCode = "400", description = "Invalid status value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByStatus", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity> findPetsByStatus( - @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/findByTags : Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @param tags Tags to filter by (required) - * @return successful operation (status code 200) - * or Invalid tag value (status code 400) - * @deprecated - */ - @Deprecated - @Operation( - operationId = "findPetsByTags", - summary = "Finds Pets by tags", - description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", array = @ArraySchema(schema = @Schema(implementation = Pet.class))), - @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = Pet.class))) - }), - @ApiResponse(responseCode = "400", description = "Invalid tag value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByTags", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity> findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/{petId} : Find pet by ID - * Returns a single pet - * - * @param petId ID of pet to return (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - */ - @Operation( - operationId = "getPetById", - summary = "Find pet by ID", - description = "Returns a single pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Pet not found") - }, - security = { - @SecurityRequirement(name = "api_key") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/{petId}", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity getPetById( - @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /pet : Update an existing pet - * - * @param body Pet object that needs to be added to the store (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * or Validation exception (status code 405) - */ - @Operation( - operationId = "updatePet", - summary = "Update an existing pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Pet not found"), - @ApiResponse(responseCode = "405", description = "Validation exception") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/pet", - consumes = { "application/json", "application/xml" } - ) - default ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /pet/{petId} : Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated (required) - * @param name Updated name of the pet (optional) - * @param status Updated status of the pet (optional) - * @return Invalid input (status code 405) - */ - @Operation( - operationId = "updatePetWithForm", - summary = "Updates a pet in the store with form data", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "405", description = "Invalid input") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}", - consumes = { "application/x-www-form-urlencoded" } - ) - default ResponseEntity updatePetWithForm( - @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, - @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /pet/{petId}/uploadImage : uploads an image - * - * @param petId ID of pet to update (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @param file file to upload (optional) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "uploadFile", - summary = "uploads an image", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = ModelApiResponse.class)) - }) - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}/uploadImage", - produces = { "application/json" }, - consumes = { "multipart/form-data" } - ) - default ResponseEntity uploadFile( - @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, - @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java deleted file mode 100644 index ea6c56e02c1..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import java.util.Set; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class PetApiController implements PetApi { - - private final NativeWebRequest request; - - @Autowired - public PetApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java deleted file mode 100644 index 65a87a295ec..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ /dev/null @@ -1,203 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "store", description = "Access to Petstore orders") -public interface StoreApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * DELETE /store/order/{order_id} : Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * - * @param orderId ID of the order that needs to be deleted (required) - * @return Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @Operation( - operationId = "deleteOrder", - summary = "Delete purchase order by ID", - description = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Order not found") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/store/order/{order_id}" - ) - default ResponseEntity deleteOrder( - @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /store/inventory : Returns pet inventories by status - * Returns a map of status codes to quantities - * - * @return successful operation (status code 200) - */ - @Operation( - operationId = "getInventory", - summary = "Returns pet inventories by status", - description = "Returns a map of status codes to quantities", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Map.class)) - }) - }, - security = { - @SecurityRequirement(name = "api_key") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/inventory", - produces = { "application/json" } - ) - default ResponseEntity> getInventory( - - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /store/order/{order_id} : Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - * - * @param orderId ID of pet that needs to be fetched (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @Operation( - operationId = "getOrderById", - summary = "Find purchase order by ID", - description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Order.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Order.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Order not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/order/{order_id}", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity getOrderById( - @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /store/order : Place an order for a pet - * - * @param body order placed for purchasing the pet (required) - * @return successful operation (status code 200) - * or Invalid Order (status code 400) - */ - @Operation( - operationId = "placeOrder", - summary = "Place an order for a pet", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Order.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Order.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid Order") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/store/order", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java deleted file mode 100644 index 1292dc0b721..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApiController.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class StoreApiController implements StoreApi { - - private final NativeWebRequest request; - - @Autowired - public StoreApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java deleted file mode 100644 index 13c3f8176e6..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ /dev/null @@ -1,294 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "user", description = "Operations about user") -public interface UserApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /user : Create user - * This can only be done by the logged in user. - * - * @param body Created user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUser", - summary = "Create user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user" - ) - default ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /user/createWithArray : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUsersWithArrayInput", - summary = "Creates list of users with given input array", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithArray" - ) - default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /user/createWithList : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUsersWithListInput", - summary = "Creates list of users with given input array", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithList" - ) - default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * DELETE /user/{username} : Delete user - * This can only be done by the logged in user. - * - * @param username The name that needs to be deleted (required) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "deleteUser", - summary = "Delete user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/user/{username}" - ) - default ResponseEntity deleteUser( - @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/{username} : Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. (required) - * @return successful operation (status code 200) - * or Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "getUserByName", - summary = "Get user by user name", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = User.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = User.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/{username}", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity getUserByName( - @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 aeiou aeiou aeiou aeiou aeiou aeiou 123 "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/login : Logs user into the system - * - * @param username The user name for login (required) - * @param password The password for login in clear text (required) - * @return successful operation (status code 200) - * or Invalid username/password supplied (status code 400) - */ - @Operation( - operationId = "loginUser", - summary = "Logs user into the system", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = String.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = String.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid username/password supplied") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/login", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/logout : Logs out current logged in user session - * - * @return successful operation (status code 200) - */ - @Operation( - operationId = "logoutUser", - summary = "Logs out current logged in user session", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/logout" - ) - default ResponseEntity logoutUser( - - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /user/{username} : Updated user - * This can only be done by the logged in user. - * - * @param username name that need to be deleted (required) - * @param body Updated user object (required) - * @return Invalid user supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "updateUser", - summary = "Updated user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid user supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/user/{username}" - ) - default ResponseEntity updateUser( - @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java deleted file mode 100644 index ca00184d2a5..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApiController.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class UserApiController implements UserApi { - - private final NativeWebRequest request; - - @Autowired - public UserApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java deleted file mode 100644 index b257cf0a16c..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.openapitools.configuration; - -import org.openapitools.model.EnumClass; -import org.openapitools.model.OuterEnum; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.convert.converter.Converter; - -@Configuration -public class EnumConverterConfiguration { - - @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") - Converter enumClassConverter() { - return new Converter() { - @Override - public EnumClass convert(String source) { - return EnumClass.fromValue(source); - } - }; - } - @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.outerEnumConverter") - Converter outerEnumConverter() { - return new Converter() { - @Override - public OuterEnum convert(String source) { - return OuterEnum.fromValue(source); - } - }; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/HomeController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/HomeController.java deleted file mode 100644 index 9aa29284ab5..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/HomeController.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.openapitools.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * Home redirection to OpenAPI api documentation - */ -@Controller -public class HomeController { - - @RequestMapping("/") - public String index() { - return "redirect:swagger-ui.html"; - } - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java deleted file mode 100644 index a32f1f67787..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.openapitools.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.License; -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.security.SecurityScheme; - -@Configuration -public class SpringDocConfiguration { - - @Bean(name = "org.openapitools.configuration.SpringDocConfiguration.apiInfo") - OpenAPI apiInfo() { - return new OpenAPI() - .info( - new Info() - .title("OpenAPI Petstore") - .description("This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\") - .license( - new License() - .name("Apache-2.0") - .url("https://www.apache.org/licenses/LICENSE-2.0.html") - ) - .version("1.0.0") - ) - .components( - new Components() - .addSecuritySchemes("petstore_auth", new SecurityScheme() - .type(SecurityScheme.Type.OAUTH2) - ) - .addSecuritySchemes("api_key", new SecurityScheme() - .type(SecurityScheme.Type.APIKEY) - .in(SecurityScheme.In.HEADER) - .name("api_key") - ) - .addSecuritySchemes("api_key_query", new SecurityScheme() - .type(SecurityScheme.Type.APIKEY) - .in(SecurityScheme.In.QUERY) - .name("api_key_query") - ) - .addSecuritySchemes("http_basic_test", new SecurityScheme() - .type(SecurityScheme.Type.HTTP) - .scheme("basic") - ) - ) - ; - } -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java deleted file mode 100644 index d905906f7bf..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesAnyType - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesAnyType name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; - return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java deleted file mode 100644 index 3d02e9dd46a..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesArray - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesArray name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; - return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java deleted file mode 100644 index b7a841170a2..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesBoolean - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesBoolean name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; - return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java deleted file mode 100644 index c3a18f03786..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ /dev/null @@ -1,398 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesClass { - - @JsonProperty("map_string") - @Valid - private Map mapString = null; - - @JsonProperty("map_number") - @Valid - private Map mapNumber = null; - - @JsonProperty("map_integer") - @Valid - private Map mapInteger = null; - - @JsonProperty("map_boolean") - @Valid - private Map mapBoolean = null; - - @JsonProperty("map_array_integer") - @Valid - private Map> mapArrayInteger = null; - - @JsonProperty("map_array_anytype") - @Valid - private Map> mapArrayAnytype = null; - - @JsonProperty("map_map_string") - @Valid - private Map> mapMapString = null; - - @JsonProperty("map_map_anytype") - @Valid - private Map> mapMapAnytype = null; - - @JsonProperty("anytype_1") - private Object anytype1; - - @JsonProperty("anytype_2") - private Object anytype2; - - @JsonProperty("anytype_3") - private Object anytype3; - - public AdditionalPropertiesClass mapString(Map mapString) { - this.mapString = mapString; - return this; - } - - public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { - if (this.mapString == null) { - this.mapString = new HashMap<>(); - } - this.mapString.put(key, mapStringItem); - return this; - } - - /** - * Get mapString - * @return mapString - */ - - @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapString() { - return mapString; - } - - public void setMapString(Map mapString) { - this.mapString = mapString; - } - - public AdditionalPropertiesClass mapNumber(Map mapNumber) { - this.mapNumber = mapNumber; - return this; - } - - public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { - if (this.mapNumber == null) { - this.mapNumber = new HashMap<>(); - } - this.mapNumber.put(key, mapNumberItem); - return this; - } - - /** - * Get mapNumber - * @return mapNumber - */ - @Valid - @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapNumber() { - return mapNumber; - } - - public void setMapNumber(Map mapNumber) { - this.mapNumber = mapNumber; - } - - public AdditionalPropertiesClass mapInteger(Map mapInteger) { - this.mapInteger = mapInteger; - return this; - } - - public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { - if (this.mapInteger == null) { - this.mapInteger = new HashMap<>(); - } - this.mapInteger.put(key, mapIntegerItem); - return this; - } - - /** - * Get mapInteger - * @return mapInteger - */ - - @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapInteger() { - return mapInteger; - } - - public void setMapInteger(Map mapInteger) { - this.mapInteger = mapInteger; - } - - public AdditionalPropertiesClass mapBoolean(Map mapBoolean) { - this.mapBoolean = mapBoolean; - return this; - } - - public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { - if (this.mapBoolean == null) { - this.mapBoolean = new HashMap<>(); - } - this.mapBoolean.put(key, mapBooleanItem); - return this; - } - - /** - * Get mapBoolean - * @return mapBoolean - */ - - @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapBoolean() { - return mapBoolean; - } - - public void setMapBoolean(Map mapBoolean) { - this.mapBoolean = mapBoolean; - } - - public AdditionalPropertiesClass mapArrayInteger(Map> mapArrayInteger) { - this.mapArrayInteger = mapArrayInteger; - return this; - } - - public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { - if (this.mapArrayInteger == null) { - this.mapArrayInteger = new HashMap<>(); - } - this.mapArrayInteger.put(key, mapArrayIntegerItem); - return this; - } - - /** - * Get mapArrayInteger - * @return mapArrayInteger - */ - @Valid - @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapArrayInteger() { - return mapArrayInteger; - } - - public void setMapArrayInteger(Map> mapArrayInteger) { - this.mapArrayInteger = mapArrayInteger; - } - - public AdditionalPropertiesClass mapArrayAnytype(Map> mapArrayAnytype) { - this.mapArrayAnytype = mapArrayAnytype; - return this; - } - - public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { - if (this.mapArrayAnytype == null) { - this.mapArrayAnytype = new HashMap<>(); - } - this.mapArrayAnytype.put(key, mapArrayAnytypeItem); - return this; - } - - /** - * Get mapArrayAnytype - * @return mapArrayAnytype - */ - @Valid - @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapArrayAnytype() { - return mapArrayAnytype; - } - - public void setMapArrayAnytype(Map> mapArrayAnytype) { - this.mapArrayAnytype = mapArrayAnytype; - } - - public AdditionalPropertiesClass mapMapString(Map> mapMapString) { - this.mapMapString = mapMapString; - return this; - } - - public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { - if (this.mapMapString == null) { - this.mapMapString = new HashMap<>(); - } - this.mapMapString.put(key, mapMapStringItem); - return this; - } - - /** - * Get mapMapString - * @return mapMapString - */ - @Valid - @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapString() { - return mapMapString; - } - - public void setMapMapString(Map> mapMapString) { - this.mapMapString = mapMapString; - } - - public AdditionalPropertiesClass mapMapAnytype(Map> mapMapAnytype) { - this.mapMapAnytype = mapMapAnytype; - return this; - } - - public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { - if (this.mapMapAnytype == null) { - this.mapMapAnytype = new HashMap<>(); - } - this.mapMapAnytype.put(key, mapMapAnytypeItem); - return this; - } - - /** - * Get mapMapAnytype - * @return mapMapAnytype - */ - @Valid - @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapAnytype() { - return mapMapAnytype; - } - - public void setMapMapAnytype(Map> mapMapAnytype) { - this.mapMapAnytype = mapMapAnytype; - } - - public AdditionalPropertiesClass anytype1(Object anytype1) { - this.anytype1 = anytype1; - return this; - } - - /** - * Get anytype1 - * @return anytype1 - */ - - @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype1() { - return anytype1; - } - - public void setAnytype1(Object anytype1) { - this.anytype1 = anytype1; - } - - public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; - return this; - } - - /** - * Get anytype2 - * @return anytype2 - */ - - @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype2() { - return anytype2; - } - - public void setAnytype2(Object anytype2) { - this.anytype2 = anytype2; - } - - public AdditionalPropertiesClass anytype3(Object anytype3) { - this.anytype3 = anytype3; - return this; - } - - /** - * Get anytype3 - * @return anytype3 - */ - - @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype3() { - return anytype3; - } - - public void setAnytype3(Object anytype3) { - this.anytype3 = anytype3; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; - return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && - Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && - Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && - Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && - Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && - Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && - Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && - Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && - Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && - Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); - } - - @Override - public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesClass {\n"); - sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); - sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); - sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); - sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); - sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); - sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); - sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); - sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); - sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); - sb.append(" anytype2: ").append(toIndentedString(anytype2)).append("\n"); - sb.append(" anytype3: ").append(toIndentedString(anytype3)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java deleted file mode 100644 index 9434294daf4..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesInteger - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesInteger name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; - return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java deleted file mode 100644 index 2e3760d2115..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesNumber - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesNumber name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; - return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java deleted file mode 100644 index d4d88060405..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesObject - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesObject name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; - return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java deleted file mode 100644 index a4fb298c33b..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesString - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesString name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; - return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java deleted file mode 100644 index 269a4170ff7..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java +++ /dev/null @@ -1,139 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Animal - */ - -@JsonIgnoreProperties( - value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization - allowSetters = true // allows the className to be set during deserialization -) -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) -@JsonSubTypes({ - @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"), - @JsonSubTypes.Type(value = Cat.class, name = "Cat"), - @JsonSubTypes.Type(value = Dog.class, name = "Dog") -}) - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Animal { - - @JsonProperty("className") - private String className; - - @JsonProperty("color") - private String color = "red"; - - /** - * Default constructor - * @deprecated Use {@link Animal#Animal(String)} - */ - @Deprecated - public Animal() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Animal(String className) { - this.className = className; - } - - public Animal className(String className) { - this.className = className; - return this; - } - - /** - * Get className - * @return className - */ - @NotNull - @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED) - public String getClassName() { - return className; - } - - public void setClassName(String className) { - this.className = className; - } - - public Animal color(String color) { - this.color = color; - return this; - } - - /** - * Get color - * @return color - */ - - @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getColor() { - return color; - } - - public void setColor(String color) { - this.color = color; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Animal animal = (Animal) o; - return Objects.equals(this.className, animal.className) && - Objects.equals(this.color, animal.color); - } - - @Override - public int hashCode() { - return Objects.hash(className, color); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Animal {\n"); - sb.append(" className: ").append(toIndentedString(className)).append("\n"); - sb.append(" color: ").append(toIndentedString(color)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java deleted file mode 100644 index 82f57b75f44..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayOfArrayOfNumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayOfArrayOfNumberOnly { - - @JsonProperty("ArrayArrayNumber") - @Valid - private List> arrayArrayNumber = null; - - public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { - this.arrayArrayNumber = arrayArrayNumber; - return this; - } - - public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { - if (this.arrayArrayNumber == null) { - this.arrayArrayNumber = new ArrayList<>(); - } - this.arrayArrayNumber.add(arrayArrayNumberItem); - return this; - } - - /** - * Get arrayArrayNumber - * @return arrayArrayNumber - */ - @Valid - @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayNumber() { - return arrayArrayNumber; - } - - public void setArrayArrayNumber(List> arrayArrayNumber) { - this.arrayArrayNumber = arrayArrayNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o; - return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber); - } - - @Override - public int hashCode() { - return Objects.hash(arrayArrayNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayOfArrayOfNumberOnly {\n"); - sb.append(" arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java deleted file mode 100644 index 30fd1ee2f00..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayOfNumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayOfNumberOnly { - - @JsonProperty("ArrayNumber") - @Valid - private List arrayNumber = null; - - public ArrayOfNumberOnly arrayNumber(List arrayNumber) { - this.arrayNumber = arrayNumber; - return this; - } - - public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { - if (this.arrayNumber == null) { - this.arrayNumber = new ArrayList<>(); - } - this.arrayNumber.add(arrayNumberItem); - return this; - } - - /** - * Get arrayNumber - * @return arrayNumber - */ - @Valid - @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayNumber() { - return arrayNumber; - } - - public void setArrayNumber(List arrayNumber) { - this.arrayNumber = arrayNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o; - return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber); - } - - @Override - public int hashCode() { - return Objects.hash(arrayNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayOfNumberOnly {\n"); - sb.append(" arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java deleted file mode 100644 index 69d0c66293d..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ /dev/null @@ -1,160 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.model.ReadOnlyFirst; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayTest - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayTest { - - @JsonProperty("array_of_string") - @Valid - private List arrayOfString = null; - - @JsonProperty("array_array_of_integer") - @Valid - private List> arrayArrayOfInteger = null; - - @JsonProperty("array_array_of_model") - @Valid - private List> arrayArrayOfModel = null; - - public ArrayTest arrayOfString(List arrayOfString) { - this.arrayOfString = arrayOfString; - return this; - } - - public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { - if (this.arrayOfString == null) { - this.arrayOfString = new ArrayList<>(); - } - this.arrayOfString.add(arrayOfStringItem); - return this; - } - - /** - * Get arrayOfString - * @return arrayOfString - */ - - @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayOfString() { - return arrayOfString; - } - - public void setArrayOfString(List arrayOfString) { - this.arrayOfString = arrayOfString; - } - - public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { - this.arrayArrayOfInteger = arrayArrayOfInteger; - return this; - } - - public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { - if (this.arrayArrayOfInteger == null) { - this.arrayArrayOfInteger = new ArrayList<>(); - } - this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); - return this; - } - - /** - * Get arrayArrayOfInteger - * @return arrayArrayOfInteger - */ - @Valid - @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayOfInteger() { - return arrayArrayOfInteger; - } - - public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { - this.arrayArrayOfInteger = arrayArrayOfInteger; - } - - public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { - this.arrayArrayOfModel = arrayArrayOfModel; - return this; - } - - public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayOfModelItem) { - if (this.arrayArrayOfModel == null) { - this.arrayArrayOfModel = new ArrayList<>(); - } - this.arrayArrayOfModel.add(arrayArrayOfModelItem); - return this; - } - - /** - * Get arrayArrayOfModel - * @return arrayArrayOfModel - */ - @Valid - @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayOfModel() { - return arrayArrayOfModel; - } - - public void setArrayArrayOfModel(List> arrayArrayOfModel) { - this.arrayArrayOfModel = arrayArrayOfModel; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayTest arrayTest = (ArrayTest) o; - return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) && - Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) && - Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel); - } - - @Override - public int hashCode() { - return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayTest {\n"); - sb.append(" arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n"); - sb.append(" arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n"); - sb.append(" arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java deleted file mode 100644 index f07e9f4b562..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ /dev/null @@ -1,160 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.model.Cat; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * BigCat - */ - - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class BigCat extends Cat { - - /** - * Gets or Sets kind - */ - public enum KindEnum { - LIONS("lions"), - - TIGERS("tigers"), - - LEOPARDS("leopards"), - - JAGUARS("jaguars"); - - private String value; - - KindEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static KindEnum fromValue(String value) { - for (KindEnum b : KindEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("kind") - private KindEnum kind; - - /** - * Default constructor - * @deprecated Use {@link BigCat#BigCat(String)} - */ - @Deprecated - public BigCat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public BigCat(String className) { - super(className); - } - - public BigCat kind(KindEnum kind) { - this.kind = kind; - return this; - } - - /** - * Get kind - * @return kind - */ - - @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public KindEnum getKind() { - return kind; - } - - public void setKind(KindEnum kind) { - this.kind = kind; - } - - public BigCat declawed(Boolean declawed) { - super.setDeclawed(declawed); - return this; - } - - public BigCat className(String className) { - super.setClassName(className); - return this; - } - - public BigCat color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - BigCat bigCat = (BigCat) o; - return Objects.equals(this.kind, bigCat.kind) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(kind, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class BigCat {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" kind: ").append(toIndentedString(kind)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java deleted file mode 100644 index c9532c1e3f1..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * BigCatAllOf - */ - -@JsonTypeName("BigCat_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class BigCatAllOf { - - /** - * Gets or Sets kind - */ - public enum KindEnum { - LIONS("lions"), - - TIGERS("tigers"), - - LEOPARDS("leopards"), - - JAGUARS("jaguars"); - - private String value; - - KindEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static KindEnum fromValue(String value) { - for (KindEnum b : KindEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("kind") - private KindEnum kind; - - public BigCatAllOf kind(KindEnum kind) { - this.kind = kind; - return this; - } - - /** - * Get kind - * @return kind - */ - - @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public KindEnum getKind() { - return kind; - } - - public void setKind(KindEnum kind) { - this.kind = kind; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - BigCatAllOf bigCatAllOf = (BigCatAllOf) o; - return Objects.equals(this.kind, bigCatAllOf.kind); - } - - @Override - public int hashCode() { - return Objects.hash(kind); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class BigCatAllOf {\n"); - sb.append(" kind: ").append(toIndentedString(kind)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java deleted file mode 100644 index eb734357980..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java +++ /dev/null @@ -1,202 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Capitalization - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Capitalization { - - @JsonProperty("smallCamel") - private String smallCamel; - - @JsonProperty("CapitalCamel") - private String capitalCamel; - - @JsonProperty("small_Snake") - private String smallSnake; - - @JsonProperty("Capital_Snake") - private String capitalSnake; - - @JsonProperty("SCA_ETH_Flow_Points") - private String scAETHFlowPoints; - - @JsonProperty("ATT_NAME") - private String ATT_NAME; - - public Capitalization smallCamel(String smallCamel) { - this.smallCamel = smallCamel; - return this; - } - - /** - * Get smallCamel - * @return smallCamel - */ - - @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSmallCamel() { - return smallCamel; - } - - public void setSmallCamel(String smallCamel) { - this.smallCamel = smallCamel; - } - - public Capitalization capitalCamel(String capitalCamel) { - this.capitalCamel = capitalCamel; - return this; - } - - /** - * Get capitalCamel - * @return capitalCamel - */ - - @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getCapitalCamel() { - return capitalCamel; - } - - public void setCapitalCamel(String capitalCamel) { - this.capitalCamel = capitalCamel; - } - - public Capitalization smallSnake(String smallSnake) { - this.smallSnake = smallSnake; - return this; - } - - /** - * Get smallSnake - * @return smallSnake - */ - - @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSmallSnake() { - return smallSnake; - } - - public void setSmallSnake(String smallSnake) { - this.smallSnake = smallSnake; - } - - public Capitalization capitalSnake(String capitalSnake) { - this.capitalSnake = capitalSnake; - return this; - } - - /** - * Get capitalSnake - * @return capitalSnake - */ - - @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getCapitalSnake() { - return capitalSnake; - } - - public void setCapitalSnake(String capitalSnake) { - this.capitalSnake = capitalSnake; - } - - public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { - this.scAETHFlowPoints = scAETHFlowPoints; - return this; - } - - /** - * Get scAETHFlowPoints - * @return scAETHFlowPoints - */ - - @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getScAETHFlowPoints() { - return scAETHFlowPoints; - } - - public void setScAETHFlowPoints(String scAETHFlowPoints) { - this.scAETHFlowPoints = scAETHFlowPoints; - } - - public Capitalization ATT_NAME(String ATT_NAME) { - this.ATT_NAME = ATT_NAME; - return this; - } - - /** - * Name of the pet - * @return ATT_NAME - */ - - @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getATTNAME() { - return ATT_NAME; - } - - public void setATTNAME(String ATT_NAME) { - this.ATT_NAME = ATT_NAME; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Capitalization capitalization = (Capitalization) o; - return Objects.equals(this.smallCamel, capitalization.smallCamel) && - Objects.equals(this.capitalCamel, capitalization.capitalCamel) && - Objects.equals(this.smallSnake, capitalization.smallSnake) && - Objects.equals(this.capitalSnake, capitalization.capitalSnake) && - Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) && - Objects.equals(this.ATT_NAME, capitalization.ATT_NAME); - } - - @Override - public int hashCode() { - return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Capitalization {\n"); - sb.append(" smallCamel: ").append(toIndentedString(smallCamel)).append("\n"); - sb.append(" capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n"); - sb.append(" smallSnake: ").append(toIndentedString(smallSnake)).append("\n"); - sb.append(" capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n"); - sb.append(" scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n"); - sb.append(" ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java deleted file mode 100644 index c6048b1335a..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Cat - */ - -@JsonIgnoreProperties( - value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization - allowSetters = true // allows the className to be set during deserialization -) -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) -@JsonSubTypes({ - @JsonSubTypes.Type(value = BigCat.class, name = "BigCat") -}) - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Cat extends Animal { - - @JsonProperty("declawed") - private Boolean declawed; - - /** - * Default constructor - * @deprecated Use {@link Cat#Cat(String)} - */ - @Deprecated - public Cat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Cat(String className) { - super(className); - } - - public Cat declawed(Boolean declawed) { - this.declawed = declawed; - return this; - } - - /** - * Get declawed - * @return declawed - */ - - @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getDeclawed() { - return declawed; - } - - public void setDeclawed(Boolean declawed) { - this.declawed = declawed; - } - - public Cat className(String className) { - super.setClassName(className); - return this; - } - - public Cat color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Cat cat = (Cat) o; - return Objects.equals(this.declawed, cat.declawed) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(declawed, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Cat {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java deleted file mode 100644 index df8376c4a99..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * CatAllOf - */ - -@JsonTypeName("Cat_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class CatAllOf { - - @JsonProperty("declawed") - private Boolean declawed; - - public CatAllOf declawed(Boolean declawed) { - this.declawed = declawed; - return this; - } - - /** - * Get declawed - * @return declawed - */ - - @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getDeclawed() { - return declawed; - } - - public void setDeclawed(Boolean declawed) { - this.declawed = declawed; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - CatAllOf catAllOf = (CatAllOf) o; - return Objects.equals(this.declawed, catAllOf.declawed); - } - - @Override - public int hashCode() { - return Objects.hash(declawed); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class CatAllOf {\n"); - sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java deleted file mode 100644 index 155f4416d9f..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Category - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Category { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name = "default-name"; - - /** - * Default constructor - * @deprecated Use {@link Category#Category(String)} - */ - @Deprecated - public Category() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Category(String name) { - this.name = name; - } - - public Category id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Category name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Category category = (Category) o; - return Objects.equals(this.id, category.id) && - Objects.equals(this.name, category.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Category {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java deleted file mode 100644 index 348a9826cbf..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model with \"_class\" property - */ - -@Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ClassModel { - - @JsonProperty("_class") - private String propertyClass; - - public ClassModel propertyClass(String propertyClass) { - this.propertyClass = propertyClass; - return this; - } - - /** - * Get propertyClass - * @return propertyClass - */ - - @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPropertyClass() { - return propertyClass; - } - - public void setPropertyClass(String propertyClass) { - this.propertyClass = propertyClass; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ClassModel classModel = (ClassModel) o; - return Objects.equals(this.propertyClass, classModel.propertyClass); - } - - @Override - public int hashCode() { - return Objects.hash(propertyClass); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ClassModel {\n"); - sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java deleted file mode 100644 index 082355c8ef4..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Client - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Client { - - @JsonProperty("client") - private String client; - - public Client client(String client) { - this.client = client; - return this; - } - - /** - * Get client - * @return client - */ - - @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getClient() { - return client; - } - - public void setClient(String client) { - this.client = client; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Client client = (Client) o; - return Objects.equals(this.client, client.client); - } - - @Override - public int hashCode() { - return Objects.hash(client); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Client {\n"); - sb.append(" client: ").append(toIndentedString(client)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java deleted file mode 100644 index 0de88edc8ab..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.Animal; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Dog - */ - - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Dog extends Animal { - - @JsonProperty("breed") - private String breed; - - /** - * Default constructor - * @deprecated Use {@link Dog#Dog(String)} - */ - @Deprecated - public Dog() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Dog(String className) { - super(className); - } - - public Dog breed(String breed) { - this.breed = breed; - return this; - } - - /** - * Get breed - * @return breed - */ - - @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBreed() { - return breed; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - public Dog className(String className) { - super.setClassName(className); - return this; - } - - public Dog color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Dog dog = (Dog) o; - return Objects.equals(this.breed, dog.breed) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(breed, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Dog {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java deleted file mode 100644 index 318dcd160d8..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * DogAllOf - */ - -@JsonTypeName("Dog_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class DogAllOf { - - @JsonProperty("breed") - private String breed; - - public DogAllOf breed(String breed) { - this.breed = breed; - return this; - } - - /** - * Get breed - * @return breed - */ - - @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBreed() { - return breed; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - DogAllOf dogAllOf = (DogAllOf) o; - return Objects.equals(this.breed, dogAllOf.breed); - } - - @Override - public int hashCode() { - return Objects.hash(breed); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class DogAllOf {\n"); - sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java deleted file mode 100644 index 5c87c8ab9e8..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ /dev/null @@ -1,188 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.ArrayList; -import java.util.List; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * EnumArrays - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class EnumArrays { - - /** - * Gets or Sets justSymbol - */ - public enum JustSymbolEnum { - GREATER_THAN_OR_EQUAL_TO(">="), - - DOLLAR("$"); - - private String value; - - JustSymbolEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static JustSymbolEnum fromValue(String value) { - for (JustSymbolEnum b : JustSymbolEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("just_symbol") - private JustSymbolEnum justSymbol; - - /** - * Gets or Sets arrayEnum - */ - public enum ArrayEnumEnum { - FISH("fish"), - - CRAB("crab"); - - private String value; - - ArrayEnumEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static ArrayEnumEnum fromValue(String value) { - for (ArrayEnumEnum b : ArrayEnumEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("array_enum") - @Valid - private List arrayEnum = null; - - public EnumArrays justSymbol(JustSymbolEnum justSymbol) { - this.justSymbol = justSymbol; - return this; - } - - /** - * Get justSymbol - * @return justSymbol - */ - - @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public JustSymbolEnum getJustSymbol() { - return justSymbol; - } - - public void setJustSymbol(JustSymbolEnum justSymbol) { - this.justSymbol = justSymbol; - } - - public EnumArrays arrayEnum(List arrayEnum) { - this.arrayEnum = arrayEnum; - return this; - } - - public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { - if (this.arrayEnum == null) { - this.arrayEnum = new ArrayList<>(); - } - this.arrayEnum.add(arrayEnumItem); - return this; - } - - /** - * Get arrayEnum - * @return arrayEnum - */ - - @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayEnum() { - return arrayEnum; - } - - public void setArrayEnum(List arrayEnum) { - this.arrayEnum = arrayEnum; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - EnumArrays enumArrays = (EnumArrays) o; - return Objects.equals(this.justSymbol, enumArrays.justSymbol) && - Objects.equals(this.arrayEnum, enumArrays.arrayEnum); - } - - @Override - public int hashCode() { - return Objects.hash(justSymbol, arrayEnum); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class EnumArrays {\n"); - sb.append(" justSymbol: ").append(toIndentedString(justSymbol)).append("\n"); - sb.append(" arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumClass.java deleted file mode 100644 index ee89c0fd200..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumClass.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Gets or Sets EnumClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public enum EnumClass { - - _ABC("_abc"), - - _EFG("-efg"), - - _XYZ_("(xyz)"); - - private String value; - - EnumClass(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java deleted file mode 100644 index cbd60e48575..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java +++ /dev/null @@ -1,342 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.model.OuterEnum; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * EnumTest - */ - -@JsonTypeName("Enum_Test") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class EnumTest { - - /** - * Gets or Sets enumString - */ - public enum EnumStringEnum { - UPPER("UPPER"), - - LOWER("lower"), - - EMPTY(""); - - private String value; - - EnumStringEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumStringEnum fromValue(String value) { - for (EnumStringEnum b : EnumStringEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_string") - private EnumStringEnum enumString; - - /** - * Gets or Sets enumStringRequired - */ - public enum EnumStringRequiredEnum { - UPPER("UPPER"), - - LOWER("lower"), - - EMPTY(""); - - private String value; - - EnumStringRequiredEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumStringRequiredEnum fromValue(String value) { - for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_string_required") - private EnumStringRequiredEnum enumStringRequired; - - /** - * Gets or Sets enumInteger - */ - public enum EnumIntegerEnum { - NUMBER_1(1), - - NUMBER_MINUS_1(-1); - - private Integer value; - - EnumIntegerEnum(Integer value) { - this.value = value; - } - - @JsonValue - public Integer getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumIntegerEnum fromValue(Integer value) { - for (EnumIntegerEnum b : EnumIntegerEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_integer") - private EnumIntegerEnum enumInteger; - - /** - * Gets or Sets enumNumber - */ - public enum EnumNumberEnum { - NUMBER_1_DOT_1(1.1), - - NUMBER_MINUS_1_DOT_2(-1.2); - - private Double value; - - EnumNumberEnum(Double value) { - this.value = value; - } - - @JsonValue - public Double getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumNumberEnum fromValue(Double value) { - for (EnumNumberEnum b : EnumNumberEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_number") - private EnumNumberEnum enumNumber; - - @JsonProperty("outerEnum") - private OuterEnum outerEnum; - - /** - * Default constructor - * @deprecated Use {@link EnumTest#EnumTest(EnumStringRequiredEnum)} - */ - @Deprecated - public EnumTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public EnumTest(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - - public EnumTest enumString(EnumStringEnum enumString) { - this.enumString = enumString; - return this; - } - - /** - * Get enumString - * @return enumString - */ - - @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumStringEnum getEnumString() { - return enumString; - } - - public void setEnumString(EnumStringEnum enumString) { - this.enumString = enumString; - } - - public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - return this; - } - - /** - * Get enumStringRequired - * @return enumStringRequired - */ - @NotNull - @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED) - public EnumStringRequiredEnum getEnumStringRequired() { - return enumStringRequired; - } - - public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - - public EnumTest enumInteger(EnumIntegerEnum enumInteger) { - this.enumInteger = enumInteger; - return this; - } - - /** - * Get enumInteger - * @return enumInteger - */ - - @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumIntegerEnum getEnumInteger() { - return enumInteger; - } - - public void setEnumInteger(EnumIntegerEnum enumInteger) { - this.enumInteger = enumInteger; - } - - public EnumTest enumNumber(EnumNumberEnum enumNumber) { - this.enumNumber = enumNumber; - return this; - } - - /** - * Get enumNumber - * @return enumNumber - */ - - @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumNumberEnum getEnumNumber() { - return enumNumber; - } - - public void setEnumNumber(EnumNumberEnum enumNumber) { - this.enumNumber = enumNumber; - } - - public EnumTest outerEnum(OuterEnum outerEnum) { - this.outerEnum = outerEnum; - return this; - } - - /** - * Get outerEnum - * @return outerEnum - */ - @Valid - @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OuterEnum getOuterEnum() { - return outerEnum; - } - - public void setOuterEnum(OuterEnum outerEnum) { - this.outerEnum = outerEnum; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - EnumTest enumTest = (EnumTest) o; - return Objects.equals(this.enumString, enumTest.enumString) && - Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && - Objects.equals(this.enumInteger, enumTest.enumInteger) && - Objects.equals(this.enumNumber, enumTest.enumNumber) && - Objects.equals(this.outerEnum, enumTest.outerEnum); - } - - @Override - public int hashCode() { - return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class EnumTest {\n"); - sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n"); - sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n"); - sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n"); - sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n"); - sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java deleted file mode 100644 index 87a7c66e2be..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Must be named `File` for test. - */ - -@Schema(name = "File", description = "Must be named `File` for test.") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class File { - - @JsonProperty("sourceURI") - private String sourceURI; - - public File sourceURI(String sourceURI) { - this.sourceURI = sourceURI; - return this; - } - - /** - * Test capitalization - * @return sourceURI - */ - - @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSourceURI() { - return sourceURI; - } - - public void setSourceURI(String sourceURI) { - this.sourceURI = sourceURI; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - File file = (File) o; - return Objects.equals(this.sourceURI, file.sourceURI); - } - - @Override - public int hashCode() { - return Objects.hash(sourceURI); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class File {\n"); - sb.append(" sourceURI: ").append(toIndentedString(sourceURI)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java deleted file mode 100644 index 1c05208a474..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ /dev/null @@ -1,118 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * FileSchemaTestClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class FileSchemaTestClass { - - @JsonProperty("file") - private File file; - - @JsonProperty("files") - @Valid - private List<@Valid File> files = null; - - public FileSchemaTestClass file(File file) { - this.file = file; - return this; - } - - /** - * Get file - * @return file - */ - @Valid - @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public File getFile() { - return file; - } - - public void setFile(File file) { - this.file = file; - } - - public FileSchemaTestClass files(List<@Valid File> files) { - this.files = files; - return this; - } - - public FileSchemaTestClass addFilesItem(File filesItem) { - if (this.files == null) { - this.files = new ArrayList<>(); - } - this.files.add(filesItem); - return this; - } - - /** - * Get files - * @return files - */ - @Valid - @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List<@Valid File> getFiles() { - return files; - } - - public void setFiles(List<@Valid File> files) { - this.files = files; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o; - return Objects.equals(this.file, fileSchemaTestClass.file) && - Objects.equals(this.files, fileSchemaTestClass.files); - } - - @Override - public int hashCode() { - return Objects.hash(file, files); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class FileSchemaTestClass {\n"); - sb.append(" file: ").append(toIndentedString(file)).append("\n"); - sb.append(" files: ").append(toIndentedString(files)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java deleted file mode 100644 index ae54e71df26..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java +++ /dev/null @@ -1,433 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.OffsetDateTime; -import java.util.Arrays; -import java.util.UUID; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * FormatTest - */ - -@JsonTypeName("format_test") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class FormatTest { - - @JsonProperty("integer") - private Integer integer; - - @JsonProperty("int32") - private Integer int32; - - @JsonProperty("int64") - private Long int64; - - @JsonProperty("number") - private BigDecimal number; - - @JsonProperty("float") - private Float _float; - - @JsonProperty("double") - private Double _double; - - @JsonProperty("string") - private String string; - - @JsonProperty("byte") - private byte[] _byte; - - @JsonProperty("binary") - private org.springframework.core.io.Resource binary; - - @JsonProperty("date") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; - - @JsonProperty("dateTime") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; - - @JsonProperty("uuid") - private UUID uuid; - - @JsonProperty("password") - private String password; - - @JsonProperty("BigDecimal") - private BigDecimal bigDecimal; - - /** - * Default constructor - * @deprecated Use {@link FormatTest#FormatTest(BigDecimal, byte[], LocalDate, String)} - */ - @Deprecated - public FormatTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { - this.number = number; - this._byte = _byte; - this.date = date; - this.password = password; - } - - public FormatTest integer(Integer integer) { - this.integer = integer; - return this; - } - - /** - * Get integer - * minimum: 10 - * maximum: 100 - * @return integer - */ - @Min(10) @Max(100) - @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getInteger() { - return integer; - } - - public void setInteger(Integer integer) { - this.integer = integer; - } - - public FormatTest int32(Integer int32) { - this.int32 = int32; - return this; - } - - /** - * Get int32 - * minimum: 20 - * maximum: 200 - * @return int32 - */ - @Min(20) @Max(200) - @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getInt32() { - return int32; - } - - public void setInt32(Integer int32) { - this.int32 = int32; - } - - public FormatTest int64(Long int64) { - this.int64 = int64; - return this; - } - - /** - * Get int64 - * @return int64 - */ - - @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getInt64() { - return int64; - } - - public void setInt64(Long int64) { - this.int64 = int64; - } - - public FormatTest number(BigDecimal number) { - this.number = number; - return this; - } - - /** - * Get number - * minimum: 32.1 - * maximum: 543.2 - * @return number - */ - @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") - @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumber() { - return number; - } - - public void setNumber(BigDecimal number) { - this.number = number; - } - - public FormatTest _float(Float _float) { - this._float = _float; - return this; - } - - /** - * Get _float - * minimum: 54.3 - * maximum: 987.6 - * @return _float - */ - @DecimalMin("54.3") @DecimalMax("987.6") - @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Float getFloat() { - return _float; - } - - public void setFloat(Float _float) { - this._float = _float; - } - - public FormatTest _double(Double _double) { - this._double = _double; - return this; - } - - /** - * Get _double - * minimum: 67.8 - * maximum: 123.4 - * @return _double - */ - @DecimalMin("67.8") @DecimalMax("123.4") - @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Double getDouble() { - return _double; - } - - public void setDouble(Double _double) { - this._double = _double; - } - - public FormatTest string(String string) { - this.string = string; - return this; - } - - /** - * Get string - * @return string - */ - @Pattern(regexp = "/[a-z]/i") - @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getString() { - return string; - } - - public void setString(String string) { - this.string = string; - } - - public FormatTest _byte(byte[] _byte) { - this._byte = _byte; - return this; - } - - /** - * Get _byte - * @return _byte - */ - @NotNull - @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED) - public byte[] getByte() { - return _byte; - } - - public void setByte(byte[] _byte) { - this._byte = _byte; - } - - public FormatTest binary(org.springframework.core.io.Resource binary) { - this.binary = binary; - return this; - } - - /** - * Get binary - * @return binary - */ - @Valid - @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public org.springframework.core.io.Resource getBinary() { - return binary; - } - - public void setBinary(org.springframework.core.io.Resource binary) { - this.binary = binary; - } - - public FormatTest date(LocalDate date) { - this.date = date; - return this; - } - - /** - * Get date - * @return date - */ - @NotNull @Valid - @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) - public LocalDate getDate() { - return date; - } - - public void setDate(LocalDate date) { - this.date = date; - } - - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - return this; - } - - /** - * Get dateTime - * @return dateTime - */ - @Valid - @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - } - - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; - return this; - } - - /** - * Get uuid - * @return uuid - */ - @Valid - @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - - public FormatTest password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - @NotNull @Size(min = 10, max = 64) - @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; - return this; - } - - /** - * Get bigDecimal - * @return bigDecimal - */ - @Valid - @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getBigDecimal() { - return bigDecimal; - } - - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && - Objects.equals(this.int32, formatTest.int32) && - Objects.equals(this.int64, formatTest.int64) && - Objects.equals(this.number, formatTest.number) && - Objects.equals(this._float, formatTest._float) && - Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && - Arrays.equals(this._byte, formatTest._byte) && - Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && - Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); - } - - @Override - public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); - sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); - sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); - sb.append(" number: ").append(toIndentedString(number)).append("\n"); - sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); - sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); - sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); - sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java deleted file mode 100644 index b89d14273dd..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ /dev/null @@ -1,108 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * HasOnlyReadOnly - */ - -@JsonTypeName("hasOnlyReadOnly") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class HasOnlyReadOnly { - - @JsonProperty("bar") - private String bar; - - @JsonProperty("foo") - private String foo; - - public HasOnlyReadOnly bar(String bar) { - this.bar = bar; - return this; - } - - /** - * Get bar - * @return bar - */ - - @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBar() { - return bar; - } - - public void setBar(String bar) { - this.bar = bar; - } - - public HasOnlyReadOnly foo(String foo) { - this.foo = foo; - return this; - } - - /** - * Get foo - * @return foo - */ - - @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getFoo() { - return foo; - } - - public void setFoo(String foo) { - this.foo = foo; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o; - return Objects.equals(this.bar, hasOnlyReadOnly.bar) && - Objects.equals(this.foo, hasOnlyReadOnly.foo); - } - - @Override - public int hashCode() { - return Objects.hash(bar, foo); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class HasOnlyReadOnly {\n"); - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append(" foo: ").append(toIndentedString(foo)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java deleted file mode 100644 index 0655a757b5b..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ /dev/null @@ -1,228 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.HashMap; -import java.util.Map; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * MapTest - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class MapTest { - - @JsonProperty("map_map_of_string") - @Valid - private Map> mapMapOfString = null; - - /** - * Gets or Sets inner - */ - public enum InnerEnum { - UPPER("UPPER"), - - LOWER("lower"); - - private String value; - - InnerEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static InnerEnum fromValue(String value) { - for (InnerEnum b : InnerEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("map_of_enum_string") - @Valid - private Map mapOfEnumString = null; - - @JsonProperty("direct_map") - @Valid - private Map directMap = null; - - @JsonProperty("indirect_map") - @Valid - private Map indirectMap = null; - - public MapTest mapMapOfString(Map> mapMapOfString) { - this.mapMapOfString = mapMapOfString; - return this; - } - - public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { - if (this.mapMapOfString == null) { - this.mapMapOfString = new HashMap<>(); - } - this.mapMapOfString.put(key, mapMapOfStringItem); - return this; - } - - /** - * Get mapMapOfString - * @return mapMapOfString - */ - @Valid - @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapOfString() { - return mapMapOfString; - } - - public void setMapMapOfString(Map> mapMapOfString) { - this.mapMapOfString = mapMapOfString; - } - - public MapTest mapOfEnumString(Map mapOfEnumString) { - this.mapOfEnumString = mapOfEnumString; - return this; - } - - public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { - if (this.mapOfEnumString == null) { - this.mapOfEnumString = new HashMap<>(); - } - this.mapOfEnumString.put(key, mapOfEnumStringItem); - return this; - } - - /** - * Get mapOfEnumString - * @return mapOfEnumString - */ - - @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapOfEnumString() { - return mapOfEnumString; - } - - public void setMapOfEnumString(Map mapOfEnumString) { - this.mapOfEnumString = mapOfEnumString; - } - - public MapTest directMap(Map directMap) { - this.directMap = directMap; - return this; - } - - public MapTest putDirectMapItem(String key, Boolean directMapItem) { - if (this.directMap == null) { - this.directMap = new HashMap<>(); - } - this.directMap.put(key, directMapItem); - return this; - } - - /** - * Get directMap - * @return directMap - */ - - @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getDirectMap() { - return directMap; - } - - public void setDirectMap(Map directMap) { - this.directMap = directMap; - } - - public MapTest indirectMap(Map indirectMap) { - this.indirectMap = indirectMap; - return this; - } - - public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { - if (this.indirectMap == null) { - this.indirectMap = new HashMap<>(); - } - this.indirectMap.put(key, indirectMapItem); - return this; - } - - /** - * Get indirectMap - * @return indirectMap - */ - - @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getIndirectMap() { - return indirectMap; - } - - public void setIndirectMap(Map indirectMap) { - this.indirectMap = indirectMap; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MapTest mapTest = (MapTest) o; - return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) && - Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) && - Objects.equals(this.directMap, mapTest.directMap) && - Objects.equals(this.indirectMap, mapTest.indirectMap); - } - - @Override - public int hashCode() { - return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MapTest {\n"); - sb.append(" mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n"); - sb.append(" mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n"); - sb.append(" directMap: ").append(toIndentedString(directMap)).append("\n"); - sb.append(" indirectMap: ").append(toIndentedString(indirectMap)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java deleted file mode 100644 index 5247bfb7123..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import org.openapitools.model.Animal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * MixedPropertiesAndAdditionalPropertiesClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class MixedPropertiesAndAdditionalPropertiesClass { - - @JsonProperty("uuid") - private UUID uuid; - - @JsonProperty("dateTime") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; - - @JsonProperty("map") - @Valid - private Map map = null; - - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; - return this; - } - - /** - * Get uuid - * @return uuid - */ - @Valid - @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - return this; - } - - /** - * Get dateTime - * @return dateTime - */ - @Valid - @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - } - - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; - return this; - } - - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); - } - this.map.put(key, mapItem); - return this; - } - - /** - * Get map - * @return map - */ - @Valid - @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMap() { - return map; - } - - public void setMap(Map map) { - this.map = map; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); - } - - @Override - public int hashCode() { - return Objects.hash(uuid, dateTime, map); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java deleted file mode 100644 index 2e6f7a15434..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model name starting with number - */ - -@Schema(name = "200_response", description = "Model for testing model name starting with number") -@JsonTypeName("200_response") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Model200Response { - - @JsonProperty("name") - private Integer name; - - @JsonProperty("class") - private String propertyClass; - - public Model200Response name(Integer name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getName() { - return name; - } - - public void setName(Integer name) { - this.name = name; - } - - public Model200Response propertyClass(String propertyClass) { - this.propertyClass = propertyClass; - return this; - } - - /** - * Get propertyClass - * @return propertyClass - */ - - @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPropertyClass() { - return propertyClass; - } - - public void setPropertyClass(String propertyClass) { - this.propertyClass = propertyClass; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Model200Response _200response = (Model200Response) o; - return Objects.equals(this.name, _200response.name) && - Objects.equals(this.propertyClass, _200response.propertyClass); - } - - @Override - public int hashCode() { - return Objects.hash(name, propertyClass); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Model200Response {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java deleted file mode 100644 index f807aba2ada..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ModelApiResponse - */ - -@JsonTypeName("ApiResponse") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelApiResponse { - - @JsonProperty("code") - private Integer code; - - @JsonProperty("type") - private String type; - - @JsonProperty("message") - private String message; - - public ModelApiResponse code(Integer code) { - this.code = code; - return this; - } - - /** - * Get code - * @return code - */ - - @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public ModelApiResponse type(String type) { - this.type = type; - return this; - } - - /** - * Get type - * @return type - */ - - @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public ModelApiResponse message(String message) { - this.message = message; - return this; - } - - /** - * Get message - * @return message - */ - - @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelApiResponse _apiResponse = (ModelApiResponse) o; - return Objects.equals(this.code, _apiResponse.code) && - Objects.equals(this.type, _apiResponse.type) && - Objects.equals(this.message, _apiResponse.message); - } - - @Override - public int hashCode() { - return Objects.hash(code, type, message); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelApiResponse {\n"); - sb.append(" code: ").append(toIndentedString(code)).append("\n"); - sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" message: ").append(toIndentedString(message)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelFile.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelFile.java deleted file mode 100644 index f269b47311d..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelFile.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; - -/** - * Must be named `File` for test. - */ -@Schema(name = "File",description = "Must be named `File` for test.") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelFile { - @JsonProperty("sourceURI") - private String sourceURI; - - public ModelFile sourceURI(String sourceURI) { - this.sourceURI = sourceURI; - return this; - } - - /** - * Test capitalization - * @return sourceURI - */ - @Schema(name = "sourceURI", defaultValue = "Test capitalization") - - - public String getSourceURI() { - return sourceURI; - } - - public void setSourceURI(String sourceURI) { - this.sourceURI = sourceURI; - } - - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelFile _file = (ModelFile) o; - return Objects.equals(this.sourceURI, _file.sourceURI); - } - - @Override - public int hashCode() { - return Objects.hash(sourceURI); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelFile {\n"); - - sb.append(" sourceURI: ").append(toIndentedString(sourceURI)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java deleted file mode 100644 index d6dc995cbfb..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ModelList - */ - -@JsonTypeName("List") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelList { - - @JsonProperty("123-list") - private String _123list; - - public ModelList _123list(String _123list) { - this._123list = _123list; - return this; - } - - /** - * Get _123list - * @return _123list - */ - - @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String get123list() { - return _123list; - } - - public void set123list(String _123list) { - this._123list = _123list; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelList _list = (ModelList) o; - return Objects.equals(this._123list, _list._123list); - } - - @Override - public int hashCode() { - return Objects.hash(_123list); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelList {\n"); - sb.append(" _123list: ").append(toIndentedString(_123list)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java deleted file mode 100644 index 8529857c782..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing reserved words - */ - -@Schema(name = "Return", description = "Model for testing reserved words") -@JsonTypeName("Return") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelReturn { - - @JsonProperty("return") - private Integer _return; - - public ModelReturn _return(Integer _return) { - this._return = _return; - return this; - } - - /** - * Get _return - * @return _return - */ - - @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getReturn() { - return _return; - } - - public void setReturn(Integer _return) { - this._return = _return; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelReturn _return = (ModelReturn) o; - return Objects.equals(this._return, _return._return); - } - - @Override - public int hashCode() { - return Objects.hash(_return); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelReturn {\n"); - sb.append(" _return: ").append(toIndentedString(_return)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java deleted file mode 100644 index 7835f479ed3..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java +++ /dev/null @@ -1,171 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model name same as property name - */ - -@Schema(name = "Name", description = "Model for testing model name same as property name") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Name { - - @JsonProperty("name") - private Integer name; - - @JsonProperty("snake_case") - private Integer snakeCase; - - @JsonProperty("property") - private String property; - - @JsonProperty("123Number") - private Integer _123number; - - /** - * Default constructor - * @deprecated Use {@link Name#Name(Integer)} - */ - @Deprecated - public Name() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Name(Integer name) { - this.name = name; - } - - public Name name(Integer name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getName() { - return name; - } - - public void setName(Integer name) { - this.name = name; - } - - public Name snakeCase(Integer snakeCase) { - this.snakeCase = snakeCase; - return this; - } - - /** - * Get snakeCase - * @return snakeCase - */ - - @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getSnakeCase() { - return snakeCase; - } - - public void setSnakeCase(Integer snakeCase) { - this.snakeCase = snakeCase; - } - - public Name property(String property) { - this.property = property; - return this; - } - - /** - * Get property - * @return property - */ - - @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getProperty() { - return property; - } - - public void setProperty(String property) { - this.property = property; - } - - public Name _123number(Integer _123number) { - this._123number = _123number; - return this; - } - - /** - * Get _123number - * @return _123number - */ - - @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer get123number() { - return _123number; - } - - public void set123number(Integer _123number) { - this._123number = _123number; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Name name = (Name) o; - return Objects.equals(this.name, name.name) && - Objects.equals(this.snakeCase, name.snakeCase) && - Objects.equals(this.property, name.property) && - Objects.equals(this._123number, name._123number); - } - - @Override - public int hashCode() { - return Objects.hash(name, snakeCase, property, _123number); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Name {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n"); - sb.append(" property: ").append(toIndentedString(property)).append("\n"); - sb.append(" _123number: ").append(toIndentedString(_123number)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java deleted file mode 100644 index 6baa3007a5c..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * NumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class NumberOnly { - - @JsonProperty("JustNumber") - private BigDecimal justNumber; - - public NumberOnly justNumber(BigDecimal justNumber) { - this.justNumber = justNumber; - return this; - } - - /** - * Get justNumber - * @return justNumber - */ - @Valid - @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getJustNumber() { - return justNumber; - } - - public void setJustNumber(BigDecimal justNumber) { - this.justNumber = justNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - NumberOnly numberOnly = (NumberOnly) o; - return Objects.equals(this.justNumber, numberOnly.justNumber); - } - - @Override - public int hashCode() { - return Objects.hash(justNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class NumberOnly {\n"); - sb.append(" justNumber: ").append(toIndentedString(justNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java deleted file mode 100644 index 780632475ec..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java +++ /dev/null @@ -1,243 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.OffsetDateTime; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Order - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Order { - - @JsonProperty("id") - private Long id; - - @JsonProperty("petId") - private Long petId; - - @JsonProperty("quantity") - private Integer quantity; - - @JsonProperty("shipDate") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime shipDate; - - /** - * Order Status - */ - public enum StatusEnum { - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - @JsonProperty("complete") - private Boolean complete = false; - - public Order id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Order petId(Long petId) { - this.petId = petId; - return this; - } - - /** - * Get petId - * @return petId - */ - - @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getPetId() { - return petId; - } - - public void setPetId(Long petId) { - this.petId = petId; - } - - public Order quantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - /** - * Get quantity - * @return quantity - */ - - @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getQuantity() { - return quantity; - } - - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - public Order shipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - return this; - } - - /** - * Get shipDate - * @return shipDate - */ - @Valid - @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getShipDate() { - return shipDate; - } - - public void setShipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - } - - public Order status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * Order Status - * @return status - */ - - @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - public Order complete(Boolean complete) { - this.complete = complete; - return this; - } - - /** - * Get complete - * @return complete - */ - - @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getComplete() { - return complete; - } - - public void setComplete(Boolean complete) { - this.complete = complete; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Order order = (Order) o; - return Objects.equals(this.id, order.id) && - Objects.equals(this.petId, order.petId) && - Objects.equals(this.quantity, order.quantity) && - Objects.equals(this.shipDate, order.shipDate) && - Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete); - } - - @Override - public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Order {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); - sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); - sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java deleted file mode 100644 index aad108f959c..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * OuterComposite - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class OuterComposite { - - @JsonProperty("my_number") - private BigDecimal myNumber; - - @JsonProperty("my_string") - private String myString; - - @JsonProperty("my_boolean") - private Boolean myBoolean; - - public OuterComposite myNumber(BigDecimal myNumber) { - this.myNumber = myNumber; - return this; - } - - /** - * Get myNumber - * @return myNumber - */ - @Valid - @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getMyNumber() { - return myNumber; - } - - public void setMyNumber(BigDecimal myNumber) { - this.myNumber = myNumber; - } - - public OuterComposite myString(String myString) { - this.myString = myString; - return this; - } - - /** - * Get myString - * @return myString - */ - - @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getMyString() { - return myString; - } - - public void setMyString(String myString) { - this.myString = myString; - } - - public OuterComposite myBoolean(Boolean myBoolean) { - this.myBoolean = myBoolean; - return this; - } - - /** - * Get myBoolean - * @return myBoolean - */ - - @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getMyBoolean() { - return myBoolean; - } - - public void setMyBoolean(Boolean myBoolean) { - this.myBoolean = myBoolean; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - OuterComposite outerComposite = (OuterComposite) o; - return Objects.equals(this.myNumber, outerComposite.myNumber) && - Objects.equals(this.myString, outerComposite.myString) && - Objects.equals(this.myBoolean, outerComposite.myBoolean); - } - - @Override - public int hashCode() { - return Objects.hash(myNumber, myString, myBoolean); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OuterComposite {\n"); - sb.append(" myNumber: ").append(toIndentedString(myNumber)).append("\n"); - sb.append(" myString: ").append(toIndentedString(myString)).append("\n"); - sb.append(" myBoolean: ").append(toIndentedString(myBoolean)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterEnum.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterEnum.java deleted file mode 100644 index 86327bcf4e9..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterEnum.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Gets or Sets OuterEnum - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public enum OuterEnum { - - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - OuterEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java deleted file mode 100644 index 551a899b72c..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ /dev/null @@ -1,283 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import org.openapitools.model.Category; -import org.openapitools.model.Tag; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Pet - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Pet { - - @JsonProperty("id") - private Long id; - - @JsonProperty("category") - private Category category; - - @JsonProperty("name") - private String name; - - @JsonProperty("photoUrls") - @Valid - private Set photoUrls = new LinkedHashSet<>(); - - @JsonProperty("tags") - @Valid - private List<@Valid Tag> tags = null; - - /** - * pet status in the store - */ - public enum StatusEnum { - AVAILABLE("available"), - - PENDING("pending"), - - SOLD("sold"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - /** - * Default constructor - * @deprecated Use {@link Pet#Pet(String, Set)} - */ - @Deprecated - public Pet() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Pet(String name, Set photoUrls) { - this.name = name; - this.photoUrls = photoUrls; - } - - public Pet id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Pet category(Category category) { - this.category = category; - return this; - } - - /** - * Get category - * @return category - */ - @Valid - @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Category getCategory() { - return category; - } - - public void setCategory(Category category) { - this.category = category; - } - - public Pet name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Pet photoUrls(Set photoUrls) { - this.photoUrls = photoUrls; - return this; - } - - public Pet addPhotoUrlsItem(String photoUrlsItem) { - if (this.photoUrls == null) { - this.photoUrls = new LinkedHashSet<>(); - } - this.photoUrls.add(photoUrlsItem); - return this; - } - - /** - * Get photoUrls - * @return photoUrls - */ - @NotNull - @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) - public Set getPhotoUrls() { - return photoUrls; - } - - @JsonDeserialize(as = LinkedHashSet.class) - public void setPhotoUrls(Set photoUrls) { - this.photoUrls = photoUrls; - } - - public Pet tags(List<@Valid Tag> tags) { - this.tags = tags; - return this; - } - - public Pet addTagsItem(Tag tagsItem) { - if (this.tags == null) { - this.tags = new ArrayList<>(); - } - this.tags.add(tagsItem); - return this; - } - - /** - * Get tags - * @return tags - */ - @Valid - @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List<@Valid Tag> getTags() { - return tags; - } - - public void setTags(List<@Valid Tag> tags) { - this.tags = tags; - } - - public Pet status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * pet status in the store - * @return status - */ - - @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Pet pet = (Pet) o; - return Objects.equals(this.id, pet.id) && - Objects.equals(this.category, pet.category) && - Objects.equals(this.name, pet.name) && - Objects.equals(this.photoUrls, pet.photoUrls) && - Objects.equals(this.tags, pet.tags) && - Objects.equals(this.status, pet.status); - } - - @Override - public int hashCode() { - return Objects.hash(id, category, name, photoUrls, tags, status); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Pet {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" category: ").append(toIndentedString(category)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java deleted file mode 100644 index 20f99f09046..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ReadOnlyFirst - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ReadOnlyFirst { - - @JsonProperty("bar") - private String bar; - - @JsonProperty("baz") - private String baz; - - public ReadOnlyFirst bar(String bar) { - this.bar = bar; - return this; - } - - /** - * Get bar - * @return bar - */ - - @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBar() { - return bar; - } - - public void setBar(String bar) { - this.bar = bar; - } - - public ReadOnlyFirst baz(String baz) { - this.baz = baz; - return this; - } - - /** - * Get baz - * @return baz - */ - - @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBaz() { - return baz; - } - - public void setBaz(String baz) { - this.baz = baz; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o; - return Objects.equals(this.bar, readOnlyFirst.bar) && - Objects.equals(this.baz, readOnlyFirst.baz); - } - - @Override - public int hashCode() { - return Objects.hash(bar, baz); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ReadOnlyFirst {\n"); - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append(" baz: ").append(toIndentedString(baz)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java deleted file mode 100644 index 5832d6c123e..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * SpecialModelName - */ - -@JsonTypeName("$special[model.name]") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class SpecialModelName { - - @JsonProperty("$special[property.name]") - private Long $specialPropertyName; - - public SpecialModelName $specialPropertyName(Long $specialPropertyName) { - this.$specialPropertyName = $specialPropertyName; - return this; - } - - /** - * Get $specialPropertyName - * @return $specialPropertyName - */ - - @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long get$SpecialPropertyName() { - return $specialPropertyName; - } - - public void set$SpecialPropertyName(Long $specialPropertyName) { - this.$specialPropertyName = $specialPropertyName; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); - } - - @Override - public int hashCode() { - return Objects.hash($specialPropertyName); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class SpecialModelName {\n"); - sb.append(" $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java deleted file mode 100644 index a194f91e1a7..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Tag - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Tag { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Tag id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Tag name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Tag tag = (Tag) o; - return Objects.equals(this.id, tag.id) && - Objects.equals(this.name, tag.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Tag {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java deleted file mode 100644 index 3f6d4a259b8..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ /dev/null @@ -1,210 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * TypeHolderDefault - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class TypeHolderDefault { - - @JsonProperty("string_item") - private String stringItem = "what"; - - @JsonProperty("number_item") - private BigDecimal numberItem; - - @JsonProperty("integer_item") - private Integer integerItem; - - @JsonProperty("bool_item") - private Boolean boolItem = true; - - @JsonProperty("array_item") - @Valid - private List arrayItem = new ArrayList<>(); - - /** - * Default constructor - * @deprecated Use {@link TypeHolderDefault#TypeHolderDefault(String, BigDecimal, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderDefault() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderDefault(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - - public TypeHolderDefault stringItem(String stringItem) { - this.stringItem = stringItem; - return this; - } - - /** - * Get stringItem - * @return stringItem - */ - @NotNull - @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) - public String getStringItem() { - return stringItem; - } - - public void setStringItem(String stringItem) { - this.stringItem = stringItem; - } - - public TypeHolderDefault numberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - return this; - } - - /** - * Get numberItem - * @return numberItem - */ - @NotNull @Valid - @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumberItem() { - return numberItem; - } - - public void setNumberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - } - - public TypeHolderDefault integerItem(Integer integerItem) { - this.integerItem = integerItem; - return this; - } - - /** - * Get integerItem - * @return integerItem - */ - @NotNull - @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getIntegerItem() { - return integerItem; - } - - public void setIntegerItem(Integer integerItem) { - this.integerItem = integerItem; - } - - public TypeHolderDefault boolItem(Boolean boolItem) { - this.boolItem = boolItem; - return this; - } - - /** - * Get boolItem - * @return boolItem - */ - @NotNull - @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) - public Boolean getBoolItem() { - return boolItem; - } - - public void setBoolItem(Boolean boolItem) { - this.boolItem = boolItem; - } - - public TypeHolderDefault arrayItem(List arrayItem) { - this.arrayItem = arrayItem; - return this; - } - - public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { - if (this.arrayItem == null) { - this.arrayItem = new ArrayList<>(); - } - this.arrayItem.add(arrayItemItem); - return this; - } - - /** - * Get arrayItem - * @return arrayItem - */ - @NotNull - @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) - public List getArrayItem() { - return arrayItem; - } - - public void setArrayItem(List arrayItem) { - this.arrayItem = arrayItem; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o; - return Objects.equals(this.stringItem, typeHolderDefault.stringItem) && - Objects.equals(this.numberItem, typeHolderDefault.numberItem) && - Objects.equals(this.integerItem, typeHolderDefault.integerItem) && - Objects.equals(this.boolItem, typeHolderDefault.boolItem) && - Objects.equals(this.arrayItem, typeHolderDefault.arrayItem); - } - - @Override - public int hashCode() { - return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class TypeHolderDefault {\n"); - sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n"); - sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n"); - sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n"); - sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n"); - sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java deleted file mode 100644 index 6365a70bc6e..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ /dev/null @@ -1,235 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * TypeHolderExample - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class TypeHolderExample { - - @JsonProperty("string_item") - private String stringItem; - - @JsonProperty("number_item") - private BigDecimal numberItem; - - @JsonProperty("float_item") - private Float floatItem; - - @JsonProperty("integer_item") - private Integer integerItem; - - @JsonProperty("bool_item") - private Boolean boolItem; - - @JsonProperty("array_item") - @Valid - private List arrayItem = new ArrayList<>(); - - /** - * Default constructor - * @deprecated Use {@link TypeHolderExample#TypeHolderExample(String, BigDecimal, Float, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderExample() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderExample(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.floatItem = floatItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - - public TypeHolderExample stringItem(String stringItem) { - this.stringItem = stringItem; - return this; - } - - /** - * Get stringItem - * @return stringItem - */ - @NotNull - @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) - public String getStringItem() { - return stringItem; - } - - public void setStringItem(String stringItem) { - this.stringItem = stringItem; - } - - public TypeHolderExample numberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - return this; - } - - /** - * Get numberItem - * @return numberItem - */ - @NotNull @Valid - @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumberItem() { - return numberItem; - } - - public void setNumberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - } - - public TypeHolderExample floatItem(Float floatItem) { - this.floatItem = floatItem; - return this; - } - - /** - * Get floatItem - * @return floatItem - */ - @NotNull - @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) - public Float getFloatItem() { - return floatItem; - } - - public void setFloatItem(Float floatItem) { - this.floatItem = floatItem; - } - - public TypeHolderExample integerItem(Integer integerItem) { - this.integerItem = integerItem; - return this; - } - - /** - * Get integerItem - * @return integerItem - */ - @NotNull - @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getIntegerItem() { - return integerItem; - } - - public void setIntegerItem(Integer integerItem) { - this.integerItem = integerItem; - } - - public TypeHolderExample boolItem(Boolean boolItem) { - this.boolItem = boolItem; - return this; - } - - /** - * Get boolItem - * @return boolItem - */ - @NotNull - @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) - public Boolean getBoolItem() { - return boolItem; - } - - public void setBoolItem(Boolean boolItem) { - this.boolItem = boolItem; - } - - public TypeHolderExample arrayItem(List arrayItem) { - this.arrayItem = arrayItem; - return this; - } - - public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { - if (this.arrayItem == null) { - this.arrayItem = new ArrayList<>(); - } - this.arrayItem.add(arrayItemItem); - return this; - } - - /** - * Get arrayItem - * @return arrayItem - */ - @NotNull - @Schema(name = "array_item", example = "[0, 1, 2, 3]", requiredMode = Schema.RequiredMode.REQUIRED) - public List getArrayItem() { - return arrayItem; - } - - public void setArrayItem(List arrayItem) { - this.arrayItem = arrayItem; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TypeHolderExample typeHolderExample = (TypeHolderExample) o; - return Objects.equals(this.stringItem, typeHolderExample.stringItem) && - Objects.equals(this.numberItem, typeHolderExample.numberItem) && - Objects.equals(this.floatItem, typeHolderExample.floatItem) && - Objects.equals(this.integerItem, typeHolderExample.integerItem) && - Objects.equals(this.boolItem, typeHolderExample.boolItem) && - Objects.equals(this.arrayItem, typeHolderExample.arrayItem); - } - - @Override - public int hashCode() { - return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class TypeHolderExample {\n"); - sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n"); - sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n"); - sb.append(" floatItem: ").append(toIndentedString(floatItem)).append("\n"); - sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n"); - sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n"); - sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java deleted file mode 100644 index 5d6889ef891..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java +++ /dev/null @@ -1,250 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * User - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class User { - - @JsonProperty("id") - private Long id; - - @JsonProperty("username") - private String username; - - @JsonProperty("firstName") - private String firstName; - - @JsonProperty("lastName") - private String lastName; - - @JsonProperty("email") - private String email; - - @JsonProperty("password") - private String password; - - @JsonProperty("phone") - private String phone; - - @JsonProperty("userStatus") - private Integer userStatus; - - public User id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public User username(String username) { - this.username = username; - return this; - } - - /** - * Get username - * @return username - */ - - @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public User firstName(String firstName) { - this.firstName = firstName; - return this; - } - - /** - * Get firstName - * @return firstName - */ - - @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public User lastName(String lastName) { - this.lastName = lastName; - return this; - } - - /** - * Get lastName - * @return lastName - */ - - @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public User email(String email) { - this.email = email; - return this; - } - - /** - * Get email - * @return email - */ - - @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public User password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - - @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public User phone(String phone) { - this.phone = phone; - return this; - } - - /** - * Get phone - * @return phone - */ - - @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public User userStatus(Integer userStatus) { - this.userStatus = userStatus; - return this; - } - - /** - * User Status - * @return userStatus - */ - - @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getUserStatus() { - return userStatus; - } - - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - User user = (User) o; - return Objects.equals(this.id, user.id) && - Objects.equals(this.username, user.username) && - Objects.equals(this.firstName, user.firstName) && - Objects.equals(this.lastName, user.lastName) && - Objects.equals(this.email, user.email) && - Objects.equals(this.password, user.password) && - Objects.equals(this.phone, user.phone) && - Objects.equals(this.userStatus, user.userStatus); - } - - @Override - public int hashCode() { - return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" username: ").append(toIndentedString(username)).append("\n"); - sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); - sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); - sb.append(" email: ").append(toIndentedString(email)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); - sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java deleted file mode 100644 index 6d4d39acfa2..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ /dev/null @@ -1,838 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * XmlItem - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class XmlItem { - - @JsonProperty("attribute_string") - private String attributeString; - - @JsonProperty("attribute_number") - private BigDecimal attributeNumber; - - @JsonProperty("attribute_integer") - private Integer attributeInteger; - - @JsonProperty("attribute_boolean") - private Boolean attributeBoolean; - - @JsonProperty("wrapped_array") - @Valid - private List wrappedArray = null; - - @JsonProperty("name_string") - private String nameString; - - @JsonProperty("name_number") - private BigDecimal nameNumber; - - @JsonProperty("name_integer") - private Integer nameInteger; - - @JsonProperty("name_boolean") - private Boolean nameBoolean; - - @JsonProperty("name_array") - @Valid - private List nameArray = null; - - @JsonProperty("name_wrapped_array") - @Valid - private List nameWrappedArray = null; - - @JsonProperty("prefix_string") - private String prefixString; - - @JsonProperty("prefix_number") - private BigDecimal prefixNumber; - - @JsonProperty("prefix_integer") - private Integer prefixInteger; - - @JsonProperty("prefix_boolean") - private Boolean prefixBoolean; - - @JsonProperty("prefix_array") - @Valid - private List prefixArray = null; - - @JsonProperty("prefix_wrapped_array") - @Valid - private List prefixWrappedArray = null; - - @JsonProperty("namespace_string") - private String namespaceString; - - @JsonProperty("namespace_number") - private BigDecimal namespaceNumber; - - @JsonProperty("namespace_integer") - private Integer namespaceInteger; - - @JsonProperty("namespace_boolean") - private Boolean namespaceBoolean; - - @JsonProperty("namespace_array") - @Valid - private List namespaceArray = null; - - @JsonProperty("namespace_wrapped_array") - @Valid - private List namespaceWrappedArray = null; - - @JsonProperty("prefix_ns_string") - private String prefixNsString; - - @JsonProperty("prefix_ns_number") - private BigDecimal prefixNsNumber; - - @JsonProperty("prefix_ns_integer") - private Integer prefixNsInteger; - - @JsonProperty("prefix_ns_boolean") - private Boolean prefixNsBoolean; - - @JsonProperty("prefix_ns_array") - @Valid - private List prefixNsArray = null; - - @JsonProperty("prefix_ns_wrapped_array") - @Valid - private List prefixNsWrappedArray = null; - - public XmlItem attributeString(String attributeString) { - this.attributeString = attributeString; - return this; - } - - /** - * Get attributeString - * @return attributeString - */ - - @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getAttributeString() { - return attributeString; - } - - public void setAttributeString(String attributeString) { - this.attributeString = attributeString; - } - - public XmlItem attributeNumber(BigDecimal attributeNumber) { - this.attributeNumber = attributeNumber; - return this; - } - - /** - * Get attributeNumber - * @return attributeNumber - */ - @Valid - @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getAttributeNumber() { - return attributeNumber; - } - - public void setAttributeNumber(BigDecimal attributeNumber) { - this.attributeNumber = attributeNumber; - } - - public XmlItem attributeInteger(Integer attributeInteger) { - this.attributeInteger = attributeInteger; - return this; - } - - /** - * Get attributeInteger - * @return attributeInteger - */ - - @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getAttributeInteger() { - return attributeInteger; - } - - public void setAttributeInteger(Integer attributeInteger) { - this.attributeInteger = attributeInteger; - } - - public XmlItem attributeBoolean(Boolean attributeBoolean) { - this.attributeBoolean = attributeBoolean; - return this; - } - - /** - * Get attributeBoolean - * @return attributeBoolean - */ - - @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getAttributeBoolean() { - return attributeBoolean; - } - - public void setAttributeBoolean(Boolean attributeBoolean) { - this.attributeBoolean = attributeBoolean; - } - - public XmlItem wrappedArray(List wrappedArray) { - this.wrappedArray = wrappedArray; - return this; - } - - public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { - if (this.wrappedArray == null) { - this.wrappedArray = new ArrayList<>(); - } - this.wrappedArray.add(wrappedArrayItem); - return this; - } - - /** - * Get wrappedArray - * @return wrappedArray - */ - - @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getWrappedArray() { - return wrappedArray; - } - - public void setWrappedArray(List wrappedArray) { - this.wrappedArray = wrappedArray; - } - - public XmlItem nameString(String nameString) { - this.nameString = nameString; - return this; - } - - /** - * Get nameString - * @return nameString - */ - - @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getNameString() { - return nameString; - } - - public void setNameString(String nameString) { - this.nameString = nameString; - } - - public XmlItem nameNumber(BigDecimal nameNumber) { - this.nameNumber = nameNumber; - return this; - } - - /** - * Get nameNumber - * @return nameNumber - */ - @Valid - @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getNameNumber() { - return nameNumber; - } - - public void setNameNumber(BigDecimal nameNumber) { - this.nameNumber = nameNumber; - } - - public XmlItem nameInteger(Integer nameInteger) { - this.nameInteger = nameInteger; - return this; - } - - /** - * Get nameInteger - * @return nameInteger - */ - - @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getNameInteger() { - return nameInteger; - } - - public void setNameInteger(Integer nameInteger) { - this.nameInteger = nameInteger; - } - - public XmlItem nameBoolean(Boolean nameBoolean) { - this.nameBoolean = nameBoolean; - return this; - } - - /** - * Get nameBoolean - * @return nameBoolean - */ - - @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getNameBoolean() { - return nameBoolean; - } - - public void setNameBoolean(Boolean nameBoolean) { - this.nameBoolean = nameBoolean; - } - - public XmlItem nameArray(List nameArray) { - this.nameArray = nameArray; - return this; - } - - public XmlItem addNameArrayItem(Integer nameArrayItem) { - if (this.nameArray == null) { - this.nameArray = new ArrayList<>(); - } - this.nameArray.add(nameArrayItem); - return this; - } - - /** - * Get nameArray - * @return nameArray - */ - - @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNameArray() { - return nameArray; - } - - public void setNameArray(List nameArray) { - this.nameArray = nameArray; - } - - public XmlItem nameWrappedArray(List nameWrappedArray) { - this.nameWrappedArray = nameWrappedArray; - return this; - } - - public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { - if (this.nameWrappedArray == null) { - this.nameWrappedArray = new ArrayList<>(); - } - this.nameWrappedArray.add(nameWrappedArrayItem); - return this; - } - - /** - * Get nameWrappedArray - * @return nameWrappedArray - */ - - @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNameWrappedArray() { - return nameWrappedArray; - } - - public void setNameWrappedArray(List nameWrappedArray) { - this.nameWrappedArray = nameWrappedArray; - } - - public XmlItem prefixString(String prefixString) { - this.prefixString = prefixString; - return this; - } - - /** - * Get prefixString - * @return prefixString - */ - - @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPrefixString() { - return prefixString; - } - - public void setPrefixString(String prefixString) { - this.prefixString = prefixString; - } - - public XmlItem prefixNumber(BigDecimal prefixNumber) { - this.prefixNumber = prefixNumber; - return this; - } - - /** - * Get prefixNumber - * @return prefixNumber - */ - @Valid - @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getPrefixNumber() { - return prefixNumber; - } - - public void setPrefixNumber(BigDecimal prefixNumber) { - this.prefixNumber = prefixNumber; - } - - public XmlItem prefixInteger(Integer prefixInteger) { - this.prefixInteger = prefixInteger; - return this; - } - - /** - * Get prefixInteger - * @return prefixInteger - */ - - @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getPrefixInteger() { - return prefixInteger; - } - - public void setPrefixInteger(Integer prefixInteger) { - this.prefixInteger = prefixInteger; - } - - public XmlItem prefixBoolean(Boolean prefixBoolean) { - this.prefixBoolean = prefixBoolean; - return this; - } - - /** - * Get prefixBoolean - * @return prefixBoolean - */ - - @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getPrefixBoolean() { - return prefixBoolean; - } - - public void setPrefixBoolean(Boolean prefixBoolean) { - this.prefixBoolean = prefixBoolean; - } - - public XmlItem prefixArray(List prefixArray) { - this.prefixArray = prefixArray; - return this; - } - - public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { - if (this.prefixArray == null) { - this.prefixArray = new ArrayList<>(); - } - this.prefixArray.add(prefixArrayItem); - return this; - } - - /** - * Get prefixArray - * @return prefixArray - */ - - @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixArray() { - return prefixArray; - } - - public void setPrefixArray(List prefixArray) { - this.prefixArray = prefixArray; - } - - public XmlItem prefixWrappedArray(List prefixWrappedArray) { - this.prefixWrappedArray = prefixWrappedArray; - return this; - } - - public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { - if (this.prefixWrappedArray == null) { - this.prefixWrappedArray = new ArrayList<>(); - } - this.prefixWrappedArray.add(prefixWrappedArrayItem); - return this; - } - - /** - * Get prefixWrappedArray - * @return prefixWrappedArray - */ - - @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixWrappedArray() { - return prefixWrappedArray; - } - - public void setPrefixWrappedArray(List prefixWrappedArray) { - this.prefixWrappedArray = prefixWrappedArray; - } - - public XmlItem namespaceString(String namespaceString) { - this.namespaceString = namespaceString; - return this; - } - - /** - * Get namespaceString - * @return namespaceString - */ - - @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getNamespaceString() { - return namespaceString; - } - - public void setNamespaceString(String namespaceString) { - this.namespaceString = namespaceString; - } - - public XmlItem namespaceNumber(BigDecimal namespaceNumber) { - this.namespaceNumber = namespaceNumber; - return this; - } - - /** - * Get namespaceNumber - * @return namespaceNumber - */ - @Valid - @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getNamespaceNumber() { - return namespaceNumber; - } - - public void setNamespaceNumber(BigDecimal namespaceNumber) { - this.namespaceNumber = namespaceNumber; - } - - public XmlItem namespaceInteger(Integer namespaceInteger) { - this.namespaceInteger = namespaceInteger; - return this; - } - - /** - * Get namespaceInteger - * @return namespaceInteger - */ - - @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getNamespaceInteger() { - return namespaceInteger; - } - - public void setNamespaceInteger(Integer namespaceInteger) { - this.namespaceInteger = namespaceInteger; - } - - public XmlItem namespaceBoolean(Boolean namespaceBoolean) { - this.namespaceBoolean = namespaceBoolean; - return this; - } - - /** - * Get namespaceBoolean - * @return namespaceBoolean - */ - - @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getNamespaceBoolean() { - return namespaceBoolean; - } - - public void setNamespaceBoolean(Boolean namespaceBoolean) { - this.namespaceBoolean = namespaceBoolean; - } - - public XmlItem namespaceArray(List namespaceArray) { - this.namespaceArray = namespaceArray; - return this; - } - - public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { - if (this.namespaceArray == null) { - this.namespaceArray = new ArrayList<>(); - } - this.namespaceArray.add(namespaceArrayItem); - return this; - } - - /** - * Get namespaceArray - * @return namespaceArray - */ - - @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNamespaceArray() { - return namespaceArray; - } - - public void setNamespaceArray(List namespaceArray) { - this.namespaceArray = namespaceArray; - } - - public XmlItem namespaceWrappedArray(List namespaceWrappedArray) { - this.namespaceWrappedArray = namespaceWrappedArray; - return this; - } - - public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { - if (this.namespaceWrappedArray == null) { - this.namespaceWrappedArray = new ArrayList<>(); - } - this.namespaceWrappedArray.add(namespaceWrappedArrayItem); - return this; - } - - /** - * Get namespaceWrappedArray - * @return namespaceWrappedArray - */ - - @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNamespaceWrappedArray() { - return namespaceWrappedArray; - } - - public void setNamespaceWrappedArray(List namespaceWrappedArray) { - this.namespaceWrappedArray = namespaceWrappedArray; - } - - public XmlItem prefixNsString(String prefixNsString) { - this.prefixNsString = prefixNsString; - return this; - } - - /** - * Get prefixNsString - * @return prefixNsString - */ - - @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPrefixNsString() { - return prefixNsString; - } - - public void setPrefixNsString(String prefixNsString) { - this.prefixNsString = prefixNsString; - } - - public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { - this.prefixNsNumber = prefixNsNumber; - return this; - } - - /** - * Get prefixNsNumber - * @return prefixNsNumber - */ - @Valid - @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getPrefixNsNumber() { - return prefixNsNumber; - } - - public void setPrefixNsNumber(BigDecimal prefixNsNumber) { - this.prefixNsNumber = prefixNsNumber; - } - - public XmlItem prefixNsInteger(Integer prefixNsInteger) { - this.prefixNsInteger = prefixNsInteger; - return this; - } - - /** - * Get prefixNsInteger - * @return prefixNsInteger - */ - - @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getPrefixNsInteger() { - return prefixNsInteger; - } - - public void setPrefixNsInteger(Integer prefixNsInteger) { - this.prefixNsInteger = prefixNsInteger; - } - - public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { - this.prefixNsBoolean = prefixNsBoolean; - return this; - } - - /** - * Get prefixNsBoolean - * @return prefixNsBoolean - */ - - @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getPrefixNsBoolean() { - return prefixNsBoolean; - } - - public void setPrefixNsBoolean(Boolean prefixNsBoolean) { - this.prefixNsBoolean = prefixNsBoolean; - } - - public XmlItem prefixNsArray(List prefixNsArray) { - this.prefixNsArray = prefixNsArray; - return this; - } - - public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { - if (this.prefixNsArray == null) { - this.prefixNsArray = new ArrayList<>(); - } - this.prefixNsArray.add(prefixNsArrayItem); - return this; - } - - /** - * Get prefixNsArray - * @return prefixNsArray - */ - - @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixNsArray() { - return prefixNsArray; - } - - public void setPrefixNsArray(List prefixNsArray) { - this.prefixNsArray = prefixNsArray; - } - - public XmlItem prefixNsWrappedArray(List prefixNsWrappedArray) { - this.prefixNsWrappedArray = prefixNsWrappedArray; - return this; - } - - public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { - if (this.prefixNsWrappedArray == null) { - this.prefixNsWrappedArray = new ArrayList<>(); - } - this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); - return this; - } - - /** - * Get prefixNsWrappedArray - * @return prefixNsWrappedArray - */ - - @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixNsWrappedArray() { - return prefixNsWrappedArray; - } - - public void setPrefixNsWrappedArray(List prefixNsWrappedArray) { - this.prefixNsWrappedArray = prefixNsWrappedArray; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - XmlItem xmlItem = (XmlItem) o; - return Objects.equals(this.attributeString, xmlItem.attributeString) && - Objects.equals(this.attributeNumber, xmlItem.attributeNumber) && - Objects.equals(this.attributeInteger, xmlItem.attributeInteger) && - Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) && - Objects.equals(this.wrappedArray, xmlItem.wrappedArray) && - Objects.equals(this.nameString, xmlItem.nameString) && - Objects.equals(this.nameNumber, xmlItem.nameNumber) && - Objects.equals(this.nameInteger, xmlItem.nameInteger) && - Objects.equals(this.nameBoolean, xmlItem.nameBoolean) && - Objects.equals(this.nameArray, xmlItem.nameArray) && - Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) && - Objects.equals(this.prefixString, xmlItem.prefixString) && - Objects.equals(this.prefixNumber, xmlItem.prefixNumber) && - Objects.equals(this.prefixInteger, xmlItem.prefixInteger) && - Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) && - Objects.equals(this.prefixArray, xmlItem.prefixArray) && - Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) && - Objects.equals(this.namespaceString, xmlItem.namespaceString) && - Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) && - Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) && - Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) && - Objects.equals(this.namespaceArray, xmlItem.namespaceArray) && - Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) && - Objects.equals(this.prefixNsString, xmlItem.prefixNsString) && - Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) && - Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) && - Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) && - Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) && - Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray); - } - - @Override - public int hashCode() { - return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class XmlItem {\n"); - sb.append(" attributeString: ").append(toIndentedString(attributeString)).append("\n"); - sb.append(" attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n"); - sb.append(" attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n"); - sb.append(" attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n"); - sb.append(" wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n"); - sb.append(" nameString: ").append(toIndentedString(nameString)).append("\n"); - sb.append(" nameNumber: ").append(toIndentedString(nameNumber)).append("\n"); - sb.append(" nameInteger: ").append(toIndentedString(nameInteger)).append("\n"); - sb.append(" nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n"); - sb.append(" nameArray: ").append(toIndentedString(nameArray)).append("\n"); - sb.append(" nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n"); - sb.append(" prefixString: ").append(toIndentedString(prefixString)).append("\n"); - sb.append(" prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n"); - sb.append(" prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n"); - sb.append(" prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n"); - sb.append(" prefixArray: ").append(toIndentedString(prefixArray)).append("\n"); - sb.append(" prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n"); - sb.append(" namespaceString: ").append(toIndentedString(namespaceString)).append("\n"); - sb.append(" namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n"); - sb.append(" namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n"); - sb.append(" namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n"); - sb.append(" namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n"); - sb.append(" namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n"); - sb.append(" prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n"); - sb.append(" prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n"); - sb.append(" prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n"); - sb.append(" prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n"); - sb.append(" prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n"); - sb.append(" prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/application.properties b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/application.properties deleted file mode 100644 index 9d06609db66..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/application.properties +++ /dev/null @@ -1,3 +0,0 @@ -server.port=80 -spring.jackson.date-format=org.openapitools.RFC3339DateFormat -spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java deleted file mode 100644 index 3681f67e770..00000000000 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openapitools; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class OpenApiGeneratorApplicationTests { - - @Test - void contextLoads() { - } - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES index 3299b46a7b2..16d8f2a6323 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -44,6 +44,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 6359de03e10..0346e04b53c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -41,7 +41,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -62,9 +62,9 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(body); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java index 2d5e24bcd5f..740965f1686 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java @@ -27,11 +27,11 @@ public interface AnotherFakeApiDelegate { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see AnotherFakeApi#call123testSpecialTags */ - default ResponseEntity call123testSpecialTags(Client body) { + default ResponseEntity call123testSpecialTags(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 3b04629b3e9..d047a0540c6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -95,7 +95,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -108,7 +109,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @Operation( @@ -124,12 +125,13 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @Parameter(name = "body", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(body); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -153,7 +155,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -182,7 +185,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -195,7 +199,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @Operation( @@ -212,9 +216,9 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(body); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -222,7 +226,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @Operation( @@ -239,9 +243,9 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, body); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -249,7 +253,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -270,9 +274,9 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(body); + return getDelegate().testClientModel(client); } @@ -418,13 +422,15 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @Operation( operationId = "testInlineAdditionalProperties", summary = "test inline additionalProperties", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -436,14 +442,15 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(param); + return getDelegate().testInlineAdditionalProperties(requestBody); } /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -452,6 +459,7 @@ public interface FakeApi { @Operation( operationId = "testJsonFormData", summary = "test json serialization of form data", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -475,7 +483,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -495,17 +502,17 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) @@ -515,6 +522,7 @@ public interface FakeApi { @Operation( operationId = "uploadFileWithRequiredFile", summary = "uploads an image (required)", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index 2cd684b90f5..d1a650378e6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -63,11 +63,11 @@ public interface FakeApiDelegate { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) * @see FakeApi#fakeOuterCompositeSerialize */ - default ResponseEntity fakeOuterCompositeSerialize(OuterComposite body) { + default ResponseEntity fakeOuterCompositeSerialize(OuterComposite outerComposite) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { @@ -111,11 +111,11 @@ public interface FakeApiDelegate { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) * @see FakeApi#testBodyWithFileSchema */ - default ResponseEntity testBodyWithFileSchema(FileSchemaTestClass body) { + default ResponseEntity testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -124,12 +124,12 @@ public interface FakeApiDelegate { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) * @see FakeApi#testBodyWithQueryParams */ default ResponseEntity testBodyWithQueryParams(String query, - User body) { + User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -138,11 +138,11 @@ public interface FakeApiDelegate { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see FakeApi#testClientModel */ - default ResponseEntity testClientModel(Client body) { + default ResponseEntity testClientModel(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { @@ -249,18 +249,20 @@ public interface FakeApiDelegate { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) * @see FakeApi#testInlineAdditionalProperties */ - default ResponseEntity testInlineAdditionalProperties(Map param) { + default ResponseEntity testInlineAdditionalProperties(Map requestBody) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -278,7 +280,6 @@ public interface FakeApiDelegate { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -286,7 +287,6 @@ public interface FakeApiDelegate { * @see FakeApi#testQueryParameterCollectionFormat */ default ResponseEntity testQueryParameterCollectionFormat(List pipe, - List ioutil, List http, List url, List context) { @@ -296,6 +296,7 @@ public interface FakeApiDelegate { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index bb8738151f5..2a2b2f9e5f9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -41,7 +41,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -65,9 +65,9 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(body); + return getDelegate().testClassname(client); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java index fb689b13f94..a15fd1b7728 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java @@ -27,11 +27,11 @@ public interface FakeClassnameTestApiDelegate { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see FakeClassnameTestApi#testClassname */ - default ResponseEntity testClassname(Client body) { + default ResponseEntity testClassname(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index 90fc021e469..03132cf15f4 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -41,14 +41,16 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @Operation( operationId = "addPet", summary = "Add a new pet to the store", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -64,14 +66,15 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(body); + return getDelegate().addPet(pet); } /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -81,6 +84,7 @@ public interface PetApi { @Operation( operationId = "deletePet", summary = "Deletes a pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -216,8 +220,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -226,6 +231,7 @@ public interface PetApi { @Operation( operationId = "updatePet", summary = "Update an existing pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -243,14 +249,15 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(body); + return getDelegate().updatePet(pet); } /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -260,6 +267,7 @@ public interface PetApi { @Operation( operationId = "updatePetWithForm", summary = "Updates a pet in the store with form data", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "405", description = "Invalid input") @@ -284,6 +292,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -293,6 +302,7 @@ public interface PetApi { @Operation( operationId = "uploadFile", summary = "uploads an image", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index 1e9ad7f94f4..aded0c3fefc 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -27,19 +27,21 @@ public interface PetApiDelegate { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) * @see PetApi#addPet */ - default ResponseEntity addPet(Pet body) { + default ResponseEntity addPet(Pet pet) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -142,21 +144,23 @@ public interface PetApiDelegate { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) * or Validation exception (status code 405) * @see PetApi#updatePet */ - default ResponseEntity updatePet(Pet body) { + default ResponseEntity updatePet(Pet pet) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -173,6 +177,7 @@ public interface PetApiDelegate { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 84c19bbf0f1..23a896b1266 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -136,14 +136,16 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @Operation( operationId = "placeOrder", summary = "Place an order for a pet", + description = "", tags = { "store" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -156,12 +158,13 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(body); + return getDelegate().placeOrder(order); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java index c4c812a9bb2..84623f79f76 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -81,13 +81,14 @@ public interface StoreApiDelegate { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) * @see StoreApi#placeOrder */ - default ResponseEntity placeOrder(Order body) { + default ResponseEntity placeOrder(Order order) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 0473503500f..60d713ae895 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -43,7 +43,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @Operation( @@ -57,24 +57,27 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(body); + return getDelegate().createUser(user); } /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithArrayInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -82,24 +85,27 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) { - return getDelegate().createUsersWithArrayInput(body); + return getDelegate().createUsersWithArrayInput(user); } /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithListInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -107,12 +113,13 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) { - return getDelegate().createUsersWithListInput(body); + return getDelegate().createUsersWithListInput(user); } @@ -147,6 +154,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -156,6 +164,7 @@ public interface UserApi { @Operation( operationId = "getUserByName", summary = "Get user by user name", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -180,6 +189,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -189,6 +199,7 @@ public interface UserApi { @Operation( operationId = "loginUser", summary = "Logs user into the system", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -213,12 +224,14 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @Operation( operationId = "logoutUser", summary = "Logs out current logged in user session", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -240,7 +253,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -256,13 +269,14 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, body); + return getDelegate().updateUser(username, user); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java index c39231c6b29..f0630c08541 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -29,35 +29,37 @@ public interface UserApiDelegate { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) * @see UserApi#createUser */ - default ResponseEntity createUser(User body) { + default ResponseEntity createUser(User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithArrayInput */ - default ResponseEntity createUsersWithArrayInput(List body) { + default ResponseEntity createUsersWithArrayInput(List user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithListInput */ - default ResponseEntity createUsersWithListInput(List body) { + default ResponseEntity createUsersWithListInput(List user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -78,6 +80,7 @@ public interface UserApiDelegate { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -106,6 +109,7 @@ public interface UserApiDelegate { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -121,6 +125,7 @@ public interface UserApiDelegate { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) * @see UserApi#logoutUser @@ -135,13 +140,13 @@ public interface UserApiDelegate { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) * @see UserApi#updateUser */ default ResponseEntity updateUser(String username, - User body) { + User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 14e13504a8c..66e0aed61c6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -5,10 +5,13 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -27,41 +30,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -302,7 +305,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -312,11 +315,11 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -357,13 +360,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 42600354f74..ead205932fa 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 2f6c19a8344..7ab62ebdb8f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 23ee84ce8b5..4c5a142ddca 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..55d20539817 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,224 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index 2720e81c227..696d07582b9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 8b196d5d7de..9b9f087aaa7 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index 9811806e0c8..74cab2e2f8c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -26,7 +26,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -65,15 +65,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index bcf0155a1b2..d6b45daabd7 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index 6adaaba97d7..3f4cf6872f2 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index c3d3aa9182e..e0a16a7b89a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -53,8 +53,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 67ef036857d..12b55e21185 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -28,17 +28,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -142,6 +142,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 5b77bee14c1..8b74b97d38f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -165,6 +165,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -174,7 +177,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @Schema(name = "array_item", example = "[0, 1, 2, 3]", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 1a4455cdaa8..03f777866d6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 5d716a83385..8263ca2ee05 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -38,6 +38,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 608a1aeac6e..065df164962 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -45,7 +45,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -66,7 +66,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index fa15b51fccc..4e0a224db24 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -100,7 +100,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -114,7 +115,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @Operation( @@ -130,10 +131,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @Parameter(name = "body", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -169,7 +171,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -199,7 +202,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -213,7 +217,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @Operation( @@ -230,7 +234,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -241,7 +245,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @Operation( @@ -258,7 +262,7 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -269,7 +273,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -290,7 +294,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -451,13 +455,15 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @Operation( operationId = "testInlineAdditionalProperties", summary = "test inline additionalProperties", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -469,7 +475,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -478,6 +484,7 @@ public interface FakeApi { /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -486,6 +493,7 @@ public interface FakeApi { @Operation( operationId = "testJsonFormData", summary = "test json serialization of form data", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -510,7 +518,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -530,7 +537,6 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context @@ -542,6 +548,7 @@ public interface FakeApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) @@ -551,6 +558,7 @@ public interface FakeApi { @Operation( operationId = "uploadFileWithRequiredFile", summary = "uploads an image (required)", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 29936566e75..6ff08f7a872 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -45,7 +45,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -69,7 +69,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 407780f0e3c..880f6f7d409 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -45,14 +45,16 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @Operation( operationId = "addPet", summary = "Add a new pet to the store", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -68,7 +70,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -77,6 +79,7 @@ public interface PetApi { /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @return successful operation (status code 200) @@ -85,6 +88,7 @@ public interface PetApi { @Operation( operationId = "deletePet", summary = "Deletes a pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -268,8 +272,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -278,6 +283,7 @@ public interface PetApi { @Operation( operationId = "updatePet", summary = "Update an existing pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -295,7 +301,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -304,6 +310,7 @@ public interface PetApi { /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -313,6 +320,7 @@ public interface PetApi { @Operation( operationId = "updatePetWithForm", summary = "Updates a pet in the store with form data", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "405", description = "Invalid input") @@ -338,6 +346,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -347,6 +356,7 @@ public interface PetApi { @Operation( operationId = "uploadFile", summary = "uploads an image", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 65a87a295ec..1a630a2a489 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -157,14 +157,16 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @Operation( operationId = "placeOrder", summary = "Place an order for a pet", + description = "", tags = { "store" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -177,10 +179,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 13c3f8176e6..140f63bd838 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -47,7 +47,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @Operation( @@ -61,10 +61,11 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -73,13 +74,15 @@ public interface UserApi { /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithArrayInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -87,10 +90,11 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -99,13 +103,15 @@ public interface UserApi { /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithListInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -113,10 +119,11 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -155,6 +162,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -164,6 +172,7 @@ public interface UserApi { @Operation( operationId = "getUserByName", summary = "Get user by user name", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -203,6 +212,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -212,6 +222,7 @@ public interface UserApi { @Operation( operationId = "loginUser", summary = "Logs user into the system", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -237,12 +248,14 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @Operation( operationId = "logoutUser", summary = "Logs out current logged in user session", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -265,7 +278,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -281,11 +294,12 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 14e13504a8c..66e0aed61c6 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -5,10 +5,13 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -27,41 +30,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -302,7 +305,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -312,11 +315,11 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -357,13 +360,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 42600354f74..ead205932fa 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 2f6c19a8344..7ab62ebdb8f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 23ee84ce8b5..4c5a142ddca 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..55d20539817 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,224 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index 2720e81c227..696d07582b9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 8b196d5d7de..9b9f087aaa7 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 9811806e0c8..74cab2e2f8c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -26,7 +26,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -65,15 +65,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index bcf0155a1b2..d6b45daabd7 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index 6adaaba97d7..3f4cf6872f2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index c3d3aa9182e..e0a16a7b89a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -53,8 +53,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 67ef036857d..12b55e21185 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -28,17 +28,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -142,6 +142,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 5b77bee14c1..8b74b97d38f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -165,6 +165,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -174,7 +177,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @Schema(name = "array_item", example = "[0, 1, 2, 3]", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 1a4455cdaa8..03f777866d6 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator-ignore b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator-ignore deleted file mode 100644 index 7484ee590a3..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES deleted file mode 100644 index 1fc07e54e68..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/FILES +++ /dev/null @@ -1,76 +0,0 @@ -README.md -pom.xml -src/main/java/org/openapitools/OpenApiGeneratorApplication.java -src/main/java/org/openapitools/RFC3339DateFormat.java -src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java -src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java -src/main/java/org/openapitools/api/ApiUtil.java -src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java -src/main/java/org/openapitools/api/FakeApiDelegate.java -src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java -src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java -src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java -src/main/java/org/openapitools/api/PetApiDelegate.java -src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java -src/main/java/org/openapitools/api/StoreApiDelegate.java -src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/api/UserApiDelegate.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java -src/main/java/org/openapitools/configuration/HomeController.java -src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java -src/main/java/org/openapitools/model/AdditionalPropertiesArray.java -src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java -src/main/java/org/openapitools/model/AdditionalPropertiesClass.java -src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java -src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java -src/main/java/org/openapitools/model/AdditionalPropertiesObject.java -src/main/java/org/openapitools/model/AdditionalPropertiesString.java -src/main/java/org/openapitools/model/Animal.java -src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java -src/main/java/org/openapitools/model/ArrayOfNumberOnly.java -src/main/java/org/openapitools/model/ArrayTest.java -src/main/java/org/openapitools/model/BigCat.java -src/main/java/org/openapitools/model/BigCatAllOf.java -src/main/java/org/openapitools/model/Capitalization.java -src/main/java/org/openapitools/model/Cat.java -src/main/java/org/openapitools/model/CatAllOf.java -src/main/java/org/openapitools/model/Category.java -src/main/java/org/openapitools/model/ClassModel.java -src/main/java/org/openapitools/model/Client.java -src/main/java/org/openapitools/model/Dog.java -src/main/java/org/openapitools/model/DogAllOf.java -src/main/java/org/openapitools/model/EnumArrays.java -src/main/java/org/openapitools/model/EnumClass.java -src/main/java/org/openapitools/model/EnumTest.java -src/main/java/org/openapitools/model/File.java -src/main/java/org/openapitools/model/FileSchemaTestClass.java -src/main/java/org/openapitools/model/FormatTest.java -src/main/java/org/openapitools/model/HasOnlyReadOnly.java -src/main/java/org/openapitools/model/MapTest.java -src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java -src/main/java/org/openapitools/model/Model200Response.java -src/main/java/org/openapitools/model/ModelApiResponse.java -src/main/java/org/openapitools/model/ModelList.java -src/main/java/org/openapitools/model/ModelReturn.java -src/main/java/org/openapitools/model/Name.java -src/main/java/org/openapitools/model/NumberOnly.java -src/main/java/org/openapitools/model/Order.java -src/main/java/org/openapitools/model/OuterComposite.java -src/main/java/org/openapitools/model/OuterEnum.java -src/main/java/org/openapitools/model/Pet.java -src/main/java/org/openapitools/model/ReadOnlyFirst.java -src/main/java/org/openapitools/model/SpecialModelName.java -src/main/java/org/openapitools/model/Tag.java -src/main/java/org/openapitools/model/TypeHolderDefault.java -src/main/java/org/openapitools/model/TypeHolderExample.java -src/main/java/org/openapitools/model/User.java -src/main/java/org/openapitools/model/XmlItem.java -src/main/resources/application.properties -src/main/resources/openapi.yaml -src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION deleted file mode 100644 index 7f4d792ec2c..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-reactive/README.md b/samples/openapi3/server/petstore/springboot-reactive/README.md deleted file mode 100644 index e6de7e038ce..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# OpenAPI generated server - -Spring Boot Server - -## Overview -This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. -By using the [OpenAPI-Spec](https://openapis.org), you can easily generate a server stub. -This is an example of building a OpenAPI-enabled server in Java using the SpringBoot framework. - - -The underlying library integrating OpenAPI to Spring Boot is [springdoc](https://springdoc.org). -Springdoc will generate an OpenAPI v3 specification based on the generated Controller and Model classes. -The specification is available to download using the following url: -http://localhost:80/v3/api-docs/ - -Start your server as a simple java application - -You can view the api documentation in swagger-ui by pointing to -http://localhost:80/swagger-ui.html - -Change default port value in application.properties \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-reactive/pom.xml b/samples/openapi3/server/petstore/springboot-reactive/pom.xml deleted file mode 100644 index 2a16a7b42b7..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - 4.0.0 - org.openapitools.openapi3 - springboot-reactive - jar - springboot-reactive - 1.0.0 - - 1.8 - ${java.version} - ${java.version} - UTF-8 - 1.6.14 - 4.15.5 - - - org.springframework.boot - spring-boot-starter-parent - 2.7.6 - - - - src/main/java - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.data - spring-data-commons - - - - org.springdoc - springdoc-openapi-webflux-ui - ${springdoc.version} - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - - org.springframework.boot - spring-boot-starter-validation - - - com.fasterxml.jackson.core - jackson-databind - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/OpenApiGeneratorApplication.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/OpenApiGeneratorApplication.java deleted file mode 100644 index 97252a8a940..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/OpenApiGeneratorApplication.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.openapitools; - -import com.fasterxml.jackson.databind.Module; -import org.openapitools.jackson.nullable.JsonNullableModule; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.FilterType; -import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator; - -@SpringBootApplication( - nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class -) -@ComponentScan( - basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"}, - nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class -) -public class OpenApiGeneratorApplication { - - public static void main(String[] args) { - SpringApplication.run(OpenApiGeneratorApplication.class, args); - } - - @Bean(name = "org.openapitools.OpenApiGeneratorApplication.jsonNullableModule") - public Module jsonNullableModule() { - return new JsonNullableModule(); - } - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/RFC3339DateFormat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/RFC3339DateFormat.java deleted file mode 100644 index bcd3936d8b3..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/RFC3339DateFormat.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.openapitools; - -import com.fasterxml.jackson.databind.util.StdDateFormat; - -import java.text.DateFormat; -import java.text.FieldPosition; -import java.text.ParsePosition; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; - -public class RFC3339DateFormat extends DateFormat { - private static final long serialVersionUID = 1L; - private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); - - private final StdDateFormat fmt = new StdDateFormat() - .withTimeZone(TIMEZONE_Z) - .withColonInTimeZone(true); - - public RFC3339DateFormat() { - this.calendar = new GregorianCalendar(); - } - - @Override - public Date parse(String source, ParsePosition pos) { - return fmt.parse(source, pos); - } - - @Override - public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { - return fmt.format(date, toAppendTo, fieldPosition); - } - - @Override - public Object clone() { - return this; - } -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java deleted file mode 100644 index 5087077ff35..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.Client; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "$another-fake?", description = "the $another-fake? API") -public interface AnotherFakeApi { - - default AnotherFakeApiDelegate getDelegate() { - return new AnotherFakeApiDelegate() {}; - } - - /** - * PATCH /another-fake/dummy : To test special tags - * To test special tags and operation ID starting with number - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "call123testSpecialTags", - summary = "To test special tags", - description = "To test special tags and operation ID starting with number", - tags = { "$another-fake?" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/another-fake/dummy", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default Mono> call123testSpecialTags( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().call123testSpecialTags(body, exchange); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java deleted file mode 100644 index e27e2fc20ea..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class AnotherFakeApiController implements AnotherFakeApi { - - private final AnotherFakeApiDelegate delegate; - - public AnotherFakeApiController(@Autowired(required = false) AnotherFakeApiDelegate delegate) { - this.delegate = Optional.ofNullable(delegate).orElse(new AnotherFakeApiDelegate() {}); - } - - @Override - public AnotherFakeApiDelegate getDelegate() { - return delegate; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java deleted file mode 100644 index 55b8ba0da1d..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -/** - * A delegate to be called by the {@link AnotherFakeApiController}}. - * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. - */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public interface AnotherFakeApiDelegate { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * PATCH /another-fake/dummy : To test special tags - * To test special tags and operation ID starting with number - * - * @param body client model (required) - * @return successful operation (status code 200) - * @see AnotherFakeApi#call123testSpecialTags - */ - default Mono> call123testSpecialTags(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(body).then(Mono.empty()); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/ApiUtil.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/ApiUtil.java deleted file mode 100644 index 7ed3b0ab28d..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/ApiUtil.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.openapitools.api; - -import java.nio.charset.StandardCharsets; -import org.springframework.core.io.buffer.DefaultDataBuffer; -import org.springframework.core.io.buffer.DefaultDataBufferFactory; -import org.springframework.http.MediaType; -import org.springframework.http.server.reactive.ServerHttpResponse; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Mono; - -public class ApiUtil { - public static Mono getExampleResponse(ServerWebExchange exchange, MediaType mediaType, String example) { - ServerHttpResponse response = exchange.getResponse(); - response.getHeaders().setContentType(mediaType); - - byte[] exampleBytes = example.getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer data = new DefaultDataBufferFactory().wrap(exampleBytes); - return response.writeWith(Mono.just(data)); - } -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java deleted file mode 100644 index f4826107b05..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ /dev/null @@ -1,561 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "fake", description = "the fake API") -public interface FakeApi { - - default FakeApiDelegate getDelegate() { - return new FakeApiDelegate() {}; - } - - /** - * POST /fake/create_xml_item : creates an XmlItem - * this route creates an XmlItem - * - * @param xmlItem XmlItem Body (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createXmlItem", - summary = "creates an XmlItem", - description = "this route creates an XmlItem", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/create_xml_item", - consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } - ) - default Mono> createXmlItem( - @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().createXmlItem(xmlItem, exchange); - } - - - /** - * POST /fake/outer/boolean - * Test serialization of outer boolean types - * - * @param body Input boolean as post body (optional) - * @return Output boolean (status code 200) - */ - @Operation( - operationId = "fakeOuterBooleanSerialize", - description = "Test serialization of outer boolean types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output boolean", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = Boolean.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/boolean", - produces = { "*/*" } - ) - default Mono> fakeOuterBooleanSerialize( - @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().fakeOuterBooleanSerialize(body, exchange); - } - - - /** - * POST /fake/outer/composite - * Test serialization of object with outer number type - * - * @param body Input composite as post body (optional) - * @return Output composite (status code 200) - */ - @Operation( - operationId = "fakeOuterCompositeSerialize", - description = "Test serialization of object with outer number type", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output composite", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = OuterComposite.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/composite", - produces = { "*/*" } - ) - default Mono> fakeOuterCompositeSerialize( - @Parameter(name = "body", description = "Input composite as post body") @Valid @RequestBody(required = false) Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().fakeOuterCompositeSerialize(body, exchange); - } - - - /** - * POST /fake/outer/number - * Test serialization of outer number types - * - * @param body Input number as post body (optional) - * @return Output number (status code 200) - */ - @Operation( - operationId = "fakeOuterNumberSerialize", - description = "Test serialization of outer number types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output number", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = BigDecimal.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/number", - produces = { "*/*" } - ) - default Mono> fakeOuterNumberSerialize( - @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().fakeOuterNumberSerialize(body, exchange); - } - - - /** - * POST /fake/outer/string - * Test serialization of outer string types - * - * @param body Input string as post body (optional) - * @return Output string (status code 200) - */ - @Operation( - operationId = "fakeOuterStringSerialize", - description = "Test serialization of outer string types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output string", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = String.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/string", - produces = { "*/*" } - ) - default Mono> fakeOuterStringSerialize( - @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().fakeOuterStringSerialize(body, exchange); - } - - - /** - * PUT /fake/body-with-file-schema - * For this test, the body for this request much reference a schema named `File`. - * - * @param body (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testBodyWithFileSchema", - description = "For this test, the body for this request much reference a schema named `File`.", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/body-with-file-schema", - consumes = { "application/json" } - ) - default Mono> testBodyWithFileSchema( - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testBodyWithFileSchema(body, exchange); - } - - - /** - * PUT /fake/body-with-query-params - * - * @param query (required) - * @param body (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testBodyWithQueryParams", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/body-with-query-params", - consumes = { "application/json" } - ) - default Mono> testBodyWithQueryParams( - @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testBodyWithQueryParams(query, body, exchange); - } - - - /** - * PATCH /fake : To test \"client\" model - * To test \"client\" model - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testClientModel", - summary = "To test \"client\" model", - description = "To test \"client\" model", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/fake", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default Mono> testClientModel( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testClientModel(body, exchange); - } - - - /** - * POST /fake : Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * - * @param number None (required) - * @param _double None (required) - * @param patternWithoutDelimiter None (required) - * @param _byte None (required) - * @param integer None (optional) - * @param int32 None (optional) - * @param int64 None (optional) - * @param _float None (optional) - * @param string None (optional) - * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) - * @param password None (optional) - * @param paramCallback None (optional) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "testEndpointParameters", - summary = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트", - description = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - }, - security = { - @SecurityRequirement(name = "http_basic_test") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake", - consumes = { "application/x-www-form-urlencoded" } - ) - default Mono> testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, - @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, - @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string, - @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) Flux binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password, - @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); - } - - - /** - * GET /fake : To test enum parameters - * To test enum parameters - * - * @param enumHeaderStringArray Header parameter enum test (string array) (optional) - * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional) - * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) - * @param enumQueryInteger Query parameter enum test (double) (optional) - * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) - * @param enumFormString Form parameter enum test (string) (optional, default to -efg) - * @return Invalid request (status code 400) - * or Not found (status code 404) - */ - @Operation( - operationId = "testEnumParameters", - summary = "To test enum parameters", - description = "To test enum parameters", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid request"), - @ApiResponse(responseCode = "404", description = "Not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/fake", - consumes = { "application/x-www-form-urlencoded" } - ) - default Mono> testEnumParameters( - @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) List enumHeaderStringArray, - @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) List enumQueryStringArray, - @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger, - @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) Double enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); - } - - - /** - * DELETE /fake : Fake endpoint to test group parameters (optional) - * Fake endpoint to test group parameters (optional) - * - * @param requiredStringGroup Required String in group parameters (required) - * @param requiredBooleanGroup Required Boolean in group parameters (required) - * @param requiredInt64Group Required Integer in group parameters (required) - * @param stringGroup String in group parameters (optional) - * @param booleanGroup Boolean in group parameters (optional) - * @param int64Group Integer in group parameters (optional) - * @return Something wrong (status code 400) - */ - @Operation( - operationId = "testGroupParameters", - summary = "Fake endpoint to test group parameters (optional)", - description = "Fake endpoint to test group parameters (optional)", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Something wrong") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/fake" - ) - default Mono> testGroupParameters( - @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup, - @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) Boolean booleanGroup, - @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) Long int64Group, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); - } - - - /** - * POST /fake/inline-additionalProperties : test inline additionalProperties - * - * @param param request body (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testInlineAdditionalProperties", - summary = "test inline additionalProperties", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/inline-additionalProperties", - consumes = { "application/json" } - ) - default Mono> testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Mono> param, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testInlineAdditionalProperties(param, exchange); - } - - - /** - * GET /fake/jsonFormData : test json serialization of form data - * - * @param param field1 (required) - * @param param2 field2 (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testJsonFormData", - summary = "test json serialization of form data", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/fake/jsonFormData", - consumes = { "application/x-www-form-urlencoded" } - ) - default Mono> testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, - @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testJsonFormData(param, param2, exchange); - } - - - /** - * PUT /fake/test-query-parameters - * To test the collection format in query parameters - * - * @param pipe (required) - * @param ioutil (required) - * @param http (required) - * @param url (required) - * @param context (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testQueryParameterCollectionFormat", - description = "To test the collection format in query parameters", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/test-query-parameters" - ) - default Mono> testQueryParameterCollectionFormat( - @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, exchange); - } - - - /** - * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) - * - * @param petId ID of pet to update (required) - * @param requiredFile file to upload (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "uploadFileWithRequiredFile", - summary = "uploads an image (required)", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = ModelApiResponse.class)) - }) - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/{petId}/uploadImageWithRequiredFile", - produces = { "application/json" }, - consumes = { "multipart/form-data" } - ) - default Mono> uploadFileWithRequiredFile( - @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Flux requiredFile, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java deleted file mode 100644 index 726b17779f1..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.openapitools.api; - -import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class FakeApiController implements FakeApi { - - private final FakeApiDelegate delegate; - - public FakeApiController(@Autowired(required = false) FakeApiDelegate delegate) { - this.delegate = Optional.ofNullable(delegate).orElse(new FakeApiDelegate() {}); - } - - @Override - public FakeApiDelegate getDelegate() { - return delegate; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java deleted file mode 100644 index 98fba4fc3d0..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ /dev/null @@ -1,365 +0,0 @@ -package org.openapitools.api; - -import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -/** - * A delegate to be called by the {@link FakeApiController}}. - * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. - */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public interface FakeApiDelegate { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /fake/create_xml_item : creates an XmlItem - * this route creates an XmlItem - * - * @param xmlItem XmlItem Body (required) - * @return successful operation (status code 200) - * @see FakeApi#createXmlItem - */ - default Mono> createXmlItem(Mono xmlItem, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(xmlItem).then(Mono.empty()); - - } - - /** - * POST /fake/outer/boolean - * Test serialization of outer boolean types - * - * @param body Input boolean as post body (optional) - * @return Output boolean (status code 200) - * @see FakeApi#fakeOuterBooleanSerialize - */ - default Mono> fakeOuterBooleanSerialize(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - - /** - * POST /fake/outer/composite - * Test serialization of object with outer number type - * - * @param body Input composite as post body (optional) - * @return Output composite (status code 200) - * @see FakeApi#fakeOuterCompositeSerialize - */ - default Mono> fakeOuterCompositeSerialize(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(body).then(Mono.empty()); - - } - - /** - * POST /fake/outer/number - * Test serialization of outer number types - * - * @param body Input number as post body (optional) - * @return Output number (status code 200) - * @see FakeApi#fakeOuterNumberSerialize - */ - default Mono> fakeOuterNumberSerialize(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - - /** - * POST /fake/outer/string - * Test serialization of outer string types - * - * @param body Input string as post body (optional) - * @return Output string (status code 200) - * @see FakeApi#fakeOuterStringSerialize - */ - default Mono> fakeOuterStringSerialize(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - - /** - * PUT /fake/body-with-file-schema - * For this test, the body for this request much reference a schema named `File`. - * - * @param body (required) - * @return Success (status code 200) - * @see FakeApi#testBodyWithFileSchema - */ - default Mono> testBodyWithFileSchema(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - - /** - * PUT /fake/body-with-query-params - * - * @param query (required) - * @param body (required) - * @return Success (status code 200) - * @see FakeApi#testBodyWithQueryParams - */ - default Mono> testBodyWithQueryParams(String query, - Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - - /** - * PATCH /fake : To test \"client\" model - * To test \"client\" model - * - * @param body client model (required) - * @return successful operation (status code 200) - * @see FakeApi#testClientModel - */ - default Mono> testClientModel(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(body).then(Mono.empty()); - - } - - /** - * POST /fake : Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * - * @param number None (required) - * @param _double None (required) - * @param patternWithoutDelimiter None (required) - * @param _byte None (required) - * @param integer None (optional) - * @param int32 None (optional) - * @param int64 None (optional) - * @param _float None (optional) - * @param string None (optional) - * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) - * @param password None (optional) - * @param paramCallback None (optional) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - * @see FakeApi#testEndpointParameters - */ - default Mono> testEndpointParameters(BigDecimal number, - Double _double, - String patternWithoutDelimiter, - byte[] _byte, - Integer integer, - Integer int32, - Long int64, - Float _float, - String string, - Flux binary, - LocalDate date, - OffsetDateTime dateTime, - String password, - String paramCallback, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * GET /fake : To test enum parameters - * To test enum parameters - * - * @param enumHeaderStringArray Header parameter enum test (string array) (optional) - * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional) - * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) - * @param enumQueryInteger Query parameter enum test (double) (optional) - * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) - * @param enumFormString Form parameter enum test (string) (optional, default to -efg) - * @return Invalid request (status code 400) - * or Not found (status code 404) - * @see FakeApi#testEnumParameters - */ - default Mono> testEnumParameters(List enumHeaderStringArray, - String enumHeaderString, - List enumQueryStringArray, - String enumQueryString, - Integer enumQueryInteger, - Double enumQueryDouble, - List enumFormStringArray, - String enumFormString, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * DELETE /fake : Fake endpoint to test group parameters (optional) - * Fake endpoint to test group parameters (optional) - * - * @param requiredStringGroup Required String in group parameters (required) - * @param requiredBooleanGroup Required Boolean in group parameters (required) - * @param requiredInt64Group Required Integer in group parameters (required) - * @param stringGroup String in group parameters (optional) - * @param booleanGroup Boolean in group parameters (optional) - * @param int64Group Integer in group parameters (optional) - * @return Something wrong (status code 400) - * @see FakeApi#testGroupParameters - */ - default Mono> testGroupParameters(Integer requiredStringGroup, - Boolean requiredBooleanGroup, - Long requiredInt64Group, - Integer stringGroup, - Boolean booleanGroup, - Long int64Group, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * POST /fake/inline-additionalProperties : test inline additionalProperties - * - * @param param request body (required) - * @return successful operation (status code 200) - * @see FakeApi#testInlineAdditionalProperties - */ - default Mono> testInlineAdditionalProperties(Mono> param, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(param).then(Mono.empty()); - - } - - /** - * GET /fake/jsonFormData : test json serialization of form data - * - * @param param field1 (required) - * @param param2 field2 (required) - * @return successful operation (status code 200) - * @see FakeApi#testJsonFormData - */ - default Mono> testJsonFormData(String param, - String param2, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * PUT /fake/test-query-parameters - * To test the collection format in query parameters - * - * @param pipe (required) - * @param ioutil (required) - * @param http (required) - * @param url (required) - * @param context (required) - * @return Success (status code 200) - * @see FakeApi#testQueryParameterCollectionFormat - */ - default Mono> testQueryParameterCollectionFormat(List pipe, - List ioutil, - List http, - List url, - List context, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) - * - * @param petId ID of pet to update (required) - * @param requiredFile file to upload (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @return successful operation (status code 200) - * @see FakeApi#uploadFileWithRequiredFile - */ - default Mono> uploadFileWithRequiredFile(Long petId, - Flux requiredFile, - String additionalMetadata, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(Mono.empty()); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java deleted file mode 100644 index e9b3ad56131..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ /dev/null @@ -1,78 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.Client; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "fake_classname_tags 123#$%^", description = "the fake_classname_tags 123#$%^ API") -public interface FakeClassnameTestApi { - - default FakeClassnameTestApiDelegate getDelegate() { - return new FakeClassnameTestApiDelegate() {}; - } - - /** - * PATCH /fake_classname_test : To test class name in snake case - * To test class name in snake case - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testClassname", - summary = "To test class name in snake case", - description = "To test class name in snake case", - tags = { "fake_classname_tags 123#$%^" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - }, - security = { - @SecurityRequirement(name = "api_key_query") - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/fake_classname_test", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default Mono> testClassname( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().testClassname(body, exchange); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java deleted file mode 100644 index 21e28fe8b21..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class FakeClassnameTestApiController implements FakeClassnameTestApi { - - private final FakeClassnameTestApiDelegate delegate; - - public FakeClassnameTestApiController(@Autowired(required = false) FakeClassnameTestApiDelegate delegate) { - this.delegate = Optional.ofNullable(delegate).orElse(new FakeClassnameTestApiDelegate() {}); - } - - @Override - public FakeClassnameTestApiDelegate getDelegate() { - return delegate; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java deleted file mode 100644 index 0c2f87127f9..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -/** - * A delegate to be called by the {@link FakeClassnameTestApiController}}. - * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. - */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public interface FakeClassnameTestApiDelegate { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * PATCH /fake_classname_test : To test class name in snake case - * To test class name in snake case - * - * @param body client model (required) - * @return successful operation (status code 200) - * @see FakeClassnameTestApi#testClassname - */ - default Mono> testClassname(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(body).then(Mono.empty()); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java deleted file mode 100644 index d96910342a1..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ /dev/null @@ -1,332 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import java.util.Set; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "pet", description = "Everything about your Pets") -public interface PetApi { - - default PetApiDelegate getDelegate() { - return new PetApiDelegate() {}; - } - - /** - * POST /pet : Add a new pet to the store - * - * @param body Pet object that needs to be added to the store (required) - * @return successful operation (status code 200) - * or Invalid input (status code 405) - */ - @Operation( - operationId = "addPet", - summary = "Add a new pet to the store", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "405", description = "Invalid input") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet", - consumes = { "application/json", "application/xml" } - ) - default Mono> addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().addPet(body, exchange); - } - - - /** - * DELETE /pet/{petId} : Deletes a pet - * - * @param petId Pet id to delete (required) - * @param apiKey (optional) - * @return successful operation (status code 200) - * or Invalid pet value (status code 400) - */ - @Operation( - operationId = "deletePet", - summary = "Deletes a pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "400", description = "Invalid pet value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/pet/{petId}" - ) - default Mono> deletePet( - @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) String apiKey, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().deletePet(petId, apiKey, exchange); - } - - - /** - * GET /pet/findByStatus : Finds Pets by status - * Multiple status values can be provided with comma separated strings - * - * @param status Status values that need to be considered for filter (required) - * @return successful operation (status code 200) - * or Invalid status value (status code 400) - */ - @Operation( - operationId = "findPetsByStatus", - summary = "Finds Pets by status", - description = "Multiple status values can be provided with comma separated strings", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", array = @ArraySchema(schema = @Schema(implementation = Pet.class))), - @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = Pet.class))) - }), - @ApiResponse(responseCode = "400", description = "Invalid status value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByStatus", - produces = { "application/xml", "application/json" } - ) - default Mono>> findPetsByStatus( - @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().findPetsByStatus(status, exchange); - } - - - /** - * GET /pet/findByTags : Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @param tags Tags to filter by (required) - * @return successful operation (status code 200) - * or Invalid tag value (status code 400) - * @deprecated - */ - @Deprecated - @Operation( - operationId = "findPetsByTags", - summary = "Finds Pets by tags", - description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", array = @ArraySchema(schema = @Schema(implementation = Pet.class))), - @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = Pet.class))) - }), - @ApiResponse(responseCode = "400", description = "Invalid tag value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByTags", - produces = { "application/xml", "application/json" } - ) - default Mono>> findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().findPetsByTags(tags, exchange); - } - - - /** - * GET /pet/{petId} : Find pet by ID - * Returns a single pet - * - * @param petId ID of pet to return (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - */ - @Operation( - operationId = "getPetById", - summary = "Find pet by ID", - description = "Returns a single pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Pet not found") - }, - security = { - @SecurityRequirement(name = "api_key") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/{petId}", - produces = { "application/xml", "application/json" } - ) - default Mono> getPetById( - @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().getPetById(petId, exchange); - } - - - /** - * PUT /pet : Update an existing pet - * - * @param body Pet object that needs to be added to the store (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * or Validation exception (status code 405) - */ - @Operation( - operationId = "updatePet", - summary = "Update an existing pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Pet not found"), - @ApiResponse(responseCode = "405", description = "Validation exception") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/pet", - consumes = { "application/json", "application/xml" } - ) - default Mono> updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().updatePet(body, exchange); - } - - - /** - * POST /pet/{petId} : Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated (required) - * @param name Updated name of the pet (optional) - * @param status Updated status of the pet (optional) - * @return Invalid input (status code 405) - */ - @Operation( - operationId = "updatePetWithForm", - summary = "Updates a pet in the store with form data", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "405", description = "Invalid input") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}", - consumes = { "application/x-www-form-urlencoded" } - ) - default Mono> updatePetWithForm( - @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, - @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().updatePetWithForm(petId, name, status, exchange); - } - - - /** - * POST /pet/{petId}/uploadImage : uploads an image - * - * @param petId ID of pet to update (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @param file file to upload (optional) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "uploadFile", - summary = "uploads an image", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = ModelApiResponse.class)) - }) - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}/uploadImage", - produces = { "application/json" }, - consumes = { "multipart/form-data" } - ) - default Mono> uploadFile( - @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, - @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) Flux file, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java deleted file mode 100644 index 5ef3de965ff..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import java.util.Set; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class PetApiController implements PetApi { - - private final PetApiDelegate delegate; - - public PetApiController(@Autowired(required = false) PetApiDelegate delegate) { - this.delegate = Optional.ofNullable(delegate).orElse(new PetApiDelegate() {}); - } - - @Override - public PetApiDelegate getDelegate() { - return delegate; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java deleted file mode 100644 index b53ef4a0fa5..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java +++ /dev/null @@ -1,219 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import java.util.Set; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -/** - * A delegate to be called by the {@link PetApiController}}. - * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. - */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public interface PetApiDelegate { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /pet : Add a new pet to the store - * - * @param body Pet object that needs to be added to the store (required) - * @return successful operation (status code 200) - * or Invalid input (status code 405) - * @see PetApi#addPet - */ - default Mono> addPet(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - - /** - * DELETE /pet/{petId} : Deletes a pet - * - * @param petId Pet id to delete (required) - * @param apiKey (optional) - * @return successful operation (status code 200) - * or Invalid pet value (status code 400) - * @see PetApi#deletePet - */ - default Mono> deletePet(Long petId, - String apiKey, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * GET /pet/findByStatus : Finds Pets by status - * Multiple status values can be provided with comma separated strings - * - * @param status Status values that need to be considered for filter (required) - * @return successful operation (status code 200) - * or Invalid status value (status code 400) - * @see PetApi#findPetsByStatus - */ - default Mono>> findPetsByStatus(List status, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(Mono.empty()); - - } - - /** - * GET /pet/findByTags : Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @param tags Tags to filter by (required) - * @return successful operation (status code 200) - * or Invalid tag value (status code 400) - * @deprecated - * @see PetApi#findPetsByTags - */ - @Deprecated - default Mono>> findPetsByTags(Set tags, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(Mono.empty()); - - } - - /** - * GET /pet/{petId} : Find pet by ID - * Returns a single pet - * - * @param petId ID of pet to return (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * @see PetApi#getPetById - */ - default Mono> getPetById(Long petId, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(Mono.empty()); - - } - - /** - * PUT /pet : Update an existing pet - * - * @param body Pet object that needs to be added to the store (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * or Validation exception (status code 405) - * @see PetApi#updatePet - */ - default Mono> updatePet(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - - /** - * POST /pet/{petId} : Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated (required) - * @param name Updated name of the pet (optional) - * @param status Updated status of the pet (optional) - * @return Invalid input (status code 405) - * @see PetApi#updatePetWithForm - */ - default Mono> updatePetWithForm(Long petId, - String name, - String status, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * POST /pet/{petId}/uploadImage : uploads an image - * - * @param petId ID of pet to update (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @param file file to upload (optional) - * @return successful operation (status code 200) - * @see PetApi#uploadFile - */ - default Mono> uploadFile(Long petId, - String additionalMetadata, - Flux file, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(Mono.empty()); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java deleted file mode 100644 index 989e0285182..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ /dev/null @@ -1,174 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "store", description = "Access to Petstore orders") -public interface StoreApi { - - default StoreApiDelegate getDelegate() { - return new StoreApiDelegate() {}; - } - - /** - * DELETE /store/order/{order_id} : Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * - * @param orderId ID of the order that needs to be deleted (required) - * @return Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @Operation( - operationId = "deleteOrder", - summary = "Delete purchase order by ID", - description = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Order not found") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/store/order/{order_id}" - ) - default Mono> deleteOrder( - @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().deleteOrder(orderId, exchange); - } - - - /** - * GET /store/inventory : Returns pet inventories by status - * Returns a map of status codes to quantities - * - * @return successful operation (status code 200) - */ - @Operation( - operationId = "getInventory", - summary = "Returns pet inventories by status", - description = "Returns a map of status codes to quantities", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Map.class)) - }) - }, - security = { - @SecurityRequirement(name = "api_key") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/inventory", - produces = { "application/json" } - ) - default Mono>> getInventory( - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().getInventory(exchange); - } - - - /** - * GET /store/order/{order_id} : Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - * - * @param orderId ID of pet that needs to be fetched (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @Operation( - operationId = "getOrderById", - summary = "Find purchase order by ID", - description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Order.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Order.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Order not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/order/{order_id}", - produces = { "application/xml", "application/json" } - ) - default Mono> getOrderById( - @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().getOrderById(orderId, exchange); - } - - - /** - * POST /store/order : Place an order for a pet - * - * @param body order placed for purchasing the pet (required) - * @return successful operation (status code 200) - * or Invalid Order (status code 400) - */ - @Operation( - operationId = "placeOrder", - summary = "Place an order for a pet", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Order.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Order.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid Order") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/store/order", - produces = { "application/xml", "application/json" } - ) - default Mono> placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().placeOrder(body, exchange); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java deleted file mode 100644 index e9e29a41b4f..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class StoreApiController implements StoreApi { - - private final StoreApiDelegate delegate; - - public StoreApiController(@Autowired(required = false) StoreApiDelegate delegate) { - this.delegate = Optional.ofNullable(delegate).orElse(new StoreApiDelegate() {}); - } - - @Override - public StoreApiDelegate getDelegate() { - return delegate; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java deleted file mode 100644 index ec665c3cd61..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -/** - * A delegate to be called by the {@link StoreApiController}}. - * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. - */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public interface StoreApiDelegate { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * DELETE /store/order/{order_id} : Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * - * @param orderId ID of the order that needs to be deleted (required) - * @return Invalid ID supplied (status code 400) - * or Order not found (status code 404) - * @see StoreApi#deleteOrder - */ - default Mono> deleteOrder(String orderId, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * GET /store/inventory : Returns pet inventories by status - * Returns a map of status codes to quantities - * - * @return successful operation (status code 200) - * @see StoreApi#getInventory - */ - default Mono>> getInventory(ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * GET /store/order/{order_id} : Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - * - * @param orderId ID of pet that needs to be fetched (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Order not found (status code 404) - * @see StoreApi#getOrderById - */ - default Mono> getOrderById(Long orderId, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(Mono.empty()); - - } - - /** - * POST /store/order : Place an order for a pet - * - * @param body order placed for purchasing the pet (required) - * @return successful operation (status code 200) - * or Invalid Order (status code 400) - * @see StoreApi#placeOrder - */ - default Mono> placeOrder(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(body).then(Mono.empty()); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java deleted file mode 100644 index 654a54daf89..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ /dev/null @@ -1,279 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "user", description = "Operations about user") -public interface UserApi { - - default UserApiDelegate getDelegate() { - return new UserApiDelegate() {}; - } - - /** - * POST /user : Create user - * This can only be done by the logged in user. - * - * @param body Created user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUser", - summary = "Create user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user" - ) - default Mono> createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().createUser(body, exchange); - } - - - /** - * POST /user/createWithArray : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUsersWithArrayInput", - summary = "Creates list of users with given input array", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithArray" - ) - default Mono> createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody Flux body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().createUsersWithArrayInput(body, exchange); - } - - - /** - * POST /user/createWithList : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUsersWithListInput", - summary = "Creates list of users with given input array", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithList" - ) - default Mono> createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody Flux body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().createUsersWithListInput(body, exchange); - } - - - /** - * DELETE /user/{username} : Delete user - * This can only be done by the logged in user. - * - * @param username The name that needs to be deleted (required) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "deleteUser", - summary = "Delete user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/user/{username}" - ) - default Mono> deleteUser( - @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().deleteUser(username, exchange); - } - - - /** - * GET /user/{username} : Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. (required) - * @return successful operation (status code 200) - * or Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "getUserByName", - summary = "Get user by user name", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = User.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = User.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/{username}", - produces = { "application/xml", "application/json" } - ) - default Mono> getUserByName( - @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().getUserByName(username, exchange); - } - - - /** - * GET /user/login : Logs user into the system - * - * @param username The user name for login (required) - * @param password The password for login in clear text (required) - * @return successful operation (status code 200) - * or Invalid username/password supplied (status code 400) - */ - @Operation( - operationId = "loginUser", - summary = "Logs user into the system", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = String.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = String.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid username/password supplied") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/login", - produces = { "application/xml", "application/json" } - ) - default Mono> loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().loginUser(username, password, exchange); - } - - - /** - * GET /user/logout : Logs out current logged in user session - * - * @return successful operation (status code 200) - */ - @Operation( - operationId = "logoutUser", - summary = "Logs out current logged in user session", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/logout" - ) - default Mono> logoutUser( - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().logoutUser(exchange); - } - - - /** - * PUT /user/{username} : Updated user - * This can only be done by the logged in user. - * - * @param username name that need to be deleted (required) - * @param body Updated user object (required) - * @return Invalid user supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "updateUser", - summary = "Updated user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid user supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/user/{username}" - ) - default Mono> updateUser( - @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody Mono body, - @Parameter(hidden = true) final ServerWebExchange exchange - ) { - return getDelegate().updateUser(username, body, exchange); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java deleted file mode 100644 index 1b48d4a9444..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class UserApiController implements UserApi { - - private final UserApiDelegate delegate; - - public UserApiController(@Autowired(required = false) UserApiDelegate delegate) { - this.delegate = Optional.ofNullable(delegate).orElse(new UserApiDelegate() {}); - } - - @Override - public UserApiDelegate getDelegate() { - return delegate; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java deleted file mode 100644 index 8a589951350..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java +++ /dev/null @@ -1,174 +0,0 @@ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import org.springframework.http.codec.multipart.Part; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -/** - * A delegate to be called by the {@link UserApiController}}. - * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. - */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public interface UserApiDelegate { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /user : Create user - * This can only be done by the logged in user. - * - * @param body Created user object (required) - * @return successful operation (status code 200) - * @see UserApi#createUser - */ - default Mono> createUser(Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - - /** - * POST /user/createWithArray : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - * @see UserApi#createUsersWithArrayInput - */ - default Mono> createUsersWithArrayInput(Flux body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.thenMany(body).then(Mono.empty()); - - } - - /** - * POST /user/createWithList : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - * @see UserApi#createUsersWithListInput - */ - default Mono> createUsersWithListInput(Flux body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.thenMany(body).then(Mono.empty()); - - } - - /** - * DELETE /user/{username} : Delete user - * This can only be done by the logged in user. - * - * @param username The name that needs to be deleted (required) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - * @see UserApi#deleteUser - */ - default Mono> deleteUser(String username, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * GET /user/{username} : Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. (required) - * @return successful operation (status code 200) - * or Invalid username supplied (status code 400) - * or User not found (status code 404) - * @see UserApi#getUserByName - */ - default Mono> getUserByName(String username, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 aeiou aeiou aeiou aeiou aeiou aeiou 123 "; - result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); - break; - } - } - return result.then(Mono.empty()); - - } - - /** - * GET /user/login : Logs user into the system - * - * @param username The user name for login (required) - * @param password The password for login in clear text (required) - * @return successful operation (status code 200) - * or Invalid username/password supplied (status code 400) - * @see UserApi#loginUser - */ - default Mono> loginUser(String username, - String password, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * GET /user/logout : Logs out current logged in user session - * - * @return successful operation (status code 200) - * @see UserApi#logoutUser - */ - default Mono> logoutUser(ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(Mono.empty()); - - } - - /** - * PUT /user/{username} : Updated user - * This can only be done by the logged in user. - * - * @param username name that need to be deleted (required) - * @param body Updated user object (required) - * @return Invalid user supplied (status code 400) - * or User not found (status code 404) - * @see UserApi#updateUser - */ - default Mono> updateUser(String username, - Mono body, - ServerWebExchange exchange) { - Mono result = Mono.empty(); - exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java deleted file mode 100644 index b257cf0a16c..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.openapitools.configuration; - -import org.openapitools.model.EnumClass; -import org.openapitools.model.OuterEnum; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.convert.converter.Converter; - -@Configuration -public class EnumConverterConfiguration { - - @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") - Converter enumClassConverter() { - return new Converter() { - @Override - public EnumClass convert(String source) { - return EnumClass.fromValue(source); - } - }; - } - @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.outerEnumConverter") - Converter outerEnumConverter() { - return new Converter() { - @Override - public OuterEnum convert(String source) { - return OuterEnum.fromValue(source); - } - }; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/HomeController.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/HomeController.java deleted file mode 100644 index cf658246a9d..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/HomeController.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.openapitools.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.ServerResponse; -import java.net.URI; - -import static org.springframework.web.reactive.function.server.RequestPredicates.GET; -import static org.springframework.web.reactive.function.server.RouterFunctions.route; - -/** - * Home redirection to OpenAPI api documentation - */ -@Controller -public class HomeController { - - @Bean - RouterFunction index() { - return route( - GET("/"), - req -> ServerResponse.temporaryRedirect(URI.create("swagger-ui.html")).build() - ); - } - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java deleted file mode 100644 index 0661c1a9a8d..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesAnyType - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesAnyType name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; - return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java deleted file mode 100644 index a3f9c905789..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesArray - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesArray name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; - return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java deleted file mode 100644 index db5f8d3ce35..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesBoolean - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesBoolean name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; - return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java deleted file mode 100644 index 14e13504a8c..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ /dev/null @@ -1,399 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesClass { - - @JsonProperty("map_string") - @Valid - private Map mapString = null; - - @JsonProperty("map_number") - @Valid - private Map mapNumber = null; - - @JsonProperty("map_integer") - @Valid - private Map mapInteger = null; - - @JsonProperty("map_boolean") - @Valid - private Map mapBoolean = null; - - @JsonProperty("map_array_integer") - @Valid - private Map> mapArrayInteger = null; - - @JsonProperty("map_array_anytype") - @Valid - private Map> mapArrayAnytype = null; - - @JsonProperty("map_map_string") - @Valid - private Map> mapMapString = null; - - @JsonProperty("map_map_anytype") - @Valid - private Map> mapMapAnytype = null; - - @JsonProperty("anytype_1") - private Object anytype1; - - @JsonProperty("anytype_2") - private Object anytype2; - - @JsonProperty("anytype_3") - private Object anytype3; - - public AdditionalPropertiesClass mapString(Map mapString) { - this.mapString = mapString; - return this; - } - - public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { - if (this.mapString == null) { - this.mapString = new HashMap<>(); - } - this.mapString.put(key, mapStringItem); - return this; - } - - /** - * Get mapString - * @return mapString - */ - - @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapString() { - return mapString; - } - - public void setMapString(Map mapString) { - this.mapString = mapString; - } - - public AdditionalPropertiesClass mapNumber(Map mapNumber) { - this.mapNumber = mapNumber; - return this; - } - - public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { - if (this.mapNumber == null) { - this.mapNumber = new HashMap<>(); - } - this.mapNumber.put(key, mapNumberItem); - return this; - } - - /** - * Get mapNumber - * @return mapNumber - */ - @Valid - @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapNumber() { - return mapNumber; - } - - public void setMapNumber(Map mapNumber) { - this.mapNumber = mapNumber; - } - - public AdditionalPropertiesClass mapInteger(Map mapInteger) { - this.mapInteger = mapInteger; - return this; - } - - public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { - if (this.mapInteger == null) { - this.mapInteger = new HashMap<>(); - } - this.mapInteger.put(key, mapIntegerItem); - return this; - } - - /** - * Get mapInteger - * @return mapInteger - */ - - @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapInteger() { - return mapInteger; - } - - public void setMapInteger(Map mapInteger) { - this.mapInteger = mapInteger; - } - - public AdditionalPropertiesClass mapBoolean(Map mapBoolean) { - this.mapBoolean = mapBoolean; - return this; - } - - public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { - if (this.mapBoolean == null) { - this.mapBoolean = new HashMap<>(); - } - this.mapBoolean.put(key, mapBooleanItem); - return this; - } - - /** - * Get mapBoolean - * @return mapBoolean - */ - - @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapBoolean() { - return mapBoolean; - } - - public void setMapBoolean(Map mapBoolean) { - this.mapBoolean = mapBoolean; - } - - public AdditionalPropertiesClass mapArrayInteger(Map> mapArrayInteger) { - this.mapArrayInteger = mapArrayInteger; - return this; - } - - public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { - if (this.mapArrayInteger == null) { - this.mapArrayInteger = new HashMap<>(); - } - this.mapArrayInteger.put(key, mapArrayIntegerItem); - return this; - } - - /** - * Get mapArrayInteger - * @return mapArrayInteger - */ - @Valid - @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapArrayInteger() { - return mapArrayInteger; - } - - public void setMapArrayInteger(Map> mapArrayInteger) { - this.mapArrayInteger = mapArrayInteger; - } - - public AdditionalPropertiesClass mapArrayAnytype(Map> mapArrayAnytype) { - this.mapArrayAnytype = mapArrayAnytype; - return this; - } - - public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { - if (this.mapArrayAnytype == null) { - this.mapArrayAnytype = new HashMap<>(); - } - this.mapArrayAnytype.put(key, mapArrayAnytypeItem); - return this; - } - - /** - * Get mapArrayAnytype - * @return mapArrayAnytype - */ - @Valid - @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapArrayAnytype() { - return mapArrayAnytype; - } - - public void setMapArrayAnytype(Map> mapArrayAnytype) { - this.mapArrayAnytype = mapArrayAnytype; - } - - public AdditionalPropertiesClass mapMapString(Map> mapMapString) { - this.mapMapString = mapMapString; - return this; - } - - public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { - if (this.mapMapString == null) { - this.mapMapString = new HashMap<>(); - } - this.mapMapString.put(key, mapMapStringItem); - return this; - } - - /** - * Get mapMapString - * @return mapMapString - */ - @Valid - @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapString() { - return mapMapString; - } - - public void setMapMapString(Map> mapMapString) { - this.mapMapString = mapMapString; - } - - public AdditionalPropertiesClass mapMapAnytype(Map> mapMapAnytype) { - this.mapMapAnytype = mapMapAnytype; - return this; - } - - public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { - if (this.mapMapAnytype == null) { - this.mapMapAnytype = new HashMap<>(); - } - this.mapMapAnytype.put(key, mapMapAnytypeItem); - return this; - } - - /** - * Get mapMapAnytype - * @return mapMapAnytype - */ - @Valid - @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapAnytype() { - return mapMapAnytype; - } - - public void setMapMapAnytype(Map> mapMapAnytype) { - this.mapMapAnytype = mapMapAnytype; - } - - public AdditionalPropertiesClass anytype1(Object anytype1) { - this.anytype1 = anytype1; - return this; - } - - /** - * Get anytype1 - * @return anytype1 - */ - - @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype1() { - return anytype1; - } - - public void setAnytype1(Object anytype1) { - this.anytype1 = anytype1; - } - - public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; - return this; - } - - /** - * Get anytype2 - * @return anytype2 - */ - - @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype2() { - return anytype2; - } - - public void setAnytype2(Object anytype2) { - this.anytype2 = anytype2; - } - - public AdditionalPropertiesClass anytype3(Object anytype3) { - this.anytype3 = anytype3; - return this; - } - - /** - * Get anytype3 - * @return anytype3 - */ - - @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype3() { - return anytype3; - } - - public void setAnytype3(Object anytype3) { - this.anytype3 = anytype3; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; - return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && - Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && - Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && - Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && - Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && - Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && - Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && - Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && - Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && - Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); - } - - @Override - public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesClass {\n"); - sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); - sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); - sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); - sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); - sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); - sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); - sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); - sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); - sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); - sb.append(" anytype2: ").append(toIndentedString(anytype2)).append("\n"); - sb.append(" anytype3: ").append(toIndentedString(anytype3)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java deleted file mode 100644 index ff0d6d7241e..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesInteger - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesInteger name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; - return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java deleted file mode 100644 index cc212be855d..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesNumber - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesNumber name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; - return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java deleted file mode 100644 index 7c74b7de08d..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesObject - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesObject name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; - return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java deleted file mode 100644 index 6087e70dba7..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesString - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesString name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; - return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java deleted file mode 100644 index 1ecf10efc5c..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java +++ /dev/null @@ -1,140 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Animal - */ - -@JsonIgnoreProperties( - value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization - allowSetters = true // allows the className to be set during deserialization -) -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) -@JsonSubTypes({ - @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"), - @JsonSubTypes.Type(value = Cat.class, name = "Cat"), - @JsonSubTypes.Type(value = Dog.class, name = "Dog") -}) - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Animal { - - @JsonProperty("className") - private String className; - - @JsonProperty("color") - private String color = "red"; - - /** - * Default constructor - * @deprecated Use {@link Animal#Animal(String)} - */ - @Deprecated - public Animal() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Animal(String className) { - this.className = className; - } - - public Animal className(String className) { - this.className = className; - return this; - } - - /** - * Get className - * @return className - */ - @NotNull - @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED) - public String getClassName() { - return className; - } - - public void setClassName(String className) { - this.className = className; - } - - public Animal color(String color) { - this.color = color; - return this; - } - - /** - * Get color - * @return color - */ - - @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getColor() { - return color; - } - - public void setColor(String color) { - this.color = color; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Animal animal = (Animal) o; - return Objects.equals(this.className, animal.className) && - Objects.equals(this.color, animal.color); - } - - @Override - public int hashCode() { - return Objects.hash(className, color); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Animal {\n"); - sb.append(" className: ").append(toIndentedString(className)).append("\n"); - sb.append(" color: ").append(toIndentedString(color)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java deleted file mode 100644 index 42600354f74..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayOfArrayOfNumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayOfArrayOfNumberOnly { - - @JsonProperty("ArrayArrayNumber") - @Valid - private List> arrayArrayNumber = null; - - public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { - this.arrayArrayNumber = arrayArrayNumber; - return this; - } - - public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { - if (this.arrayArrayNumber == null) { - this.arrayArrayNumber = new ArrayList<>(); - } - this.arrayArrayNumber.add(arrayArrayNumberItem); - return this; - } - - /** - * Get arrayArrayNumber - * @return arrayArrayNumber - */ - @Valid - @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayNumber() { - return arrayArrayNumber; - } - - public void setArrayArrayNumber(List> arrayArrayNumber) { - this.arrayArrayNumber = arrayArrayNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o; - return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber); - } - - @Override - public int hashCode() { - return Objects.hash(arrayArrayNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayOfArrayOfNumberOnly {\n"); - sb.append(" arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java deleted file mode 100644 index 2f6c19a8344..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayOfNumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayOfNumberOnly { - - @JsonProperty("ArrayNumber") - @Valid - private List arrayNumber = null; - - public ArrayOfNumberOnly arrayNumber(List arrayNumber) { - this.arrayNumber = arrayNumber; - return this; - } - - public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { - if (this.arrayNumber == null) { - this.arrayNumber = new ArrayList<>(); - } - this.arrayNumber.add(arrayNumberItem); - return this; - } - - /** - * Get arrayNumber - * @return arrayNumber - */ - @Valid - @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayNumber() { - return arrayNumber; - } - - public void setArrayNumber(List arrayNumber) { - this.arrayNumber = arrayNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o; - return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber); - } - - @Override - public int hashCode() { - return Objects.hash(arrayNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayOfNumberOnly {\n"); - sb.append(" arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java deleted file mode 100644 index 23ee84ce8b5..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.model.ReadOnlyFirst; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayTest - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayTest { - - @JsonProperty("array_of_string") - @Valid - private List arrayOfString = null; - - @JsonProperty("array_array_of_integer") - @Valid - private List> arrayArrayOfInteger = null; - - @JsonProperty("array_array_of_model") - @Valid - private List> arrayArrayOfModel = null; - - public ArrayTest arrayOfString(List arrayOfString) { - this.arrayOfString = arrayOfString; - return this; - } - - public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { - if (this.arrayOfString == null) { - this.arrayOfString = new ArrayList<>(); - } - this.arrayOfString.add(arrayOfStringItem); - return this; - } - - /** - * Get arrayOfString - * @return arrayOfString - */ - - @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayOfString() { - return arrayOfString; - } - - public void setArrayOfString(List arrayOfString) { - this.arrayOfString = arrayOfString; - } - - public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { - this.arrayArrayOfInteger = arrayArrayOfInteger; - return this; - } - - public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { - if (this.arrayArrayOfInteger == null) { - this.arrayArrayOfInteger = new ArrayList<>(); - } - this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); - return this; - } - - /** - * Get arrayArrayOfInteger - * @return arrayArrayOfInteger - */ - @Valid - @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayOfInteger() { - return arrayArrayOfInteger; - } - - public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { - this.arrayArrayOfInteger = arrayArrayOfInteger; - } - - public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { - this.arrayArrayOfModel = arrayArrayOfModel; - return this; - } - - public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayOfModelItem) { - if (this.arrayArrayOfModel == null) { - this.arrayArrayOfModel = new ArrayList<>(); - } - this.arrayArrayOfModel.add(arrayArrayOfModelItem); - return this; - } - - /** - * Get arrayArrayOfModel - * @return arrayArrayOfModel - */ - @Valid - @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayOfModel() { - return arrayArrayOfModel; - } - - public void setArrayArrayOfModel(List> arrayArrayOfModel) { - this.arrayArrayOfModel = arrayArrayOfModel; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayTest arrayTest = (ArrayTest) o; - return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) && - Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) && - Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel); - } - - @Override - public int hashCode() { - return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayTest {\n"); - sb.append(" arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n"); - sb.append(" arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n"); - sb.append(" arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java deleted file mode 100644 index 8c5453c4a5b..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.model.Cat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * BigCat - */ - - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class BigCat extends Cat { - - /** - * Gets or Sets kind - */ - public enum KindEnum { - LIONS("lions"), - - TIGERS("tigers"), - - LEOPARDS("leopards"), - - JAGUARS("jaguars"); - - private String value; - - KindEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static KindEnum fromValue(String value) { - for (KindEnum b : KindEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("kind") - private KindEnum kind; - - /** - * Default constructor - * @deprecated Use {@link BigCat#BigCat(String)} - */ - @Deprecated - public BigCat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public BigCat(String className) { - super(className); - } - - public BigCat kind(KindEnum kind) { - this.kind = kind; - return this; - } - - /** - * Get kind - * @return kind - */ - - @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public KindEnum getKind() { - return kind; - } - - public void setKind(KindEnum kind) { - this.kind = kind; - } - - public BigCat declawed(Boolean declawed) { - super.setDeclawed(declawed); - return this; - } - - public BigCat className(String className) { - super.setClassName(className); - return this; - } - - public BigCat color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - BigCat bigCat = (BigCat) o; - return Objects.equals(this.kind, bigCat.kind) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(kind, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class BigCat {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" kind: ").append(toIndentedString(kind)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java deleted file mode 100644 index 741de9f41a3..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * BigCatAllOf - */ - -@JsonTypeName("BigCat_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class BigCatAllOf { - - /** - * Gets or Sets kind - */ - public enum KindEnum { - LIONS("lions"), - - TIGERS("tigers"), - - LEOPARDS("leopards"), - - JAGUARS("jaguars"); - - private String value; - - KindEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static KindEnum fromValue(String value) { - for (KindEnum b : KindEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("kind") - private KindEnum kind; - - public BigCatAllOf kind(KindEnum kind) { - this.kind = kind; - return this; - } - - /** - * Get kind - * @return kind - */ - - @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public KindEnum getKind() { - return kind; - } - - public void setKind(KindEnum kind) { - this.kind = kind; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - BigCatAllOf bigCatAllOf = (BigCatAllOf) o; - return Objects.equals(this.kind, bigCatAllOf.kind); - } - - @Override - public int hashCode() { - return Objects.hash(kind); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class BigCatAllOf {\n"); - sb.append(" kind: ").append(toIndentedString(kind)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java deleted file mode 100644 index 0c56400050b..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ /dev/null @@ -1,203 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Capitalization - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Capitalization { - - @JsonProperty("smallCamel") - private String smallCamel; - - @JsonProperty("CapitalCamel") - private String capitalCamel; - - @JsonProperty("small_Snake") - private String smallSnake; - - @JsonProperty("Capital_Snake") - private String capitalSnake; - - @JsonProperty("SCA_ETH_Flow_Points") - private String scAETHFlowPoints; - - @JsonProperty("ATT_NAME") - private String ATT_NAME; - - public Capitalization smallCamel(String smallCamel) { - this.smallCamel = smallCamel; - return this; - } - - /** - * Get smallCamel - * @return smallCamel - */ - - @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSmallCamel() { - return smallCamel; - } - - public void setSmallCamel(String smallCamel) { - this.smallCamel = smallCamel; - } - - public Capitalization capitalCamel(String capitalCamel) { - this.capitalCamel = capitalCamel; - return this; - } - - /** - * Get capitalCamel - * @return capitalCamel - */ - - @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getCapitalCamel() { - return capitalCamel; - } - - public void setCapitalCamel(String capitalCamel) { - this.capitalCamel = capitalCamel; - } - - public Capitalization smallSnake(String smallSnake) { - this.smallSnake = smallSnake; - return this; - } - - /** - * Get smallSnake - * @return smallSnake - */ - - @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSmallSnake() { - return smallSnake; - } - - public void setSmallSnake(String smallSnake) { - this.smallSnake = smallSnake; - } - - public Capitalization capitalSnake(String capitalSnake) { - this.capitalSnake = capitalSnake; - return this; - } - - /** - * Get capitalSnake - * @return capitalSnake - */ - - @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getCapitalSnake() { - return capitalSnake; - } - - public void setCapitalSnake(String capitalSnake) { - this.capitalSnake = capitalSnake; - } - - public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { - this.scAETHFlowPoints = scAETHFlowPoints; - return this; - } - - /** - * Get scAETHFlowPoints - * @return scAETHFlowPoints - */ - - @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getScAETHFlowPoints() { - return scAETHFlowPoints; - } - - public void setScAETHFlowPoints(String scAETHFlowPoints) { - this.scAETHFlowPoints = scAETHFlowPoints; - } - - public Capitalization ATT_NAME(String ATT_NAME) { - this.ATT_NAME = ATT_NAME; - return this; - } - - /** - * Name of the pet - * @return ATT_NAME - */ - - @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getATTNAME() { - return ATT_NAME; - } - - public void setATTNAME(String ATT_NAME) { - this.ATT_NAME = ATT_NAME; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Capitalization capitalization = (Capitalization) o; - return Objects.equals(this.smallCamel, capitalization.smallCamel) && - Objects.equals(this.capitalCamel, capitalization.capitalCamel) && - Objects.equals(this.smallSnake, capitalization.smallSnake) && - Objects.equals(this.capitalSnake, capitalization.capitalSnake) && - Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) && - Objects.equals(this.ATT_NAME, capitalization.ATT_NAME); - } - - @Override - public int hashCode() { - return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Capitalization {\n"); - sb.append(" smallCamel: ").append(toIndentedString(smallCamel)).append("\n"); - sb.append(" capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n"); - sb.append(" smallSnake: ").append(toIndentedString(smallSnake)).append("\n"); - sb.append(" capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n"); - sb.append(" scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n"); - sb.append(" ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java deleted file mode 100644 index a2feece8de8..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Cat - */ - -@JsonIgnoreProperties( - value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization - allowSetters = true // allows the className to be set during deserialization -) -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) -@JsonSubTypes({ - @JsonSubTypes.Type(value = BigCat.class, name = "BigCat") -}) - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Cat extends Animal { - - @JsonProperty("declawed") - private Boolean declawed; - - /** - * Default constructor - * @deprecated Use {@link Cat#Cat(String)} - */ - @Deprecated - public Cat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Cat(String className) { - super(className); - } - - public Cat declawed(Boolean declawed) { - this.declawed = declawed; - return this; - } - - /** - * Get declawed - * @return declawed - */ - - @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getDeclawed() { - return declawed; - } - - public void setDeclawed(Boolean declawed) { - this.declawed = declawed; - } - - public Cat className(String className) { - super.setClassName(className); - return this; - } - - public Cat color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Cat cat = (Cat) o; - return Objects.equals(this.declawed, cat.declawed) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(declawed, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Cat {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java deleted file mode 100644 index 50a9c2cdce9..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * CatAllOf - */ - -@JsonTypeName("Cat_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class CatAllOf { - - @JsonProperty("declawed") - private Boolean declawed; - - public CatAllOf declawed(Boolean declawed) { - this.declawed = declawed; - return this; - } - - /** - * Get declawed - * @return declawed - */ - - @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getDeclawed() { - return declawed; - } - - public void setDeclawed(Boolean declawed) { - this.declawed = declawed; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - CatAllOf catAllOf = (CatAllOf) o; - return Objects.equals(this.declawed, catAllOf.declawed); - } - - @Override - public int hashCode() { - return Objects.hash(declawed); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class CatAllOf {\n"); - sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java deleted file mode 100644 index 7ee1fde0646..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java +++ /dev/null @@ -1,123 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Category - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Category { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name = "default-name"; - - /** - * Default constructor - * @deprecated Use {@link Category#Category(String)} - */ - @Deprecated - public Category() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Category(String name) { - this.name = name; - } - - public Category id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Category name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Category category = (Category) o; - return Objects.equals(this.id, category.id) && - Objects.equals(this.name, category.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Category {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java deleted file mode 100644 index a1942e9c404..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model with \"_class\" property - */ - -@Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ClassModel { - - @JsonProperty("_class") - private String propertyClass; - - public ClassModel propertyClass(String propertyClass) { - this.propertyClass = propertyClass; - return this; - } - - /** - * Get propertyClass - * @return propertyClass - */ - - @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPropertyClass() { - return propertyClass; - } - - public void setPropertyClass(String propertyClass) { - this.propertyClass = propertyClass; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ClassModel classModel = (ClassModel) o; - return Objects.equals(this.propertyClass, classModel.propertyClass); - } - - @Override - public int hashCode() { - return Objects.hash(propertyClass); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ClassModel {\n"); - sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java deleted file mode 100644 index c38b26829be..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Client - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Client { - - @JsonProperty("client") - private String client; - - public Client client(String client) { - this.client = client; - return this; - } - - /** - * Get client - * @return client - */ - - @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getClient() { - return client; - } - - public void setClient(String client) { - this.client = client; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Client client = (Client) o; - return Objects.equals(this.client, client.client); - } - - @Override - public int hashCode() { - return Objects.hash(client); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Client {\n"); - sb.append(" client: ").append(toIndentedString(client)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java deleted file mode 100644 index 1bb3d6b5102..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.Animal; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Dog - */ - - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Dog extends Animal { - - @JsonProperty("breed") - private String breed; - - /** - * Default constructor - * @deprecated Use {@link Dog#Dog(String)} - */ - @Deprecated - public Dog() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Dog(String className) { - super(className); - } - - public Dog breed(String breed) { - this.breed = breed; - return this; - } - - /** - * Get breed - * @return breed - */ - - @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBreed() { - return breed; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - public Dog className(String className) { - super.setClassName(className); - return this; - } - - public Dog color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Dog dog = (Dog) o; - return Objects.equals(this.breed, dog.breed) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(breed, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Dog {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java deleted file mode 100644 index 256925a7841..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * DogAllOf - */ - -@JsonTypeName("Dog_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class DogAllOf { - - @JsonProperty("breed") - private String breed; - - public DogAllOf breed(String breed) { - this.breed = breed; - return this; - } - - /** - * Get breed - * @return breed - */ - - @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBreed() { - return breed; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - DogAllOf dogAllOf = (DogAllOf) o; - return Objects.equals(this.breed, dogAllOf.breed); - } - - @Override - public int hashCode() { - return Objects.hash(breed); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class DogAllOf {\n"); - sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java deleted file mode 100644 index 2720e81c227..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ /dev/null @@ -1,189 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * EnumArrays - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class EnumArrays { - - /** - * Gets or Sets justSymbol - */ - public enum JustSymbolEnum { - GREATER_THAN_OR_EQUAL_TO(">="), - - DOLLAR("$"); - - private String value; - - JustSymbolEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static JustSymbolEnum fromValue(String value) { - for (JustSymbolEnum b : JustSymbolEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("just_symbol") - private JustSymbolEnum justSymbol; - - /** - * Gets or Sets arrayEnum - */ - public enum ArrayEnumEnum { - FISH("fish"), - - CRAB("crab"); - - private String value; - - ArrayEnumEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static ArrayEnumEnum fromValue(String value) { - for (ArrayEnumEnum b : ArrayEnumEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("array_enum") - @Valid - private List arrayEnum = null; - - public EnumArrays justSymbol(JustSymbolEnum justSymbol) { - this.justSymbol = justSymbol; - return this; - } - - /** - * Get justSymbol - * @return justSymbol - */ - - @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public JustSymbolEnum getJustSymbol() { - return justSymbol; - } - - public void setJustSymbol(JustSymbolEnum justSymbol) { - this.justSymbol = justSymbol; - } - - public EnumArrays arrayEnum(List arrayEnum) { - this.arrayEnum = arrayEnum; - return this; - } - - public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { - if (this.arrayEnum == null) { - this.arrayEnum = new ArrayList<>(); - } - this.arrayEnum.add(arrayEnumItem); - return this; - } - - /** - * Get arrayEnum - * @return arrayEnum - */ - - @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayEnum() { - return arrayEnum; - } - - public void setArrayEnum(List arrayEnum) { - this.arrayEnum = arrayEnum; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - EnumArrays enumArrays = (EnumArrays) o; - return Objects.equals(this.justSymbol, enumArrays.justSymbol) && - Objects.equals(this.arrayEnum, enumArrays.arrayEnum); - } - - @Override - public int hashCode() { - return Objects.hash(justSymbol, arrayEnum); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class EnumArrays {\n"); - sb.append(" justSymbol: ").append(toIndentedString(justSymbol)).append("\n"); - sb.append(" arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumClass.java deleted file mode 100644 index 4e6027d16c4..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumClass.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Gets or Sets EnumClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public enum EnumClass { - - _ABC("_abc"), - - _EFG("-efg"), - - _XYZ_("(xyz)"); - - private String value; - - EnumClass(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java deleted file mode 100644 index 6f08d4ee9fb..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ /dev/null @@ -1,343 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.model.OuterEnum; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * EnumTest - */ - -@JsonTypeName("Enum_Test") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class EnumTest { - - /** - * Gets or Sets enumString - */ - public enum EnumStringEnum { - UPPER("UPPER"), - - LOWER("lower"), - - EMPTY(""); - - private String value; - - EnumStringEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumStringEnum fromValue(String value) { - for (EnumStringEnum b : EnumStringEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_string") - private EnumStringEnum enumString; - - /** - * Gets or Sets enumStringRequired - */ - public enum EnumStringRequiredEnum { - UPPER("UPPER"), - - LOWER("lower"), - - EMPTY(""); - - private String value; - - EnumStringRequiredEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumStringRequiredEnum fromValue(String value) { - for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_string_required") - private EnumStringRequiredEnum enumStringRequired; - - /** - * Gets or Sets enumInteger - */ - public enum EnumIntegerEnum { - NUMBER_1(1), - - NUMBER_MINUS_1(-1); - - private Integer value; - - EnumIntegerEnum(Integer value) { - this.value = value; - } - - @JsonValue - public Integer getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumIntegerEnum fromValue(Integer value) { - for (EnumIntegerEnum b : EnumIntegerEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_integer") - private EnumIntegerEnum enumInteger; - - /** - * Gets or Sets enumNumber - */ - public enum EnumNumberEnum { - NUMBER_1_DOT_1(1.1), - - NUMBER_MINUS_1_DOT_2(-1.2); - - private Double value; - - EnumNumberEnum(Double value) { - this.value = value; - } - - @JsonValue - public Double getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumNumberEnum fromValue(Double value) { - for (EnumNumberEnum b : EnumNumberEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_number") - private EnumNumberEnum enumNumber; - - @JsonProperty("outerEnum") - private OuterEnum outerEnum; - - /** - * Default constructor - * @deprecated Use {@link EnumTest#EnumTest(EnumStringRequiredEnum)} - */ - @Deprecated - public EnumTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public EnumTest(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - - public EnumTest enumString(EnumStringEnum enumString) { - this.enumString = enumString; - return this; - } - - /** - * Get enumString - * @return enumString - */ - - @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumStringEnum getEnumString() { - return enumString; - } - - public void setEnumString(EnumStringEnum enumString) { - this.enumString = enumString; - } - - public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - return this; - } - - /** - * Get enumStringRequired - * @return enumStringRequired - */ - @NotNull - @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED) - public EnumStringRequiredEnum getEnumStringRequired() { - return enumStringRequired; - } - - public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - - public EnumTest enumInteger(EnumIntegerEnum enumInteger) { - this.enumInteger = enumInteger; - return this; - } - - /** - * Get enumInteger - * @return enumInteger - */ - - @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumIntegerEnum getEnumInteger() { - return enumInteger; - } - - public void setEnumInteger(EnumIntegerEnum enumInteger) { - this.enumInteger = enumInteger; - } - - public EnumTest enumNumber(EnumNumberEnum enumNumber) { - this.enumNumber = enumNumber; - return this; - } - - /** - * Get enumNumber - * @return enumNumber - */ - - @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumNumberEnum getEnumNumber() { - return enumNumber; - } - - public void setEnumNumber(EnumNumberEnum enumNumber) { - this.enumNumber = enumNumber; - } - - public EnumTest outerEnum(OuterEnum outerEnum) { - this.outerEnum = outerEnum; - return this; - } - - /** - * Get outerEnum - * @return outerEnum - */ - @Valid - @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OuterEnum getOuterEnum() { - return outerEnum; - } - - public void setOuterEnum(OuterEnum outerEnum) { - this.outerEnum = outerEnum; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - EnumTest enumTest = (EnumTest) o; - return Objects.equals(this.enumString, enumTest.enumString) && - Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && - Objects.equals(this.enumInteger, enumTest.enumInteger) && - Objects.equals(this.enumNumber, enumTest.enumNumber) && - Objects.equals(this.outerEnum, enumTest.outerEnum); - } - - @Override - public int hashCode() { - return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class EnumTest {\n"); - sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n"); - sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n"); - sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n"); - sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n"); - sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java deleted file mode 100644 index bf750ccdcb7..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Must be named `File` for test. - */ - -@Schema(name = "File", description = "Must be named `File` for test.") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class File { - - @JsonProperty("sourceURI") - private String sourceURI; - - public File sourceURI(String sourceURI) { - this.sourceURI = sourceURI; - return this; - } - - /** - * Test capitalization - * @return sourceURI - */ - - @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSourceURI() { - return sourceURI; - } - - public void setSourceURI(String sourceURI) { - this.sourceURI = sourceURI; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - File file = (File) o; - return Objects.equals(this.sourceURI, file.sourceURI); - } - - @Override - public int hashCode() { - return Objects.hash(sourceURI); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class File {\n"); - sb.append(" sourceURI: ").append(toIndentedString(sourceURI)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java deleted file mode 100644 index 8b196d5d7de..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * FileSchemaTestClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class FileSchemaTestClass { - - @JsonProperty("file") - private File file; - - @JsonProperty("files") - @Valid - private List<@Valid File> files = null; - - public FileSchemaTestClass file(File file) { - this.file = file; - return this; - } - - /** - * Get file - * @return file - */ - @Valid - @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public File getFile() { - return file; - } - - public void setFile(File file) { - this.file = file; - } - - public FileSchemaTestClass files(List<@Valid File> files) { - this.files = files; - return this; - } - - public FileSchemaTestClass addFilesItem(File filesItem) { - if (this.files == null) { - this.files = new ArrayList<>(); - } - this.files.add(filesItem); - return this; - } - - /** - * Get files - * @return files - */ - @Valid - @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List<@Valid File> getFiles() { - return files; - } - - public void setFiles(List<@Valid File> files) { - this.files = files; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o; - return Objects.equals(this.file, fileSchemaTestClass.file) && - Objects.equals(this.files, fileSchemaTestClass.files); - } - - @Override - public int hashCode() { - return Objects.hash(file, files); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class FileSchemaTestClass {\n"); - sb.append(" file: ").append(toIndentedString(file)).append("\n"); - sb.append(" files: ").append(toIndentedString(files)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java deleted file mode 100644 index 06e9dde8e89..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ /dev/null @@ -1,434 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.OffsetDateTime; -import java.util.Arrays; -import java.util.UUID; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * FormatTest - */ - -@JsonTypeName("format_test") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class FormatTest { - - @JsonProperty("integer") - private Integer integer; - - @JsonProperty("int32") - private Integer int32; - - @JsonProperty("int64") - private Long int64; - - @JsonProperty("number") - private BigDecimal number; - - @JsonProperty("float") - private Float _float; - - @JsonProperty("double") - private Double _double; - - @JsonProperty("string") - private String string; - - @JsonProperty("byte") - private byte[] _byte; - - @JsonProperty("binary") - private org.springframework.core.io.Resource binary; - - @JsonProperty("date") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; - - @JsonProperty("dateTime") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; - - @JsonProperty("uuid") - private UUID uuid; - - @JsonProperty("password") - private String password; - - @JsonProperty("BigDecimal") - private BigDecimal bigDecimal; - - /** - * Default constructor - * @deprecated Use {@link FormatTest#FormatTest(BigDecimal, byte[], LocalDate, String)} - */ - @Deprecated - public FormatTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { - this.number = number; - this._byte = _byte; - this.date = date; - this.password = password; - } - - public FormatTest integer(Integer integer) { - this.integer = integer; - return this; - } - - /** - * Get integer - * minimum: 10 - * maximum: 100 - * @return integer - */ - @Min(10) @Max(100) - @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getInteger() { - return integer; - } - - public void setInteger(Integer integer) { - this.integer = integer; - } - - public FormatTest int32(Integer int32) { - this.int32 = int32; - return this; - } - - /** - * Get int32 - * minimum: 20 - * maximum: 200 - * @return int32 - */ - @Min(20) @Max(200) - @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getInt32() { - return int32; - } - - public void setInt32(Integer int32) { - this.int32 = int32; - } - - public FormatTest int64(Long int64) { - this.int64 = int64; - return this; - } - - /** - * Get int64 - * @return int64 - */ - - @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getInt64() { - return int64; - } - - public void setInt64(Long int64) { - this.int64 = int64; - } - - public FormatTest number(BigDecimal number) { - this.number = number; - return this; - } - - /** - * Get number - * minimum: 32.1 - * maximum: 543.2 - * @return number - */ - @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") - @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumber() { - return number; - } - - public void setNumber(BigDecimal number) { - this.number = number; - } - - public FormatTest _float(Float _float) { - this._float = _float; - return this; - } - - /** - * Get _float - * minimum: 54.3 - * maximum: 987.6 - * @return _float - */ - @DecimalMin("54.3") @DecimalMax("987.6") - @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Float getFloat() { - return _float; - } - - public void setFloat(Float _float) { - this._float = _float; - } - - public FormatTest _double(Double _double) { - this._double = _double; - return this; - } - - /** - * Get _double - * minimum: 67.8 - * maximum: 123.4 - * @return _double - */ - @DecimalMin("67.8") @DecimalMax("123.4") - @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Double getDouble() { - return _double; - } - - public void setDouble(Double _double) { - this._double = _double; - } - - public FormatTest string(String string) { - this.string = string; - return this; - } - - /** - * Get string - * @return string - */ - @Pattern(regexp = "/[a-z]/i") - @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getString() { - return string; - } - - public void setString(String string) { - this.string = string; - } - - public FormatTest _byte(byte[] _byte) { - this._byte = _byte; - return this; - } - - /** - * Get _byte - * @return _byte - */ - @NotNull - @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED) - public byte[] getByte() { - return _byte; - } - - public void setByte(byte[] _byte) { - this._byte = _byte; - } - - public FormatTest binary(org.springframework.core.io.Resource binary) { - this.binary = binary; - return this; - } - - /** - * Get binary - * @return binary - */ - @Valid - @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public org.springframework.core.io.Resource getBinary() { - return binary; - } - - public void setBinary(org.springframework.core.io.Resource binary) { - this.binary = binary; - } - - public FormatTest date(LocalDate date) { - this.date = date; - return this; - } - - /** - * Get date - * @return date - */ - @NotNull @Valid - @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) - public LocalDate getDate() { - return date; - } - - public void setDate(LocalDate date) { - this.date = date; - } - - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - return this; - } - - /** - * Get dateTime - * @return dateTime - */ - @Valid - @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - } - - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; - return this; - } - - /** - * Get uuid - * @return uuid - */ - @Valid - @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - - public FormatTest password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - @NotNull @Size(min = 10, max = 64) - @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; - return this; - } - - /** - * Get bigDecimal - * @return bigDecimal - */ - @Valid - @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getBigDecimal() { - return bigDecimal; - } - - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && - Objects.equals(this.int32, formatTest.int32) && - Objects.equals(this.int64, formatTest.int64) && - Objects.equals(this.number, formatTest.number) && - Objects.equals(this._float, formatTest._float) && - Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && - Arrays.equals(this._byte, formatTest._byte) && - Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && - Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); - } - - @Override - public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); - sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); - sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); - sb.append(" number: ").append(toIndentedString(number)).append("\n"); - sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); - sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); - sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); - sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java deleted file mode 100644 index c218d0e02b8..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * HasOnlyReadOnly - */ - -@JsonTypeName("hasOnlyReadOnly") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class HasOnlyReadOnly { - - @JsonProperty("bar") - private String bar; - - @JsonProperty("foo") - private String foo; - - public HasOnlyReadOnly bar(String bar) { - this.bar = bar; - return this; - } - - /** - * Get bar - * @return bar - */ - - @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBar() { - return bar; - } - - public void setBar(String bar) { - this.bar = bar; - } - - public HasOnlyReadOnly foo(String foo) { - this.foo = foo; - return this; - } - - /** - * Get foo - * @return foo - */ - - @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getFoo() { - return foo; - } - - public void setFoo(String foo) { - this.foo = foo; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o; - return Objects.equals(this.bar, hasOnlyReadOnly.bar) && - Objects.equals(this.foo, hasOnlyReadOnly.foo); - } - - @Override - public int hashCode() { - return Objects.hash(bar, foo); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class HasOnlyReadOnly {\n"); - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append(" foo: ").append(toIndentedString(foo)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java deleted file mode 100644 index 9811806e0c8..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ /dev/null @@ -1,229 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * MapTest - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class MapTest { - - @JsonProperty("map_map_of_string") - @Valid - private Map> mapMapOfString = null; - - /** - * Gets or Sets inner - */ - public enum InnerEnum { - UPPER("UPPER"), - - LOWER("lower"); - - private String value; - - InnerEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static InnerEnum fromValue(String value) { - for (InnerEnum b : InnerEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("map_of_enum_string") - @Valid - private Map mapOfEnumString = null; - - @JsonProperty("direct_map") - @Valid - private Map directMap = null; - - @JsonProperty("indirect_map") - @Valid - private Map indirectMap = null; - - public MapTest mapMapOfString(Map> mapMapOfString) { - this.mapMapOfString = mapMapOfString; - return this; - } - - public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { - if (this.mapMapOfString == null) { - this.mapMapOfString = new HashMap<>(); - } - this.mapMapOfString.put(key, mapMapOfStringItem); - return this; - } - - /** - * Get mapMapOfString - * @return mapMapOfString - */ - @Valid - @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapOfString() { - return mapMapOfString; - } - - public void setMapMapOfString(Map> mapMapOfString) { - this.mapMapOfString = mapMapOfString; - } - - public MapTest mapOfEnumString(Map mapOfEnumString) { - this.mapOfEnumString = mapOfEnumString; - return this; - } - - public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { - if (this.mapOfEnumString == null) { - this.mapOfEnumString = new HashMap<>(); - } - this.mapOfEnumString.put(key, mapOfEnumStringItem); - return this; - } - - /** - * Get mapOfEnumString - * @return mapOfEnumString - */ - - @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapOfEnumString() { - return mapOfEnumString; - } - - public void setMapOfEnumString(Map mapOfEnumString) { - this.mapOfEnumString = mapOfEnumString; - } - - public MapTest directMap(Map directMap) { - this.directMap = directMap; - return this; - } - - public MapTest putDirectMapItem(String key, Boolean directMapItem) { - if (this.directMap == null) { - this.directMap = new HashMap<>(); - } - this.directMap.put(key, directMapItem); - return this; - } - - /** - * Get directMap - * @return directMap - */ - - @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getDirectMap() { - return directMap; - } - - public void setDirectMap(Map directMap) { - this.directMap = directMap; - } - - public MapTest indirectMap(Map indirectMap) { - this.indirectMap = indirectMap; - return this; - } - - public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { - if (this.indirectMap == null) { - this.indirectMap = new HashMap<>(); - } - this.indirectMap.put(key, indirectMapItem); - return this; - } - - /** - * Get indirectMap - * @return indirectMap - */ - - @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getIndirectMap() { - return indirectMap; - } - - public void setIndirectMap(Map indirectMap) { - this.indirectMap = indirectMap; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MapTest mapTest = (MapTest) o; - return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) && - Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) && - Objects.equals(this.directMap, mapTest.directMap) && - Objects.equals(this.indirectMap, mapTest.indirectMap); - } - - @Override - public int hashCode() { - return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MapTest {\n"); - sb.append(" mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n"); - sb.append(" mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n"); - sb.append(" directMap: ").append(toIndentedString(directMap)).append("\n"); - sb.append(" indirectMap: ").append(toIndentedString(indirectMap)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java deleted file mode 100644 index bcf0155a1b2..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import org.openapitools.model.Animal; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * MixedPropertiesAndAdditionalPropertiesClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class MixedPropertiesAndAdditionalPropertiesClass { - - @JsonProperty("uuid") - private UUID uuid; - - @JsonProperty("dateTime") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; - - @JsonProperty("map") - @Valid - private Map map = null; - - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; - return this; - } - - /** - * Get uuid - * @return uuid - */ - @Valid - @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - return this; - } - - /** - * Get dateTime - * @return dateTime - */ - @Valid - @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - } - - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; - return this; - } - - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); - } - this.map.put(key, mapItem); - return this; - } - - /** - * Get map - * @return map - */ - @Valid - @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMap() { - return map; - } - - public void setMap(Map map) { - this.map = map; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); - } - - @Override - public int hashCode() { - return Objects.hash(uuid, dateTime, map); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java deleted file mode 100644 index 9ca96d114aa..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model name starting with number - */ - -@Schema(name = "200_response", description = "Model for testing model name starting with number") -@JsonTypeName("200_response") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Model200Response { - - @JsonProperty("name") - private Integer name; - - @JsonProperty("class") - private String propertyClass; - - public Model200Response name(Integer name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getName() { - return name; - } - - public void setName(Integer name) { - this.name = name; - } - - public Model200Response propertyClass(String propertyClass) { - this.propertyClass = propertyClass; - return this; - } - - /** - * Get propertyClass - * @return propertyClass - */ - - @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPropertyClass() { - return propertyClass; - } - - public void setPropertyClass(String propertyClass) { - this.propertyClass = propertyClass; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Model200Response _200response = (Model200Response) o; - return Objects.equals(this.name, _200response.name) && - Objects.equals(this.propertyClass, _200response.propertyClass); - } - - @Override - public int hashCode() { - return Objects.hash(name, propertyClass); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Model200Response {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java deleted file mode 100644 index 06c806057b5..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ /dev/null @@ -1,133 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ModelApiResponse - */ - -@JsonTypeName("ApiResponse") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelApiResponse { - - @JsonProperty("code") - private Integer code; - - @JsonProperty("type") - private String type; - - @JsonProperty("message") - private String message; - - public ModelApiResponse code(Integer code) { - this.code = code; - return this; - } - - /** - * Get code - * @return code - */ - - @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public ModelApiResponse type(String type) { - this.type = type; - return this; - } - - /** - * Get type - * @return type - */ - - @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public ModelApiResponse message(String message) { - this.message = message; - return this; - } - - /** - * Get message - * @return message - */ - - @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelApiResponse _apiResponse = (ModelApiResponse) o; - return Objects.equals(this.code, _apiResponse.code) && - Objects.equals(this.type, _apiResponse.type) && - Objects.equals(this.message, _apiResponse.message); - } - - @Override - public int hashCode() { - return Objects.hash(code, type, message); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelApiResponse {\n"); - sb.append(" code: ").append(toIndentedString(code)).append("\n"); - sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" message: ").append(toIndentedString(message)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelFile.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelFile.java deleted file mode 100644 index de11d272cc3..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelFile.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; - -/** - * Must be named `File` for test. - */ -@Schema(name = "File",description = "Must be named `File` for test.") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelFile { - @JsonProperty("sourceURI") - private String sourceURI; - - public ModelFile sourceURI(String sourceURI) { - this.sourceURI = sourceURI; - return this; - } - - /** - * Test capitalization - * @return sourceURI - */ - @Schema(name = "sourceURI", defaultValue = "Test capitalization") - - - public String getSourceURI() { - return sourceURI; - } - - public void setSourceURI(String sourceURI) { - this.sourceURI = sourceURI; - } - - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelFile _file = (ModelFile) o; - return Objects.equals(this.sourceURI, _file.sourceURI); - } - - @Override - public int hashCode() { - return Objects.hash(sourceURI); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelFile {\n"); - - sb.append(" sourceURI: ").append(toIndentedString(sourceURI)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java deleted file mode 100644 index f168748f6a2..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ModelList - */ - -@JsonTypeName("List") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelList { - - @JsonProperty("123-list") - private String _123list; - - public ModelList _123list(String _123list) { - this._123list = _123list; - return this; - } - - /** - * Get _123list - * @return _123list - */ - - @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String get123list() { - return _123list; - } - - public void set123list(String _123list) { - this._123list = _123list; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelList _list = (ModelList) o; - return Objects.equals(this._123list, _list._123list); - } - - @Override - public int hashCode() { - return Objects.hash(_123list); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelList {\n"); - sb.append(" _123list: ").append(toIndentedString(_123list)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java deleted file mode 100644 index 641c56cd81c..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing reserved words - */ - -@Schema(name = "Return", description = "Model for testing reserved words") -@JsonTypeName("Return") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelReturn { - - @JsonProperty("return") - private Integer _return; - - public ModelReturn _return(Integer _return) { - this._return = _return; - return this; - } - - /** - * Get _return - * @return _return - */ - - @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getReturn() { - return _return; - } - - public void setReturn(Integer _return) { - this._return = _return; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelReturn _return = (ModelReturn) o; - return Objects.equals(this._return, _return._return); - } - - @Override - public int hashCode() { - return Objects.hash(_return); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelReturn {\n"); - sb.append(" _return: ").append(toIndentedString(_return)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java deleted file mode 100644 index d6dcb665651..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java +++ /dev/null @@ -1,172 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model name same as property name - */ - -@Schema(name = "Name", description = "Model for testing model name same as property name") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Name { - - @JsonProperty("name") - private Integer name; - - @JsonProperty("snake_case") - private Integer snakeCase; - - @JsonProperty("property") - private String property; - - @JsonProperty("123Number") - private Integer _123number; - - /** - * Default constructor - * @deprecated Use {@link Name#Name(Integer)} - */ - @Deprecated - public Name() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Name(Integer name) { - this.name = name; - } - - public Name name(Integer name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getName() { - return name; - } - - public void setName(Integer name) { - this.name = name; - } - - public Name snakeCase(Integer snakeCase) { - this.snakeCase = snakeCase; - return this; - } - - /** - * Get snakeCase - * @return snakeCase - */ - - @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getSnakeCase() { - return snakeCase; - } - - public void setSnakeCase(Integer snakeCase) { - this.snakeCase = snakeCase; - } - - public Name property(String property) { - this.property = property; - return this; - } - - /** - * Get property - * @return property - */ - - @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getProperty() { - return property; - } - - public void setProperty(String property) { - this.property = property; - } - - public Name _123number(Integer _123number) { - this._123number = _123number; - return this; - } - - /** - * Get _123number - * @return _123number - */ - - @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer get123number() { - return _123number; - } - - public void set123number(Integer _123number) { - this._123number = _123number; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Name name = (Name) o; - return Objects.equals(this.name, name.name) && - Objects.equals(this.snakeCase, name.snakeCase) && - Objects.equals(this.property, name.property) && - Objects.equals(this._123number, name._123number); - } - - @Override - public int hashCode() { - return Objects.hash(name, snakeCase, property, _123number); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Name {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n"); - sb.append(" property: ").append(toIndentedString(property)).append("\n"); - sb.append(" _123number: ").append(toIndentedString(_123number)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java deleted file mode 100644 index 4a3b6beffa2..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * NumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class NumberOnly { - - @JsonProperty("JustNumber") - private BigDecimal justNumber; - - public NumberOnly justNumber(BigDecimal justNumber) { - this.justNumber = justNumber; - return this; - } - - /** - * Get justNumber - * @return justNumber - */ - @Valid - @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getJustNumber() { - return justNumber; - } - - public void setJustNumber(BigDecimal justNumber) { - this.justNumber = justNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - NumberOnly numberOnly = (NumberOnly) o; - return Objects.equals(this.justNumber, numberOnly.justNumber); - } - - @Override - public int hashCode() { - return Objects.hash(justNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class NumberOnly {\n"); - sb.append(" justNumber: ").append(toIndentedString(justNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java deleted file mode 100644 index 9a5b61bad43..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java +++ /dev/null @@ -1,244 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.OffsetDateTime; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Order - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Order { - - @JsonProperty("id") - private Long id; - - @JsonProperty("petId") - private Long petId; - - @JsonProperty("quantity") - private Integer quantity; - - @JsonProperty("shipDate") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime shipDate; - - /** - * Order Status - */ - public enum StatusEnum { - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - @JsonProperty("complete") - private Boolean complete = false; - - public Order id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Order petId(Long petId) { - this.petId = petId; - return this; - } - - /** - * Get petId - * @return petId - */ - - @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getPetId() { - return petId; - } - - public void setPetId(Long petId) { - this.petId = petId; - } - - public Order quantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - /** - * Get quantity - * @return quantity - */ - - @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getQuantity() { - return quantity; - } - - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - public Order shipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - return this; - } - - /** - * Get shipDate - * @return shipDate - */ - @Valid - @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getShipDate() { - return shipDate; - } - - public void setShipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - } - - public Order status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * Order Status - * @return status - */ - - @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - public Order complete(Boolean complete) { - this.complete = complete; - return this; - } - - /** - * Get complete - * @return complete - */ - - @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getComplete() { - return complete; - } - - public void setComplete(Boolean complete) { - this.complete = complete; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Order order = (Order) o; - return Objects.equals(this.id, order.id) && - Objects.equals(this.petId, order.petId) && - Objects.equals(this.quantity, order.quantity) && - Objects.equals(this.shipDate, order.shipDate) && - Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete); - } - - @Override - public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Order {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); - sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); - sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java deleted file mode 100644 index b66d6d38afb..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * OuterComposite - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class OuterComposite { - - @JsonProperty("my_number") - private BigDecimal myNumber; - - @JsonProperty("my_string") - private String myString; - - @JsonProperty("my_boolean") - private Boolean myBoolean; - - public OuterComposite myNumber(BigDecimal myNumber) { - this.myNumber = myNumber; - return this; - } - - /** - * Get myNumber - * @return myNumber - */ - @Valid - @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getMyNumber() { - return myNumber; - } - - public void setMyNumber(BigDecimal myNumber) { - this.myNumber = myNumber; - } - - public OuterComposite myString(String myString) { - this.myString = myString; - return this; - } - - /** - * Get myString - * @return myString - */ - - @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getMyString() { - return myString; - } - - public void setMyString(String myString) { - this.myString = myString; - } - - public OuterComposite myBoolean(Boolean myBoolean) { - this.myBoolean = myBoolean; - return this; - } - - /** - * Get myBoolean - * @return myBoolean - */ - - @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getMyBoolean() { - return myBoolean; - } - - public void setMyBoolean(Boolean myBoolean) { - this.myBoolean = myBoolean; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - OuterComposite outerComposite = (OuterComposite) o; - return Objects.equals(this.myNumber, outerComposite.myNumber) && - Objects.equals(this.myString, outerComposite.myString) && - Objects.equals(this.myBoolean, outerComposite.myBoolean); - } - - @Override - public int hashCode() { - return Objects.hash(myNumber, myString, myBoolean); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OuterComposite {\n"); - sb.append(" myNumber: ").append(toIndentedString(myNumber)).append("\n"); - sb.append(" myString: ").append(toIndentedString(myString)).append("\n"); - sb.append(" myBoolean: ").append(toIndentedString(myBoolean)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterEnum.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterEnum.java deleted file mode 100644 index 7fdf6f47de3..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterEnum.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Gets or Sets OuterEnum - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public enum OuterEnum { - - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - OuterEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java deleted file mode 100644 index 6adaaba97d7..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ /dev/null @@ -1,281 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import org.openapitools.model.Category; -import org.openapitools.model.Tag; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Pet - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Pet { - - @JsonProperty("id") - private Long id; - - @JsonProperty("category") - private Category category; - - @JsonProperty("name") - private String name; - - @JsonProperty("photoUrls") - @Valid - private Set photoUrls = new LinkedHashSet<>(); - - @JsonProperty("tags") - @Valid - private List<@Valid Tag> tags = null; - - /** - * pet status in the store - */ - public enum StatusEnum { - AVAILABLE("available"), - - PENDING("pending"), - - SOLD("sold"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - /** - * Default constructor - * @deprecated Use {@link Pet#Pet(String, Set)} - */ - @Deprecated - public Pet() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Pet(String name, Set photoUrls) { - this.name = name; - this.photoUrls = photoUrls; - } - - public Pet id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Pet category(Category category) { - this.category = category; - return this; - } - - /** - * Get category - * @return category - */ - @Valid - @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Category getCategory() { - return category; - } - - public void setCategory(Category category) { - this.category = category; - } - - public Pet name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Pet photoUrls(Set photoUrls) { - this.photoUrls = photoUrls; - return this; - } - - public Pet addPhotoUrlsItem(String photoUrlsItem) { - this.photoUrls.add(photoUrlsItem); - return this; - } - - /** - * Get photoUrls - * @return photoUrls - */ - @NotNull - @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) - public Set getPhotoUrls() { - return photoUrls; - } - - @JsonDeserialize(as = LinkedHashSet.class) - public void setPhotoUrls(Set photoUrls) { - this.photoUrls = photoUrls; - } - - public Pet tags(List<@Valid Tag> tags) { - this.tags = tags; - return this; - } - - public Pet addTagsItem(Tag tagsItem) { - if (this.tags == null) { - this.tags = new ArrayList<>(); - } - this.tags.add(tagsItem); - return this; - } - - /** - * Get tags - * @return tags - */ - @Valid - @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List<@Valid Tag> getTags() { - return tags; - } - - public void setTags(List<@Valid Tag> tags) { - this.tags = tags; - } - - public Pet status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * pet status in the store - * @return status - */ - - @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Pet pet = (Pet) o; - return Objects.equals(this.id, pet.id) && - Objects.equals(this.category, pet.category) && - Objects.equals(this.name, pet.name) && - Objects.equals(this.photoUrls, pet.photoUrls) && - Objects.equals(this.tags, pet.tags) && - Objects.equals(this.status, pet.status); - } - - @Override - public int hashCode() { - return Objects.hash(id, category, name, photoUrls, tags, status); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Pet {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" category: ").append(toIndentedString(category)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java deleted file mode 100644 index 8c43e7e8c30..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ReadOnlyFirst - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ReadOnlyFirst { - - @JsonProperty("bar") - private String bar; - - @JsonProperty("baz") - private String baz; - - public ReadOnlyFirst bar(String bar) { - this.bar = bar; - return this; - } - - /** - * Get bar - * @return bar - */ - - @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBar() { - return bar; - } - - public void setBar(String bar) { - this.bar = bar; - } - - public ReadOnlyFirst baz(String baz) { - this.baz = baz; - return this; - } - - /** - * Get baz - * @return baz - */ - - @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBaz() { - return baz; - } - - public void setBaz(String baz) { - this.baz = baz; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o; - return Objects.equals(this.bar, readOnlyFirst.bar) && - Objects.equals(this.baz, readOnlyFirst.baz); - } - - @Override - public int hashCode() { - return Objects.hash(bar, baz); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ReadOnlyFirst {\n"); - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append(" baz: ").append(toIndentedString(baz)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java deleted file mode 100644 index c3d3aa9182e..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * SpecialModelName - */ - -@JsonTypeName("$special[model.name]") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class SpecialModelName { - - @JsonProperty("$special[property.name]") - private Long $specialPropertyName; - - public SpecialModelName $specialPropertyName(Long $specialPropertyName) { - this.$specialPropertyName = $specialPropertyName; - return this; - } - - /** - * Get $specialPropertyName - * @return $specialPropertyName - */ - - @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long get$SpecialPropertyName() { - return $specialPropertyName; - } - - public void set$SpecialPropertyName(Long $specialPropertyName) { - this.$specialPropertyName = $specialPropertyName; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); - } - - @Override - public int hashCode() { - return Objects.hash($specialPropertyName); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class SpecialModelName {\n"); - sb.append(" $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java deleted file mode 100644 index 03d5607e29b..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Tag - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Tag { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Tag id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Tag name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Tag tag = (Tag) o; - return Objects.equals(this.id, tag.id) && - Objects.equals(this.name, tag.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Tag {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java deleted file mode 100644 index 67ef036857d..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ /dev/null @@ -1,208 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * TypeHolderDefault - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class TypeHolderDefault { - - @JsonProperty("string_item") - private String stringItem = "what"; - - @JsonProperty("number_item") - private BigDecimal numberItem; - - @JsonProperty("integer_item") - private Integer integerItem; - - @JsonProperty("bool_item") - private Boolean boolItem = true; - - @JsonProperty("array_item") - @Valid - private List arrayItem = new ArrayList<>(); - - /** - * Default constructor - * @deprecated Use {@link TypeHolderDefault#TypeHolderDefault(String, BigDecimal, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderDefault() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderDefault(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - - public TypeHolderDefault stringItem(String stringItem) { - this.stringItem = stringItem; - return this; - } - - /** - * Get stringItem - * @return stringItem - */ - @NotNull - @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) - public String getStringItem() { - return stringItem; - } - - public void setStringItem(String stringItem) { - this.stringItem = stringItem; - } - - public TypeHolderDefault numberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - return this; - } - - /** - * Get numberItem - * @return numberItem - */ - @NotNull @Valid - @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumberItem() { - return numberItem; - } - - public void setNumberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - } - - public TypeHolderDefault integerItem(Integer integerItem) { - this.integerItem = integerItem; - return this; - } - - /** - * Get integerItem - * @return integerItem - */ - @NotNull - @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getIntegerItem() { - return integerItem; - } - - public void setIntegerItem(Integer integerItem) { - this.integerItem = integerItem; - } - - public TypeHolderDefault boolItem(Boolean boolItem) { - this.boolItem = boolItem; - return this; - } - - /** - * Get boolItem - * @return boolItem - */ - @NotNull - @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) - public Boolean getBoolItem() { - return boolItem; - } - - public void setBoolItem(Boolean boolItem) { - this.boolItem = boolItem; - } - - public TypeHolderDefault arrayItem(List arrayItem) { - this.arrayItem = arrayItem; - return this; - } - - public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { - this.arrayItem.add(arrayItemItem); - return this; - } - - /** - * Get arrayItem - * @return arrayItem - */ - @NotNull - @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) - public List getArrayItem() { - return arrayItem; - } - - public void setArrayItem(List arrayItem) { - this.arrayItem = arrayItem; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o; - return Objects.equals(this.stringItem, typeHolderDefault.stringItem) && - Objects.equals(this.numberItem, typeHolderDefault.numberItem) && - Objects.equals(this.integerItem, typeHolderDefault.integerItem) && - Objects.equals(this.boolItem, typeHolderDefault.boolItem) && - Objects.equals(this.arrayItem, typeHolderDefault.arrayItem); - } - - @Override - public int hashCode() { - return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class TypeHolderDefault {\n"); - sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n"); - sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n"); - sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n"); - sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n"); - sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java deleted file mode 100644 index 5b77bee14c1..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ /dev/null @@ -1,233 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * TypeHolderExample - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class TypeHolderExample { - - @JsonProperty("string_item") - private String stringItem; - - @JsonProperty("number_item") - private BigDecimal numberItem; - - @JsonProperty("float_item") - private Float floatItem; - - @JsonProperty("integer_item") - private Integer integerItem; - - @JsonProperty("bool_item") - private Boolean boolItem; - - @JsonProperty("array_item") - @Valid - private List arrayItem = new ArrayList<>(); - - /** - * Default constructor - * @deprecated Use {@link TypeHolderExample#TypeHolderExample(String, BigDecimal, Float, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderExample() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderExample(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.floatItem = floatItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - - public TypeHolderExample stringItem(String stringItem) { - this.stringItem = stringItem; - return this; - } - - /** - * Get stringItem - * @return stringItem - */ - @NotNull - @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) - public String getStringItem() { - return stringItem; - } - - public void setStringItem(String stringItem) { - this.stringItem = stringItem; - } - - public TypeHolderExample numberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - return this; - } - - /** - * Get numberItem - * @return numberItem - */ - @NotNull @Valid - @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumberItem() { - return numberItem; - } - - public void setNumberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - } - - public TypeHolderExample floatItem(Float floatItem) { - this.floatItem = floatItem; - return this; - } - - /** - * Get floatItem - * @return floatItem - */ - @NotNull - @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) - public Float getFloatItem() { - return floatItem; - } - - public void setFloatItem(Float floatItem) { - this.floatItem = floatItem; - } - - public TypeHolderExample integerItem(Integer integerItem) { - this.integerItem = integerItem; - return this; - } - - /** - * Get integerItem - * @return integerItem - */ - @NotNull - @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getIntegerItem() { - return integerItem; - } - - public void setIntegerItem(Integer integerItem) { - this.integerItem = integerItem; - } - - public TypeHolderExample boolItem(Boolean boolItem) { - this.boolItem = boolItem; - return this; - } - - /** - * Get boolItem - * @return boolItem - */ - @NotNull - @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) - public Boolean getBoolItem() { - return boolItem; - } - - public void setBoolItem(Boolean boolItem) { - this.boolItem = boolItem; - } - - public TypeHolderExample arrayItem(List arrayItem) { - this.arrayItem = arrayItem; - return this; - } - - public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { - this.arrayItem.add(arrayItemItem); - return this; - } - - /** - * Get arrayItem - * @return arrayItem - */ - @NotNull - @Schema(name = "array_item", example = "[0, 1, 2, 3]", requiredMode = Schema.RequiredMode.REQUIRED) - public List getArrayItem() { - return arrayItem; - } - - public void setArrayItem(List arrayItem) { - this.arrayItem = arrayItem; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TypeHolderExample typeHolderExample = (TypeHolderExample) o; - return Objects.equals(this.stringItem, typeHolderExample.stringItem) && - Objects.equals(this.numberItem, typeHolderExample.numberItem) && - Objects.equals(this.floatItem, typeHolderExample.floatItem) && - Objects.equals(this.integerItem, typeHolderExample.integerItem) && - Objects.equals(this.boolItem, typeHolderExample.boolItem) && - Objects.equals(this.arrayItem, typeHolderExample.arrayItem); - } - - @Override - public int hashCode() { - return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class TypeHolderExample {\n"); - sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n"); - sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n"); - sb.append(" floatItem: ").append(toIndentedString(floatItem)).append("\n"); - sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n"); - sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n"); - sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java deleted file mode 100644 index e09df9be7b7..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java +++ /dev/null @@ -1,251 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * User - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class User { - - @JsonProperty("id") - private Long id; - - @JsonProperty("username") - private String username; - - @JsonProperty("firstName") - private String firstName; - - @JsonProperty("lastName") - private String lastName; - - @JsonProperty("email") - private String email; - - @JsonProperty("password") - private String password; - - @JsonProperty("phone") - private String phone; - - @JsonProperty("userStatus") - private Integer userStatus; - - public User id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public User username(String username) { - this.username = username; - return this; - } - - /** - * Get username - * @return username - */ - - @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public User firstName(String firstName) { - this.firstName = firstName; - return this; - } - - /** - * Get firstName - * @return firstName - */ - - @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public User lastName(String lastName) { - this.lastName = lastName; - return this; - } - - /** - * Get lastName - * @return lastName - */ - - @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public User email(String email) { - this.email = email; - return this; - } - - /** - * Get email - * @return email - */ - - @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public User password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - - @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public User phone(String phone) { - this.phone = phone; - return this; - } - - /** - * Get phone - * @return phone - */ - - @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public User userStatus(Integer userStatus) { - this.userStatus = userStatus; - return this; - } - - /** - * User Status - * @return userStatus - */ - - @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getUserStatus() { - return userStatus; - } - - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - User user = (User) o; - return Objects.equals(this.id, user.id) && - Objects.equals(this.username, user.username) && - Objects.equals(this.firstName, user.firstName) && - Objects.equals(this.lastName, user.lastName) && - Objects.equals(this.email, user.email) && - Objects.equals(this.password, user.password) && - Objects.equals(this.phone, user.phone) && - Objects.equals(this.userStatus, user.userStatus); - } - - @Override - public int hashCode() { - return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" username: ").append(toIndentedString(username)).append("\n"); - sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); - sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); - sb.append(" email: ").append(toIndentedString(email)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); - sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java deleted file mode 100644 index 1a4455cdaa8..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ /dev/null @@ -1,839 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * XmlItem - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class XmlItem { - - @JsonProperty("attribute_string") - private String attributeString; - - @JsonProperty("attribute_number") - private BigDecimal attributeNumber; - - @JsonProperty("attribute_integer") - private Integer attributeInteger; - - @JsonProperty("attribute_boolean") - private Boolean attributeBoolean; - - @JsonProperty("wrapped_array") - @Valid - private List wrappedArray = null; - - @JsonProperty("name_string") - private String nameString; - - @JsonProperty("name_number") - private BigDecimal nameNumber; - - @JsonProperty("name_integer") - private Integer nameInteger; - - @JsonProperty("name_boolean") - private Boolean nameBoolean; - - @JsonProperty("name_array") - @Valid - private List nameArray = null; - - @JsonProperty("name_wrapped_array") - @Valid - private List nameWrappedArray = null; - - @JsonProperty("prefix_string") - private String prefixString; - - @JsonProperty("prefix_number") - private BigDecimal prefixNumber; - - @JsonProperty("prefix_integer") - private Integer prefixInteger; - - @JsonProperty("prefix_boolean") - private Boolean prefixBoolean; - - @JsonProperty("prefix_array") - @Valid - private List prefixArray = null; - - @JsonProperty("prefix_wrapped_array") - @Valid - private List prefixWrappedArray = null; - - @JsonProperty("namespace_string") - private String namespaceString; - - @JsonProperty("namespace_number") - private BigDecimal namespaceNumber; - - @JsonProperty("namespace_integer") - private Integer namespaceInteger; - - @JsonProperty("namespace_boolean") - private Boolean namespaceBoolean; - - @JsonProperty("namespace_array") - @Valid - private List namespaceArray = null; - - @JsonProperty("namespace_wrapped_array") - @Valid - private List namespaceWrappedArray = null; - - @JsonProperty("prefix_ns_string") - private String prefixNsString; - - @JsonProperty("prefix_ns_number") - private BigDecimal prefixNsNumber; - - @JsonProperty("prefix_ns_integer") - private Integer prefixNsInteger; - - @JsonProperty("prefix_ns_boolean") - private Boolean prefixNsBoolean; - - @JsonProperty("prefix_ns_array") - @Valid - private List prefixNsArray = null; - - @JsonProperty("prefix_ns_wrapped_array") - @Valid - private List prefixNsWrappedArray = null; - - public XmlItem attributeString(String attributeString) { - this.attributeString = attributeString; - return this; - } - - /** - * Get attributeString - * @return attributeString - */ - - @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getAttributeString() { - return attributeString; - } - - public void setAttributeString(String attributeString) { - this.attributeString = attributeString; - } - - public XmlItem attributeNumber(BigDecimal attributeNumber) { - this.attributeNumber = attributeNumber; - return this; - } - - /** - * Get attributeNumber - * @return attributeNumber - */ - @Valid - @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getAttributeNumber() { - return attributeNumber; - } - - public void setAttributeNumber(BigDecimal attributeNumber) { - this.attributeNumber = attributeNumber; - } - - public XmlItem attributeInteger(Integer attributeInteger) { - this.attributeInteger = attributeInteger; - return this; - } - - /** - * Get attributeInteger - * @return attributeInteger - */ - - @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getAttributeInteger() { - return attributeInteger; - } - - public void setAttributeInteger(Integer attributeInteger) { - this.attributeInteger = attributeInteger; - } - - public XmlItem attributeBoolean(Boolean attributeBoolean) { - this.attributeBoolean = attributeBoolean; - return this; - } - - /** - * Get attributeBoolean - * @return attributeBoolean - */ - - @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getAttributeBoolean() { - return attributeBoolean; - } - - public void setAttributeBoolean(Boolean attributeBoolean) { - this.attributeBoolean = attributeBoolean; - } - - public XmlItem wrappedArray(List wrappedArray) { - this.wrappedArray = wrappedArray; - return this; - } - - public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { - if (this.wrappedArray == null) { - this.wrappedArray = new ArrayList<>(); - } - this.wrappedArray.add(wrappedArrayItem); - return this; - } - - /** - * Get wrappedArray - * @return wrappedArray - */ - - @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getWrappedArray() { - return wrappedArray; - } - - public void setWrappedArray(List wrappedArray) { - this.wrappedArray = wrappedArray; - } - - public XmlItem nameString(String nameString) { - this.nameString = nameString; - return this; - } - - /** - * Get nameString - * @return nameString - */ - - @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getNameString() { - return nameString; - } - - public void setNameString(String nameString) { - this.nameString = nameString; - } - - public XmlItem nameNumber(BigDecimal nameNumber) { - this.nameNumber = nameNumber; - return this; - } - - /** - * Get nameNumber - * @return nameNumber - */ - @Valid - @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getNameNumber() { - return nameNumber; - } - - public void setNameNumber(BigDecimal nameNumber) { - this.nameNumber = nameNumber; - } - - public XmlItem nameInteger(Integer nameInteger) { - this.nameInteger = nameInteger; - return this; - } - - /** - * Get nameInteger - * @return nameInteger - */ - - @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getNameInteger() { - return nameInteger; - } - - public void setNameInteger(Integer nameInteger) { - this.nameInteger = nameInteger; - } - - public XmlItem nameBoolean(Boolean nameBoolean) { - this.nameBoolean = nameBoolean; - return this; - } - - /** - * Get nameBoolean - * @return nameBoolean - */ - - @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getNameBoolean() { - return nameBoolean; - } - - public void setNameBoolean(Boolean nameBoolean) { - this.nameBoolean = nameBoolean; - } - - public XmlItem nameArray(List nameArray) { - this.nameArray = nameArray; - return this; - } - - public XmlItem addNameArrayItem(Integer nameArrayItem) { - if (this.nameArray == null) { - this.nameArray = new ArrayList<>(); - } - this.nameArray.add(nameArrayItem); - return this; - } - - /** - * Get nameArray - * @return nameArray - */ - - @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNameArray() { - return nameArray; - } - - public void setNameArray(List nameArray) { - this.nameArray = nameArray; - } - - public XmlItem nameWrappedArray(List nameWrappedArray) { - this.nameWrappedArray = nameWrappedArray; - return this; - } - - public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { - if (this.nameWrappedArray == null) { - this.nameWrappedArray = new ArrayList<>(); - } - this.nameWrappedArray.add(nameWrappedArrayItem); - return this; - } - - /** - * Get nameWrappedArray - * @return nameWrappedArray - */ - - @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNameWrappedArray() { - return nameWrappedArray; - } - - public void setNameWrappedArray(List nameWrappedArray) { - this.nameWrappedArray = nameWrappedArray; - } - - public XmlItem prefixString(String prefixString) { - this.prefixString = prefixString; - return this; - } - - /** - * Get prefixString - * @return prefixString - */ - - @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPrefixString() { - return prefixString; - } - - public void setPrefixString(String prefixString) { - this.prefixString = prefixString; - } - - public XmlItem prefixNumber(BigDecimal prefixNumber) { - this.prefixNumber = prefixNumber; - return this; - } - - /** - * Get prefixNumber - * @return prefixNumber - */ - @Valid - @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getPrefixNumber() { - return prefixNumber; - } - - public void setPrefixNumber(BigDecimal prefixNumber) { - this.prefixNumber = prefixNumber; - } - - public XmlItem prefixInteger(Integer prefixInteger) { - this.prefixInteger = prefixInteger; - return this; - } - - /** - * Get prefixInteger - * @return prefixInteger - */ - - @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getPrefixInteger() { - return prefixInteger; - } - - public void setPrefixInteger(Integer prefixInteger) { - this.prefixInteger = prefixInteger; - } - - public XmlItem prefixBoolean(Boolean prefixBoolean) { - this.prefixBoolean = prefixBoolean; - return this; - } - - /** - * Get prefixBoolean - * @return prefixBoolean - */ - - @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getPrefixBoolean() { - return prefixBoolean; - } - - public void setPrefixBoolean(Boolean prefixBoolean) { - this.prefixBoolean = prefixBoolean; - } - - public XmlItem prefixArray(List prefixArray) { - this.prefixArray = prefixArray; - return this; - } - - public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { - if (this.prefixArray == null) { - this.prefixArray = new ArrayList<>(); - } - this.prefixArray.add(prefixArrayItem); - return this; - } - - /** - * Get prefixArray - * @return prefixArray - */ - - @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixArray() { - return prefixArray; - } - - public void setPrefixArray(List prefixArray) { - this.prefixArray = prefixArray; - } - - public XmlItem prefixWrappedArray(List prefixWrappedArray) { - this.prefixWrappedArray = prefixWrappedArray; - return this; - } - - public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { - if (this.prefixWrappedArray == null) { - this.prefixWrappedArray = new ArrayList<>(); - } - this.prefixWrappedArray.add(prefixWrappedArrayItem); - return this; - } - - /** - * Get prefixWrappedArray - * @return prefixWrappedArray - */ - - @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixWrappedArray() { - return prefixWrappedArray; - } - - public void setPrefixWrappedArray(List prefixWrappedArray) { - this.prefixWrappedArray = prefixWrappedArray; - } - - public XmlItem namespaceString(String namespaceString) { - this.namespaceString = namespaceString; - return this; - } - - /** - * Get namespaceString - * @return namespaceString - */ - - @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getNamespaceString() { - return namespaceString; - } - - public void setNamespaceString(String namespaceString) { - this.namespaceString = namespaceString; - } - - public XmlItem namespaceNumber(BigDecimal namespaceNumber) { - this.namespaceNumber = namespaceNumber; - return this; - } - - /** - * Get namespaceNumber - * @return namespaceNumber - */ - @Valid - @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getNamespaceNumber() { - return namespaceNumber; - } - - public void setNamespaceNumber(BigDecimal namespaceNumber) { - this.namespaceNumber = namespaceNumber; - } - - public XmlItem namespaceInteger(Integer namespaceInteger) { - this.namespaceInteger = namespaceInteger; - return this; - } - - /** - * Get namespaceInteger - * @return namespaceInteger - */ - - @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getNamespaceInteger() { - return namespaceInteger; - } - - public void setNamespaceInteger(Integer namespaceInteger) { - this.namespaceInteger = namespaceInteger; - } - - public XmlItem namespaceBoolean(Boolean namespaceBoolean) { - this.namespaceBoolean = namespaceBoolean; - return this; - } - - /** - * Get namespaceBoolean - * @return namespaceBoolean - */ - - @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getNamespaceBoolean() { - return namespaceBoolean; - } - - public void setNamespaceBoolean(Boolean namespaceBoolean) { - this.namespaceBoolean = namespaceBoolean; - } - - public XmlItem namespaceArray(List namespaceArray) { - this.namespaceArray = namespaceArray; - return this; - } - - public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { - if (this.namespaceArray == null) { - this.namespaceArray = new ArrayList<>(); - } - this.namespaceArray.add(namespaceArrayItem); - return this; - } - - /** - * Get namespaceArray - * @return namespaceArray - */ - - @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNamespaceArray() { - return namespaceArray; - } - - public void setNamespaceArray(List namespaceArray) { - this.namespaceArray = namespaceArray; - } - - public XmlItem namespaceWrappedArray(List namespaceWrappedArray) { - this.namespaceWrappedArray = namespaceWrappedArray; - return this; - } - - public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { - if (this.namespaceWrappedArray == null) { - this.namespaceWrappedArray = new ArrayList<>(); - } - this.namespaceWrappedArray.add(namespaceWrappedArrayItem); - return this; - } - - /** - * Get namespaceWrappedArray - * @return namespaceWrappedArray - */ - - @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNamespaceWrappedArray() { - return namespaceWrappedArray; - } - - public void setNamespaceWrappedArray(List namespaceWrappedArray) { - this.namespaceWrappedArray = namespaceWrappedArray; - } - - public XmlItem prefixNsString(String prefixNsString) { - this.prefixNsString = prefixNsString; - return this; - } - - /** - * Get prefixNsString - * @return prefixNsString - */ - - @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPrefixNsString() { - return prefixNsString; - } - - public void setPrefixNsString(String prefixNsString) { - this.prefixNsString = prefixNsString; - } - - public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { - this.prefixNsNumber = prefixNsNumber; - return this; - } - - /** - * Get prefixNsNumber - * @return prefixNsNumber - */ - @Valid - @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getPrefixNsNumber() { - return prefixNsNumber; - } - - public void setPrefixNsNumber(BigDecimal prefixNsNumber) { - this.prefixNsNumber = prefixNsNumber; - } - - public XmlItem prefixNsInteger(Integer prefixNsInteger) { - this.prefixNsInteger = prefixNsInteger; - return this; - } - - /** - * Get prefixNsInteger - * @return prefixNsInteger - */ - - @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getPrefixNsInteger() { - return prefixNsInteger; - } - - public void setPrefixNsInteger(Integer prefixNsInteger) { - this.prefixNsInteger = prefixNsInteger; - } - - public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { - this.prefixNsBoolean = prefixNsBoolean; - return this; - } - - /** - * Get prefixNsBoolean - * @return prefixNsBoolean - */ - - @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getPrefixNsBoolean() { - return prefixNsBoolean; - } - - public void setPrefixNsBoolean(Boolean prefixNsBoolean) { - this.prefixNsBoolean = prefixNsBoolean; - } - - public XmlItem prefixNsArray(List prefixNsArray) { - this.prefixNsArray = prefixNsArray; - return this; - } - - public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { - if (this.prefixNsArray == null) { - this.prefixNsArray = new ArrayList<>(); - } - this.prefixNsArray.add(prefixNsArrayItem); - return this; - } - - /** - * Get prefixNsArray - * @return prefixNsArray - */ - - @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixNsArray() { - return prefixNsArray; - } - - public void setPrefixNsArray(List prefixNsArray) { - this.prefixNsArray = prefixNsArray; - } - - public XmlItem prefixNsWrappedArray(List prefixNsWrappedArray) { - this.prefixNsWrappedArray = prefixNsWrappedArray; - return this; - } - - public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { - if (this.prefixNsWrappedArray == null) { - this.prefixNsWrappedArray = new ArrayList<>(); - } - this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); - return this; - } - - /** - * Get prefixNsWrappedArray - * @return prefixNsWrappedArray - */ - - @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixNsWrappedArray() { - return prefixNsWrappedArray; - } - - public void setPrefixNsWrappedArray(List prefixNsWrappedArray) { - this.prefixNsWrappedArray = prefixNsWrappedArray; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - XmlItem xmlItem = (XmlItem) o; - return Objects.equals(this.attributeString, xmlItem.attributeString) && - Objects.equals(this.attributeNumber, xmlItem.attributeNumber) && - Objects.equals(this.attributeInteger, xmlItem.attributeInteger) && - Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) && - Objects.equals(this.wrappedArray, xmlItem.wrappedArray) && - Objects.equals(this.nameString, xmlItem.nameString) && - Objects.equals(this.nameNumber, xmlItem.nameNumber) && - Objects.equals(this.nameInteger, xmlItem.nameInteger) && - Objects.equals(this.nameBoolean, xmlItem.nameBoolean) && - Objects.equals(this.nameArray, xmlItem.nameArray) && - Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) && - Objects.equals(this.prefixString, xmlItem.prefixString) && - Objects.equals(this.prefixNumber, xmlItem.prefixNumber) && - Objects.equals(this.prefixInteger, xmlItem.prefixInteger) && - Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) && - Objects.equals(this.prefixArray, xmlItem.prefixArray) && - Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) && - Objects.equals(this.namespaceString, xmlItem.namespaceString) && - Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) && - Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) && - Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) && - Objects.equals(this.namespaceArray, xmlItem.namespaceArray) && - Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) && - Objects.equals(this.prefixNsString, xmlItem.prefixNsString) && - Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) && - Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) && - Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) && - Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) && - Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray); - } - - @Override - public int hashCode() { - return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class XmlItem {\n"); - sb.append(" attributeString: ").append(toIndentedString(attributeString)).append("\n"); - sb.append(" attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n"); - sb.append(" attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n"); - sb.append(" attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n"); - sb.append(" wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n"); - sb.append(" nameString: ").append(toIndentedString(nameString)).append("\n"); - sb.append(" nameNumber: ").append(toIndentedString(nameNumber)).append("\n"); - sb.append(" nameInteger: ").append(toIndentedString(nameInteger)).append("\n"); - sb.append(" nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n"); - sb.append(" nameArray: ").append(toIndentedString(nameArray)).append("\n"); - sb.append(" nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n"); - sb.append(" prefixString: ").append(toIndentedString(prefixString)).append("\n"); - sb.append(" prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n"); - sb.append(" prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n"); - sb.append(" prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n"); - sb.append(" prefixArray: ").append(toIndentedString(prefixArray)).append("\n"); - sb.append(" prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n"); - sb.append(" namespaceString: ").append(toIndentedString(namespaceString)).append("\n"); - sb.append(" namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n"); - sb.append(" namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n"); - sb.append(" namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n"); - sb.append(" namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n"); - sb.append(" namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n"); - sb.append(" prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n"); - sb.append(" prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n"); - sb.append(" prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n"); - sb.append(" prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n"); - sb.append(" prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n"); - sb.append(" prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/application.properties b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/application.properties deleted file mode 100644 index 9d06609db66..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/application.properties +++ /dev/null @@ -1,3 +0,0 @@ -server.port=80 -spring.jackson.date-format=org.openapitools.RFC3339DateFormat -spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml deleted file mode 100644 index 658d8a96b30..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ /dev/null @@ -1,2285 +0,0 @@ -openapi: 3.0.1 -info: - description: "This spec is mainly for testing Petstore server and contains fake\ - \ endpoints, models. Please do not use this for any other purpose. Special characters:\ - \ \" \\" - license: - name: Apache-2.0 - url: https://www.apache.org/licenses/LICENSE-2.0.html - title: OpenAPI Petstore - version: 1.0.0 -servers: -- url: http://petstore.swagger.io:80/v2 -tags: -- description: Everything about your Pets - name: pet -- description: Access to Petstore orders - name: store -- description: Operations about user - name: user -paths: - /pet: - post: - operationId: addPet - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true - responses: - "200": - content: {} - description: successful operation - "405": - content: {} - description: Invalid input - security: - - petstore_auth: - - write:pets - - read:pets - summary: Add a new pet to the store - tags: - - pet - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: pet - put: - operationId: updatePet - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true - responses: - "200": - content: {} - description: successful operation - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Pet not found - "405": - content: {} - description: Validation exception - security: - - petstore_auth: - - write:pets - - read:pets - summary: Update an existing pet - tags: - - pet - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: pet - /pet/findByStatus: - get: - description: Multiple status values can be provided with comma separated strings - operationId: findPetsByStatus - parameters: - - description: Status values that need to be considered for filter - explode: false - in: query - name: status - required: true - schema: - items: - default: available - enum: - - available - - pending - - sold - type: string - type: array - style: form - responses: - "200": - content: - application/xml: - schema: - items: - $ref: '#/components/schemas/Pet' - type: array - application/json: - schema: - items: - $ref: '#/components/schemas/Pet' - type: array - description: successful operation - "400": - content: {} - description: Invalid status value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Finds Pets by status - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - /pet/findByTags: - get: - deprecated: true - description: "Multiple tags can be provided with comma separated strings. Use\ - \ tag1, tag2, tag3 for testing." - operationId: findPetsByTags - parameters: - - description: Tags to filter by - explode: false - in: query - name: tags - required: true - schema: - items: - type: string - type: array - uniqueItems: true - style: form - responses: - "200": - content: - application/xml: - schema: - items: - $ref: '#/components/schemas/Pet' - type: array - uniqueItems: true - application/json: - schema: - items: - $ref: '#/components/schemas/Pet' - type: array - uniqueItems: true - description: successful operation - "400": - content: {} - description: Invalid tag value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Finds Pets by tags - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - /pet/{petId}: - delete: - operationId: deletePet - parameters: - - in: header - name: api_key - schema: - type: string - - description: Pet id to delete - in: path - name: petId - required: true - schema: - format: int64 - type: integer - responses: - "200": - content: {} - description: successful operation - "400": - content: {} - description: Invalid pet value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Deletes a pet - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - get: - description: Returns a single pet - operationId: getPetById - parameters: - - description: ID of pet to return - in: path - name: petId - required: true - schema: - format: int64 - type: integer - responses: - "200": - content: - application/xml: - schema: - $ref: '#/components/schemas/Pet' - application/json: - schema: - $ref: '#/components/schemas/Pet' - description: successful operation - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Pet not found - security: - - api_key: [] - summary: Find pet by ID - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - post: - operationId: updatePetWithForm - parameters: - - description: ID of pet that needs to be updated - in: path - name: petId - required: true - schema: - format: int64 - type: integer - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: '#/components/schemas/updatePetWithForm_request' - responses: - "405": - content: {} - description: Invalid input - security: - - petstore_auth: - - write:pets - - read:pets - summary: Updates a pet in the store with form data - tags: - - pet - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: pet - /pet/{petId}/uploadImage: - post: - operationId: uploadFile - parameters: - - description: ID of pet to update - in: path - name: petId - required: true - schema: - format: int64 - type: integer - requestBody: - content: - multipart/form-data: - schema: - $ref: '#/components/schemas/uploadFile_request' - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/ApiResponse' - description: successful operation - security: - - petstore_auth: - - write:pets - - read:pets - summary: uploads an image - tags: - - pet - x-content-type: multipart/form-data - x-accepts: application/json - x-tags: - - tag: pet - /store/inventory: - get: - description: Returns a map of status codes to quantities - operationId: getInventory - responses: - "200": - content: - application/json: - schema: - additionalProperties: - format: int32 - type: integer - type: object - description: successful operation - security: - - api_key: [] - summary: Returns pet inventories by status - tags: - - store - x-accepts: application/json - x-tags: - - tag: store - /store/order: - post: - operationId: placeOrder - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/Order' - description: order placed for purchasing the pet - required: true - responses: - "200": - content: - application/xml: - schema: - $ref: '#/components/schemas/Order' - application/json: - schema: - $ref: '#/components/schemas/Order' - description: successful operation - "400": - content: {} - description: Invalid Order - summary: Place an order for a pet - tags: - - store - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: store - /store/order/{order_id}: - delete: - description: For valid response try integer IDs with value < 1000. Anything - above 1000 or nonintegers will generate API errors - operationId: deleteOrder - parameters: - - description: ID of the order that needs to be deleted - in: path - name: order_id - required: true - schema: - type: string - responses: - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Order not found - summary: Delete purchase order by ID - tags: - - store - x-accepts: application/json - x-tags: - - tag: store - get: - description: For valid response try integer IDs with value <= 5 or > 10. Other - values will generate exceptions - operationId: getOrderById - parameters: - - description: ID of pet that needs to be fetched - in: path - name: order_id - required: true - schema: - format: int64 - maximum: 5 - minimum: 1 - type: integer - responses: - "200": - content: - application/xml: - schema: - $ref: '#/components/schemas/Order' - application/json: - schema: - $ref: '#/components/schemas/Order' - description: successful operation - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Order not found - summary: Find purchase order by ID - tags: - - store - x-accepts: application/json - x-tags: - - tag: store - /user: - post: - description: This can only be done by the logged in user. - operationId: createUser - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/User' - description: Created user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Create user - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user - /user/createWithArray: - post: - operationId: createUsersWithArrayInput - requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Creates list of users with given input array - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user - /user/createWithList: - post: - operationId: createUsersWithListInput - requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Creates list of users with given input array - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user - /user/login: - get: - operationId: loginUser - parameters: - - description: The user name for login - in: query - name: username - required: true - schema: - type: string - - description: The password for login in clear text - in: query - name: password - required: true - schema: - type: string - responses: - "200": - content: - application/xml: - schema: - type: string - application/json: - schema: - type: string - description: successful operation - headers: - X-Rate-Limit: - description: calls per hour allowed by the user - schema: - format: int32 - type: integer - X-Expires-After: - description: date in UTC when token expires - schema: - format: date-time - type: string - "400": - content: {} - description: Invalid username/password supplied - summary: Logs user into the system - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - /user/logout: - get: - operationId: logoutUser - responses: - default: - content: {} - description: successful operation - summary: Logs out current logged in user session - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - /user/{username}: - delete: - description: This can only be done by the logged in user. - operationId: deleteUser - parameters: - - description: The name that needs to be deleted - in: path - name: username - required: true - schema: - type: string - responses: - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - summary: Delete user - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - get: - operationId: getUserByName - parameters: - - description: The name that needs to be fetched. Use user1 for testing. - in: path - name: username - required: true - schema: - type: string - responses: - "200": - content: - application/xml: - schema: - $ref: '#/components/schemas/User' - application/json: - schema: - $ref: '#/components/schemas/User' - description: successful operation - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - summary: Get user by user name - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - put: - description: This can only be done by the logged in user. - operationId: updateUser - parameters: - - description: name that need to be deleted - in: path - name: username - required: true - schema: - type: string - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/User' - description: Updated user object - required: true - responses: - "400": - content: {} - description: Invalid user supplied - "404": - content: {} - description: User not found - summary: Updated user - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user - /fake_classname_test: - patch: - description: To test class name in snake case - operationId: testClassname - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: successful operation - security: - - api_key_query: [] - summary: To test class name in snake case - tags: - - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake_classname_tags 123#$%^ - /fake: - delete: - description: Fake endpoint to test group parameters (optional) - operationId: testGroupParameters - parameters: - - description: Required String in group parameters - in: query - name: required_string_group - required: true - schema: - type: integer - - description: Required Boolean in group parameters - in: header - name: required_boolean_group - required: true - schema: - type: boolean - - description: Required Integer in group parameters - in: query - name: required_int64_group - required: true - schema: - format: int64 - type: integer - - description: String in group parameters - in: query - name: string_group - schema: - type: integer - - description: Boolean in group parameters - in: header - name: boolean_group - schema: - type: boolean - - description: Integer in group parameters - in: query - name: int64_group - schema: - format: int64 - type: integer - responses: - "400": - content: {} - description: Something wrong - summary: Fake endpoint to test group parameters (optional) - tags: - - fake - x-group-parameters: true - x-accepts: application/json - x-tags: - - tag: fake - get: - description: To test enum parameters - operationId: testEnumParameters - parameters: - - description: Header parameter enum test (string array) - explode: false - in: header - name: enum_header_string_array - schema: - items: - default: $ - enum: - - '>' - - $ - type: string - type: array - style: simple - - description: Header parameter enum test (string) - in: header - name: enum_header_string - schema: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string - - description: Query parameter enum test (string array) - explode: false - in: query - name: enum_query_string_array - schema: - items: - default: $ - enum: - - '>' - - $ - type: string - type: array - style: form - - description: Query parameter enum test (string) - in: query - name: enum_query_string - schema: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string - - description: Query parameter enum test (double) - in: query - name: enum_query_integer - schema: - enum: - - 1 - - -2 - format: int32 - type: integer - - description: Query parameter enum test (double) - in: query - name: enum_query_double - schema: - enum: - - 1.1 - - -1.2 - format: double - type: number - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: '#/components/schemas/testEnumParameters_request' - responses: - "400": - content: {} - description: Invalid request - "404": - content: {} - description: Not found - summary: To test enum parameters - tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake - patch: - description: To test "client" model - operationId: testClientModel - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: successful operation - summary: To test "client" model - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake - post: - description: |- - Fake endpoint for testing various parameters - 假端點 - 偽のエンドポイント - 가짜 엔드 포인트 - operationId: testEndpointParameters - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: '#/components/schemas/testEndpointParameters_request' - required: true - responses: - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - security: - - http_basic_test: [] - summary: |- - Fake endpoint for testing various parameters - 假端點 - 偽のエンドポイント - 가짜 엔드 포인트 - tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake - /fake/outer/number: - post: - description: Test serialization of outer number types - operationId: fakeOuterNumberSerialize - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterNumber' - description: Input number as post body - required: false - responses: - "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterNumber' - description: Output number - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake - /fake/outer/string: - post: - description: Test serialization of outer string types - operationId: fakeOuterStringSerialize - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterString' - description: Input string as post body - required: false - responses: - "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterString' - description: Output string - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake - /fake/outer/boolean: - post: - description: Test serialization of outer boolean types - operationId: fakeOuterBooleanSerialize - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterBoolean' - description: Input boolean as post body - required: false - responses: - "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterBoolean' - description: Output boolean - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake - /fake/outer/composite: - post: - description: Test serialization of object with outer number type - operationId: fakeOuterCompositeSerialize - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterComposite' - description: Input composite as post body - required: false - responses: - "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterComposite' - description: Output composite - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake - /fake/jsonFormData: - get: - operationId: testJsonFormData - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: '#/components/schemas/testJsonFormData_request' - required: true - responses: - "200": - content: {} - description: successful operation - summary: test json serialization of form data - tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake - /fake/inline-additionalProperties: - post: - operationId: testInlineAdditionalProperties - requestBody: - content: - application/json: - schema: - additionalProperties: - type: string - type: object - description: request body - required: true - responses: - "200": - content: {} - description: successful operation - summary: test inline additionalProperties - tags: - - fake - x-codegen-request-body-name: param - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake - /fake/body-with-query-params: - put: - operationId: testBodyWithQueryParams - parameters: - - in: query - name: query - required: true - schema: - type: string - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/User' - required: true - responses: - "200": - content: {} - description: Success - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake - /fake/create_xml_item: - post: - description: this route creates an XmlItem - operationId: createXmlItem - requestBody: - content: - application/xml: - schema: - $ref: '#/components/schemas/XmlItem' - application/xml; charset=utf-8: - schema: - $ref: '#/components/schemas/XmlItem' - application/xml; charset=utf-16: - schema: - $ref: '#/components/schemas/XmlItem' - text/xml: - schema: - $ref: '#/components/schemas/XmlItem' - text/xml; charset=utf-8: - schema: - $ref: '#/components/schemas/XmlItem' - text/xml; charset=utf-16: - schema: - $ref: '#/components/schemas/XmlItem' - description: XmlItem Body - required: true - responses: - "200": - content: {} - description: successful operation - summary: creates an XmlItem - tags: - - fake - x-codegen-request-body-name: XmlItem - x-content-type: application/xml - x-accepts: application/json - x-tags: - - tag: fake - /another-fake/dummy: - patch: - description: To test special tags and operation ID starting with number - operationId: 123_test_@#$%_special_tags - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: successful operation - summary: To test special tags - tags: - - $another-fake? - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: $another-fake? - /fake/body-with-file-schema: - put: - description: "For this test, the body for this request much reference a schema\ - \ named `File`." - operationId: testBodyWithFileSchema - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/FileSchemaTestClass' - required: true - responses: - "200": - content: {} - description: Success - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake - /fake/test-query-parameters: - put: - description: To test the collection format in query parameters - operationId: testQueryParameterCollectionFormat - parameters: - - explode: false - in: query - name: pipe - required: true - schema: - items: - type: string - type: array - style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query - name: http - required: true - schema: - items: - type: string - type: array - style: spaceDelimited - - explode: false - in: query - name: url - required: true - schema: - items: - type: string - type: array - style: form - - explode: true - in: query - name: context - required: true - schema: - items: - type: string - type: array - style: form - responses: - "200": - content: {} - description: Success - tags: - - fake - x-accepts: application/json - x-tags: - - tag: fake - /fake/{petId}/uploadImageWithRequiredFile: - post: - operationId: uploadFileWithRequiredFile - parameters: - - description: ID of pet to update - in: path - name: petId - required: true - schema: - format: int64 - type: integer - requestBody: - content: - multipart/form-data: - schema: - $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/ApiResponse' - description: successful operation - security: - - petstore_auth: - - write:pets - - read:pets - summary: uploads an image (required) - tags: - - pet - x-content-type: multipart/form-data - x-accepts: application/json - x-tags: - - tag: pet -components: - schemas: - Order: - example: - petId: 6 - quantity: 1 - id: 0 - shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false - status: placed - properties: - id: - format: int64 - type: integer - petId: - format: int64 - type: integer - quantity: - format: int32 - type: integer - shipDate: - format: date-time - type: string - status: - description: Order Status - enum: - - placed - - approved - - delivered - type: string - complete: - default: false - type: boolean - type: object - xml: - name: Order - Category: - example: - name: default-name - id: 6 - properties: - id: - format: int64 - type: integer - name: - default: default-name - type: string - required: - - name - type: object - xml: - name: Category - User: - example: - firstName: firstName - lastName: lastName - password: password - userStatus: 6 - phone: phone - id: 0 - email: email - username: username - properties: - id: - format: int64 - type: integer - x-is-unique: true - username: - type: string - firstName: - type: string - lastName: - type: string - email: - type: string - password: - type: string - phone: - type: string - userStatus: - description: User Status - format: int32 - type: integer - type: object - xml: - name: User - Tag: - example: - name: name - id: 1 - properties: - id: - format: int64 - type: integer - name: - type: string - type: object - xml: - name: Tag - Pet: - example: - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 - category: - name: default-name - id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - properties: - id: - format: int64 - type: integer - x-is-unique: true - category: - $ref: '#/components/schemas/Category' - name: - example: doggie - type: string - photoUrls: - items: - type: string - type: array - uniqueItems: true - xml: - name: photoUrl - wrapped: true - tags: - items: - $ref: '#/components/schemas/Tag' - type: array - xml: - name: tag - wrapped: true - status: - description: pet status in the store - enum: - - available - - pending - - sold - type: string - required: - - name - - photoUrls - type: object - xml: - name: Pet - ApiResponse: - example: - code: 0 - type: type - message: message - properties: - code: - format: int32 - type: integer - type: - type: string - message: - type: string - type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" - Return: - description: Model for testing reserved words - properties: - return: - format: int32 - type: integer - type: object - xml: - name: Return - Name: - description: Model for testing model name same as property name - properties: - name: - format: int32 - type: integer - snake_case: - format: int32 - readOnly: true - type: integer - property: - type: string - "123Number": - readOnly: true - type: integer - required: - - name - type: object - xml: - name: Name - "200_response": - description: Model for testing model name starting with number - properties: - name: - format: int32 - type: integer - class: - type: string - type: object - xml: - name: Name - ClassModel: - description: Model for testing model with "_class" property - properties: - _class: - type: string - type: object - Dog: - allOf: - - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' - Cat: - allOf: - - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Cat_allOf' - BigCat: - allOf: - - $ref: '#/components/schemas/Cat' - - $ref: '#/components/schemas/BigCat_allOf' - Animal: - discriminator: - propertyName: className - properties: - className: - type: string - color: - default: red - type: string - required: - - className - type: object - AnimalFarm: - items: - $ref: '#/components/schemas/Animal' - type: array - format_test: - properties: - integer: - maximum: 100 - minimum: 10 - type: integer - int32: - format: int32 - maximum: 200 - minimum: 20 - type: integer - int64: - format: int64 - type: integer - number: - maximum: 543.2 - minimum: 32.1 - type: number - float: - format: float - maximum: 987.6 - minimum: 54.3 - type: number - double: - format: double - maximum: 123.4 - minimum: 67.8 - type: number - string: - pattern: "/[a-z]/i" - type: string - byte: - format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" - type: string - binary: - format: binary - type: string - date: - format: date - type: string - dateTime: - format: date-time - type: string - uuid: - example: 72f98069-206d-4f12-9f12-3d1e525a8e84 - format: uuid - type: string - password: - format: password - maxLength: 64 - minLength: 10 - type: string - BigDecimal: - format: number - type: string - required: - - byte - - date - - number - - password - type: object - EnumClass: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string - Enum_Test: - properties: - enum_string: - enum: - - UPPER - - lower - - "" - type: string - enum_string_required: - enum: - - UPPER - - lower - - "" - type: string - enum_integer: - enum: - - 1 - - -1 - format: int32 - type: integer - enum_number: - enum: - - 1.1 - - -1.2 - format: double - type: number - outerEnum: - $ref: '#/components/schemas/OuterEnum' - required: - - enum_string_required - type: object - AdditionalPropertiesClass: - properties: - map_string: - additionalProperties: - type: string - type: object - map_number: - additionalProperties: - type: number - type: object - map_integer: - additionalProperties: - type: integer - type: object - map_boolean: - additionalProperties: - type: boolean - type: object - map_array_integer: - additionalProperties: - items: - type: integer - type: array - type: object - map_array_anytype: - additionalProperties: - items: - properties: {} - type: object - type: array - type: object - map_map_string: - additionalProperties: - additionalProperties: - type: string - type: object - type: object - map_map_anytype: - additionalProperties: - additionalProperties: - properties: {} - type: object - type: object - type: object - anytype_1: - properties: {} - type: object - anytype_2: - type: object - anytype_3: - properties: {} - type: object - type: object - AdditionalPropertiesString: - additionalProperties: - type: string - properties: - name: - type: string - type: object - AdditionalPropertiesInteger: - additionalProperties: - type: integer - properties: - name: - type: string - type: object - AdditionalPropertiesNumber: - additionalProperties: - type: number - properties: - name: - type: string - type: object - AdditionalPropertiesBoolean: - additionalProperties: - type: boolean - properties: - name: - type: string - type: object - AdditionalPropertiesArray: - additionalProperties: - items: - properties: {} - type: object - type: array - properties: - name: - type: string - type: object - AdditionalPropertiesObject: - additionalProperties: - additionalProperties: - properties: {} - type: object - type: object - properties: - name: - type: string - type: object - AdditionalPropertiesAnyType: - additionalProperties: - properties: {} - type: object - properties: - name: - type: string - type: object - MixedPropertiesAndAdditionalPropertiesClass: - properties: - uuid: - format: uuid - type: string - dateTime: - format: date-time - type: string - map: - additionalProperties: - $ref: '#/components/schemas/Animal' - type: object - type: object - List: - properties: - "123-list": - type: string - type: object - Client: - example: - client: client - properties: - client: - type: string - type: object - ReadOnlyFirst: - properties: - bar: - readOnly: true - type: string - baz: - type: string - type: object - hasOnlyReadOnly: - properties: - bar: - readOnly: true - type: string - foo: - readOnly: true - type: string - type: object - Capitalization: - properties: - smallCamel: - type: string - CapitalCamel: - type: string - small_Snake: - type: string - Capital_Snake: - type: string - SCA_ETH_Flow_Points: - type: string - ATT_NAME: - description: | - Name of the pet - type: string - type: object - MapTest: - properties: - map_map_of_string: - additionalProperties: - additionalProperties: - type: string - type: object - type: object - map_of_enum_string: - additionalProperties: - enum: - - UPPER - - lower - type: string - type: object - direct_map: - additionalProperties: - type: boolean - type: object - indirect_map: - additionalProperties: - type: boolean - type: object - type: object - ArrayTest: - properties: - array_of_string: - items: - type: string - type: array - array_array_of_integer: - items: - items: - format: int64 - type: integer - type: array - type: array - array_array_of_model: - items: - items: - $ref: '#/components/schemas/ReadOnlyFirst' - type: array - type: array - type: object - NumberOnly: - properties: - JustNumber: - type: number - type: object - ArrayOfNumberOnly: - properties: - ArrayNumber: - items: - type: number - type: array - type: object - ArrayOfArrayOfNumberOnly: - properties: - ArrayArrayNumber: - items: - items: - type: number - type: array - type: array - type: object - EnumArrays: - properties: - just_symbol: - enum: - - '>=' - - $ - type: string - array_enum: - items: - enum: - - fish - - crab - type: string - type: array - type: object - OuterEnum: - enum: - - placed - - approved - - delivered - type: string - OuterComposite: - example: - my_string: my_string - my_number: 0.8008281904610115 - my_boolean: true - properties: - my_number: - type: number - my_string: - type: string - my_boolean: - type: boolean - x-codegen-body-parameter-name: boolean_post_body - type: object - OuterNumber: - type: number - OuterString: - type: string - OuterBoolean: - type: boolean - x-codegen-body-parameter-name: boolean_post_body - StringBooleanMap: - additionalProperties: - type: boolean - type: object - FileSchemaTestClass: - example: - file: - sourceURI: sourceURI - files: - - sourceURI: sourceURI - - sourceURI: sourceURI - properties: - file: - $ref: '#/components/schemas/File' - files: - items: - $ref: '#/components/schemas/File' - type: array - type: object - File: - description: Must be named `File` for test. - example: - sourceURI: sourceURI - properties: - sourceURI: - description: Test capitalization - type: string - type: object - TypeHolderDefault: - properties: - string_item: - default: what - type: string - number_item: - type: number - integer_item: - type: integer - bool_item: - default: true - type: boolean - array_item: - items: - type: integer - type: array - required: - - array_item - - bool_item - - integer_item - - number_item - - string_item - type: object - TypeHolderExample: - properties: - string_item: - example: what - type: string - number_item: - example: 1.234 - type: number - float_item: - example: 1.234 - format: float - type: number - integer_item: - example: -2 - type: integer - bool_item: - example: true - type: boolean - array_item: - example: - - 0 - - 1 - - 2 - - 3 - items: - type: integer - type: array - required: - - array_item - - bool_item - - float_item - - integer_item - - number_item - - string_item - type: object - XmlItem: - properties: - attribute_string: - example: string - type: string - xml: - attribute: true - attribute_number: - example: 1.234 - type: number - xml: - attribute: true - attribute_integer: - example: -2 - type: integer - xml: - attribute: true - attribute_boolean: - example: true - type: boolean - xml: - attribute: true - wrapped_array: - items: - type: integer - type: array - xml: - wrapped: true - name_string: - example: string - type: string - xml: - name: xml_name_string - name_number: - example: 1.234 - type: number - xml: - name: xml_name_number - name_integer: - example: -2 - type: integer - xml: - name: xml_name_integer - name_boolean: - example: true - type: boolean - xml: - name: xml_name_boolean - name_array: - items: - type: integer - xml: - name: xml_name_array_item - type: array - name_wrapped_array: - items: - type: integer - xml: - name: xml_name_wrapped_array_item - type: array - xml: - name: xml_name_wrapped_array - wrapped: true - prefix_string: - example: string - type: string - xml: - prefix: ab - prefix_number: - example: 1.234 - type: number - xml: - prefix: cd - prefix_integer: - example: -2 - type: integer - xml: - prefix: ef - prefix_boolean: - example: true - type: boolean - xml: - prefix: gh - prefix_array: - items: - type: integer - xml: - prefix: ij - type: array - prefix_wrapped_array: - items: - type: integer - xml: - prefix: mn - type: array - xml: - prefix: kl - wrapped: true - namespace_string: - example: string - type: string - xml: - namespace: http://a.com/schema - namespace_number: - example: 1.234 - type: number - xml: - namespace: http://b.com/schema - namespace_integer: - example: -2 - type: integer - xml: - namespace: http://c.com/schema - namespace_boolean: - example: true - type: boolean - xml: - namespace: http://d.com/schema - namespace_array: - items: - type: integer - xml: - namespace: http://e.com/schema - type: array - namespace_wrapped_array: - items: - type: integer - xml: - namespace: http://g.com/schema - type: array - xml: - namespace: http://f.com/schema - wrapped: true - prefix_ns_string: - example: string - type: string - xml: - namespace: http://a.com/schema - prefix: a - prefix_ns_number: - example: 1.234 - type: number - xml: - namespace: http://b.com/schema - prefix: b - prefix_ns_integer: - example: -2 - type: integer - xml: - namespace: http://c.com/schema - prefix: c - prefix_ns_boolean: - example: true - type: boolean - xml: - namespace: http://d.com/schema - prefix: d - prefix_ns_array: - items: - type: integer - xml: - namespace: http://e.com/schema - prefix: e - type: array - prefix_ns_wrapped_array: - items: - type: integer - xml: - namespace: http://g.com/schema - prefix: g - type: array - xml: - namespace: http://f.com/schema - prefix: f - wrapped: true - type: object - xml: - namespace: http://a.com/schema - prefix: pre - updatePetWithForm_request: - properties: - name: - description: Updated name of the pet - type: string - status: - description: Updated status of the pet - type: string - type: object - uploadFile_request: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - file: - description: file to upload - format: binary - type: string - type: object - testEnumParameters_request: - properties: - enum_form_string_array: - description: Form parameter enum test (string array) - items: - default: $ - enum: - - '>' - - $ - type: string - type: array - enum_form_string: - default: -efg - description: Form parameter enum test (string) - enum: - - _abc - - -efg - - (xyz) - type: string - type: object - testEndpointParameters_request: - properties: - integer: - description: None - format: int32 - maximum: 100 - minimum: 10 - type: integer - int32: - description: None - format: int32 - maximum: 200 - minimum: 20 - type: integer - int64: - description: None - format: int64 - type: integer - number: - description: None - maximum: 543.2 - minimum: 32.1 - type: number - float: - description: None - format: float - maximum: 987.6 - type: number - double: - description: None - format: double - maximum: 123.4 - minimum: 67.8 - type: number - string: - description: None - pattern: "/[a-z]/i" - type: string - pattern_without_delimiter: - description: None - pattern: "^[A-Z].*" - type: string - byte: - description: None - format: byte - type: string - binary: - description: None - format: binary - type: string - date: - description: None - format: date - type: string - dateTime: - description: None - format: date-time - type: string - password: - description: None - format: password - maxLength: 64 - minLength: 10 - type: string - callback: - description: None - type: string - required: - - byte - - double - - number - - pattern_without_delimiter - type: object - testJsonFormData_request: - properties: - param: - description: field1 - type: string - param2: - description: field2 - type: string - required: - - param - - param2 - type: object - uploadFileWithRequiredFile_request: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - requiredFile: - description: file to upload - format: binary - type: string - required: - - requiredFile - type: object - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - BigCat_allOf: - properties: - kind: - enum: - - lions - - tigers - - leopards - - jaguars - type: string - type: object - example: null - securitySchemes: - petstore_auth: - flows: - implicit: - authorizationUrl: http://petstore.swagger.io/api/oauth/dialog - scopes: - write:pets: modify pets in your account - read:pets: read your pets - type: oauth2 - api_key: - in: header - name: api_key - type: apiKey - api_key_query: - in: query - name: api_key_query - type: apiKey - http_basic_test: - scheme: basic - type: http -x-original-swagger-version: "2.0" diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java b/samples/openapi3/server/petstore/springboot-reactive/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java deleted file mode 100644 index 3681f67e770..00000000000 --- a/samples/openapi3/server/petstore/springboot-reactive/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openapitools; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class OpenApiGeneratorApplicationTests { - - @Test - void contextLoads() { - } - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java index 4f55bcef672..081e4813a03 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java @@ -40,7 +40,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -159,6 +159,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator-ignore b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator-ignore deleted file mode 100644 index 7484ee590a3..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES deleted file mode 100644 index 5d716a83385..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ /dev/null @@ -1,71 +0,0 @@ -README.md -pom.xml -src/main/java/org/openapitools/OpenApiGeneratorApplication.java -src/main/java/org/openapitools/RFC3339DateFormat.java -src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java -src/main/java/org/openapitools/api/ApiUtil.java -src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java -src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java -src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java -src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java -src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java -src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java -src/main/java/org/openapitools/configuration/HomeController.java -src/main/java/org/openapitools/configuration/SpringDocConfiguration.java -src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java -src/main/java/org/openapitools/model/AdditionalPropertiesArray.java -src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java -src/main/java/org/openapitools/model/AdditionalPropertiesClass.java -src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java -src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java -src/main/java/org/openapitools/model/AdditionalPropertiesObject.java -src/main/java/org/openapitools/model/AdditionalPropertiesString.java -src/main/java/org/openapitools/model/Animal.java -src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java -src/main/java/org/openapitools/model/ArrayOfNumberOnly.java -src/main/java/org/openapitools/model/ArrayTest.java -src/main/java/org/openapitools/model/BigCat.java -src/main/java/org/openapitools/model/BigCatAllOf.java -src/main/java/org/openapitools/model/Capitalization.java -src/main/java/org/openapitools/model/Cat.java -src/main/java/org/openapitools/model/CatAllOf.java -src/main/java/org/openapitools/model/Category.java -src/main/java/org/openapitools/model/ClassModel.java -src/main/java/org/openapitools/model/Client.java -src/main/java/org/openapitools/model/Dog.java -src/main/java/org/openapitools/model/DogAllOf.java -src/main/java/org/openapitools/model/EnumArrays.java -src/main/java/org/openapitools/model/EnumClass.java -src/main/java/org/openapitools/model/EnumTest.java -src/main/java/org/openapitools/model/File.java -src/main/java/org/openapitools/model/FileSchemaTestClass.java -src/main/java/org/openapitools/model/FormatTest.java -src/main/java/org/openapitools/model/HasOnlyReadOnly.java -src/main/java/org/openapitools/model/MapTest.java -src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java -src/main/java/org/openapitools/model/Model200Response.java -src/main/java/org/openapitools/model/ModelApiResponse.java -src/main/java/org/openapitools/model/ModelList.java -src/main/java/org/openapitools/model/ModelReturn.java -src/main/java/org/openapitools/model/Name.java -src/main/java/org/openapitools/model/NumberOnly.java -src/main/java/org/openapitools/model/Order.java -src/main/java/org/openapitools/model/OuterComposite.java -src/main/java/org/openapitools/model/OuterEnum.java -src/main/java/org/openapitools/model/Pet.java -src/main/java/org/openapitools/model/ReadOnlyFirst.java -src/main/java/org/openapitools/model/SpecialModelName.java -src/main/java/org/openapitools/model/Tag.java -src/main/java/org/openapitools/model/TypeHolderDefault.java -src/main/java/org/openapitools/model/TypeHolderExample.java -src/main/java/org/openapitools/model/User.java -src/main/java/org/openapitools/model/XmlItem.java -src/main/resources/application.properties -src/main/resources/openapi.yaml -src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION deleted file mode 100644 index 7f4d792ec2c..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-useoptional/README.md b/samples/openapi3/server/petstore/springboot-useoptional/README.md deleted file mode 100644 index e6de7e038ce..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# OpenAPI generated server - -Spring Boot Server - -## Overview -This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. -By using the [OpenAPI-Spec](https://openapis.org), you can easily generate a server stub. -This is an example of building a OpenAPI-enabled server in Java using the SpringBoot framework. - - -The underlying library integrating OpenAPI to Spring Boot is [springdoc](https://springdoc.org). -Springdoc will generate an OpenAPI v3 specification based on the generated Controller and Model classes. -The specification is available to download using the following url: -http://localhost:80/v3/api-docs/ - -Start your server as a simple java application - -You can view the api documentation in swagger-ui by pointing to -http://localhost:80/swagger-ui.html - -Change default port value in application.properties \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-useoptional/pom.xml b/samples/openapi3/server/petstore/springboot-useoptional/pom.xml deleted file mode 100644 index 93fdc77cc30..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - 4.0.0 - org.openapitools.openapi3 - spring-boot-useoptional - jar - spring-boot-useoptional - 1.0.0 - - 1.8 - ${java.version} - ${java.version} - UTF-8 - 1.6.14 - 4.15.5 - - - org.springframework.boot - spring-boot-starter-parent - 2.7.6 - - - - src/main/java - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.data - spring-data-commons - - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - - org.springframework.boot - spring-boot-starter-validation - - - com.fasterxml.jackson.core - jackson-databind - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/OpenApiGeneratorApplication.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/OpenApiGeneratorApplication.java deleted file mode 100644 index 97252a8a940..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/OpenApiGeneratorApplication.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.openapitools; - -import com.fasterxml.jackson.databind.Module; -import org.openapitools.jackson.nullable.JsonNullableModule; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.FilterType; -import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator; - -@SpringBootApplication( - nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class -) -@ComponentScan( - basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"}, - nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class -) -public class OpenApiGeneratorApplication { - - public static void main(String[] args) { - SpringApplication.run(OpenApiGeneratorApplication.class, args); - } - - @Bean(name = "org.openapitools.OpenApiGeneratorApplication.jsonNullableModule") - public Module jsonNullableModule() { - return new JsonNullableModule(); - } - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/RFC3339DateFormat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/RFC3339DateFormat.java deleted file mode 100644 index bcd3936d8b3..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/RFC3339DateFormat.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.openapitools; - -import com.fasterxml.jackson.databind.util.StdDateFormat; - -import java.text.DateFormat; -import java.text.FieldPosition; -import java.text.ParsePosition; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; - -public class RFC3339DateFormat extends DateFormat { - private static final long serialVersionUID = 1L; - private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); - - private final StdDateFormat fmt = new StdDateFormat() - .withTimeZone(TIMEZONE_Z) - .withColonInTimeZone(true); - - public RFC3339DateFormat() { - this.calendar = new GregorianCalendar(); - } - - @Override - public Date parse(String source, ParsePosition pos) { - return fmt.parse(source, pos); - } - - @Override - public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { - return fmt.format(date, toAppendTo, fieldPosition); - } - - @Override - public Object clone() { - return this; - } -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java deleted file mode 100644 index 608a1aeac6e..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.Client; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "$another-fake?", description = "the $another-fake? API") -public interface AnotherFakeApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * PATCH /another-fake/dummy : To test special tags - * To test special tags and operation ID starting with number - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "call123testSpecialTags", - summary = "To test special tags", - description = "To test special tags and operation ID starting with number", - tags = { "$another-fake?" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/another-fake/dummy", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default ResponseEntity call123testSpecialTags( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java deleted file mode 100644 index c2db7ca5a81..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class AnotherFakeApiController implements AnotherFakeApi { - - private final NativeWebRequest request; - - @Autowired - public AnotherFakeApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/ApiUtil.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/ApiUtil.java deleted file mode 100644 index 1245b1dd0cc..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/ApiUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.openapitools.api; - -import org.springframework.web.context.request.NativeWebRequest; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -public class ApiUtil { - public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { - try { - HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class); - res.setCharacterEncoding("UTF-8"); - res.addHeader("Content-Type", contentType); - res.getWriter().print(example); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java deleted file mode 100644 index 3ae4970c5f6..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ /dev/null @@ -1,588 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "fake", description = "the fake API") -public interface FakeApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /fake/create_xml_item : creates an XmlItem - * this route creates an XmlItem - * - * @param xmlItem XmlItem Body (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createXmlItem", - summary = "creates an XmlItem", - description = "this route creates an XmlItem", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/create_xml_item", - consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } - ) - default ResponseEntity createXmlItem( - @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/outer/boolean - * Test serialization of outer boolean types - * - * @param body Input boolean as post body (optional) - * @return Output boolean (status code 200) - */ - @Operation( - operationId = "fakeOuterBooleanSerialize", - description = "Test serialization of outer boolean types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output boolean", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = Boolean.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/boolean", - produces = { "*/*" } - ) - default ResponseEntity fakeOuterBooleanSerialize( - @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/outer/composite - * Test serialization of object with outer number type - * - * @param body Input composite as post body (optional) - * @return Output composite (status code 200) - */ - @Operation( - operationId = "fakeOuterCompositeSerialize", - description = "Test serialization of object with outer number type", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output composite", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = OuterComposite.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/composite", - produces = { "*/*" } - ) - default ResponseEntity fakeOuterCompositeSerialize( - @Parameter(name = "body", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; - ApiUtil.setExampleResponse(request, "*/*", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/outer/number - * Test serialization of outer number types - * - * @param body Input number as post body (optional) - * @return Output number (status code 200) - */ - @Operation( - operationId = "fakeOuterNumberSerialize", - description = "Test serialization of outer number types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output number", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = BigDecimal.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/number", - produces = { "*/*" } - ) - default ResponseEntity fakeOuterNumberSerialize( - @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/outer/string - * Test serialization of outer string types - * - * @param body Input string as post body (optional) - * @return Output string (status code 200) - */ - @Operation( - operationId = "fakeOuterStringSerialize", - description = "Test serialization of outer string types", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Output string", content = { - @Content(mediaType = "*/*", schema = @Schema(implementation = String.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/outer/string", - produces = { "*/*" } - ) - default ResponseEntity fakeOuterStringSerialize( - @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) String body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /fake/body-with-file-schema - * For this test, the body for this request much reference a schema named `File`. - * - * @param body (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testBodyWithFileSchema", - description = "For this test, the body for this request much reference a schema named `File`.", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/body-with-file-schema", - consumes = { "application/json" } - ) - default ResponseEntity testBodyWithFileSchema( - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody FileSchemaTestClass body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /fake/body-with-query-params - * - * @param query (required) - * @param body (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testBodyWithQueryParams", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/body-with-query-params", - consumes = { "application/json" } - ) - default ResponseEntity testBodyWithQueryParams( - @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody User body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PATCH /fake : To test \"client\" model - * To test \"client\" model - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testClientModel", - summary = "To test \"client\" model", - description = "To test \"client\" model", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/fake", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default ResponseEntity testClientModel( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake : Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * - * @param number None (required) - * @param _double None (required) - * @param patternWithoutDelimiter None (required) - * @param _byte None (required) - * @param integer None (optional) - * @param int32 None (optional) - * @param int64 None (optional) - * @param _float None (optional) - * @param string None (optional) - * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) - * @param password None (optional) - * @param paramCallback None (optional) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "testEndpointParameters", - summary = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트", - description = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - }, - security = { - @SecurityRequirement(name = "http_basic_test") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake", - consumes = { "application/x-www-form-urlencoded" } - ) - default ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, - @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, - @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string, - @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password, - @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /fake : To test enum parameters - * To test enum parameters - * - * @param enumHeaderStringArray Header parameter enum test (string array) (optional) - * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) - * @param enumQueryStringArray Query parameter enum test (string array) (optional) - * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) - * @param enumQueryInteger Query parameter enum test (double) (optional) - * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) - * @param enumFormString Form parameter enum test (string) (optional, default to -efg) - * @return Invalid request (status code 400) - * or Not found (status code 404) - */ - @Operation( - operationId = "testEnumParameters", - summary = "To test enum parameters", - description = "To test enum parameters", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid request"), - @ApiResponse(responseCode = "404", description = "Not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/fake", - consumes = { "application/x-www-form-urlencoded" } - ) - default ResponseEntity testEnumParameters( - @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) Optional> enumHeaderStringArray, - @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") Optional enumHeaderString, - @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) Optional> enumQueryStringArray, - @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") Optional enumQueryString, - @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) Optional enumQueryInteger, - @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) Optional enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * DELETE /fake : Fake endpoint to test group parameters (optional) - * Fake endpoint to test group parameters (optional) - * - * @param requiredStringGroup Required String in group parameters (required) - * @param requiredBooleanGroup Required Boolean in group parameters (required) - * @param requiredInt64Group Required Integer in group parameters (required) - * @param stringGroup String in group parameters (optional) - * @param booleanGroup Boolean in group parameters (optional) - * @param int64Group Integer in group parameters (optional) - * @return Something wrong (status code 400) - */ - @Operation( - operationId = "testGroupParameters", - summary = "Fake endpoint to test group parameters (optional)", - description = "Fake endpoint to test group parameters (optional)", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "400", description = "Something wrong") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/fake" - ) - default ResponseEntity testGroupParameters( - @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) Optional stringGroup, - @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) Optional booleanGroup, - @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) Optional int64Group - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/inline-additionalProperties : test inline additionalProperties - * - * @param param request body (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testInlineAdditionalProperties", - summary = "test inline additionalProperties", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/inline-additionalProperties", - consumes = { "application/json" } - ) - default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /fake/jsonFormData : test json serialization of form data - * - * @param param field1 (required) - * @param param2 field2 (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testJsonFormData", - summary = "test json serialization of form data", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/fake/jsonFormData", - consumes = { "application/x-www-form-urlencoded" } - ) - default ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, - @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /fake/test-query-parameters - * To test the collection format in query parameters - * - * @param pipe (required) - * @param ioutil (required) - * @param http (required) - * @param url (required) - * @param context (required) - * @return Success (status code 200) - */ - @Operation( - operationId = "testQueryParameterCollectionFormat", - description = "To test the collection format in query parameters", - tags = { "fake" }, - responses = { - @ApiResponse(responseCode = "200", description = "Success") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/fake/test-query-parameters" - ) - default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) - * - * @param petId ID of pet to update (required) - * @param requiredFile file to upload (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "uploadFileWithRequiredFile", - summary = "uploads an image (required)", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = ModelApiResponse.class)) - }) - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/fake/{petId}/uploadImageWithRequiredFile", - produces = { "application/json" }, - consumes = { "multipart/form-data" } - ) - default ResponseEntity uploadFileWithRequiredFile( - @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java deleted file mode 100644 index 5ae5d5fed98..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.openapitools.api; - -import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class FakeApiController implements FakeApi { - - private final NativeWebRequest request; - - @Autowired - public FakeApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java deleted file mode 100644 index 29936566e75..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.Client; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "fake_classname_tags 123#$%^", description = "the fake_classname_tags 123#$%^ API") -public interface FakeClassnameTestApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * PATCH /fake_classname_test : To test class name in snake case - * To test class name in snake case - * - * @param body client model (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "testClassname", - summary = "To test class name in snake case", - description = "To test class name in snake case", - tags = { "fake_classname_tags 123#$%^" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Client.class)) - }) - }, - security = { - @SecurityRequirement(name = "api_key_query") - } - ) - @RequestMapping( - method = RequestMethod.PATCH, - value = "/fake_classname_test", - produces = { "application/json" }, - consumes = { "application/json" } - ) - default ResponseEntity testClassname( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"client\" : \"client\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java deleted file mode 100644 index 65b695629d4..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class FakeClassnameTestApiController implements FakeClassnameTestApi { - - private final NativeWebRequest request; - - @Autowired - public FakeClassnameTestApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java deleted file mode 100644 index fb0435a4a64..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ /dev/null @@ -1,383 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import java.util.Set; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "pet", description = "Everything about your Pets") -public interface PetApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /pet : Add a new pet to the store - * - * @param body Pet object that needs to be added to the store (required) - * @return successful operation (status code 200) - * or Invalid input (status code 405) - */ - @Operation( - operationId = "addPet", - summary = "Add a new pet to the store", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "405", description = "Invalid input") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet", - consumes = { "application/json", "application/xml" } - ) - default ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * DELETE /pet/{petId} : Deletes a pet - * - * @param petId Pet id to delete (required) - * @param apiKey (optional) - * @return successful operation (status code 200) - * or Invalid pet value (status code 400) - */ - @Operation( - operationId = "deletePet", - summary = "Deletes a pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "400", description = "Invalid pet value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/pet/{petId}" - ) - default ResponseEntity deletePet( - @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) Optional apiKey - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/findByStatus : Finds Pets by status - * Multiple status values can be provided with comma separated strings - * - * @param status Status values that need to be considered for filter (required) - * @return successful operation (status code 200) - * or Invalid status value (status code 400) - */ - @Operation( - operationId = "findPetsByStatus", - summary = "Finds Pets by status", - description = "Multiple status values can be provided with comma separated strings", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", array = @ArraySchema(schema = @Schema(implementation = Pet.class))), - @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = Pet.class))) - }), - @ApiResponse(responseCode = "400", description = "Invalid status value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByStatus", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity> findPetsByStatus( - @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/findByTags : Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @param tags Tags to filter by (required) - * @return successful operation (status code 200) - * or Invalid tag value (status code 400) - * @deprecated - */ - @Deprecated - @Operation( - operationId = "findPetsByTags", - summary = "Finds Pets by tags", - description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", array = @ArraySchema(schema = @Schema(implementation = Pet.class))), - @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = Pet.class))) - }), - @ApiResponse(responseCode = "400", description = "Invalid tag value") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByTags", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity> findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/{petId} : Find pet by ID - * Returns a single pet - * - * @param petId ID of pet to return (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - */ - @Operation( - operationId = "getPetById", - summary = "Find pet by ID", - description = "Returns a single pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Pet not found") - }, - security = { - @SecurityRequirement(name = "api_key") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/{petId}", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity getPetById( - @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /pet : Update an existing pet - * - * @param body Pet object that needs to be added to the store (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * or Validation exception (status code 405) - */ - @Operation( - operationId = "updatePet", - summary = "Update an existing pet", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation"), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Pet not found"), - @ApiResponse(responseCode = "405", description = "Validation exception") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/pet", - consumes = { "application/json", "application/xml" } - ) - default ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /pet/{petId} : Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated (required) - * @param name Updated name of the pet (optional) - * @param status Updated status of the pet (optional) - * @return Invalid input (status code 405) - */ - @Operation( - operationId = "updatePetWithForm", - summary = "Updates a pet in the store with form data", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "405", description = "Invalid input") - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}", - consumes = { "application/x-www-form-urlencoded" } - ) - default ResponseEntity updatePetWithForm( - @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, - @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /pet/{petId}/uploadImage : uploads an image - * - * @param petId ID of pet to update (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @param file file to upload (optional) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "uploadFile", - summary = "uploads an image", - tags = { "pet" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = ModelApiResponse.class)) - }) - }, - security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}/uploadImage", - produces = { "application/json" }, - consumes = { "multipart/form-data" } - ) - default ResponseEntity uploadFile( - @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, - @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java deleted file mode 100644 index ea6c56e02c1..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApiController.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import java.util.Set; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class PetApiController implements PetApi { - - private final NativeWebRequest request; - - @Autowired - public PetApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java deleted file mode 100644 index 65a87a295ec..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ /dev/null @@ -1,203 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "store", description = "Access to Petstore orders") -public interface StoreApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * DELETE /store/order/{order_id} : Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * - * @param orderId ID of the order that needs to be deleted (required) - * @return Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @Operation( - operationId = "deleteOrder", - summary = "Delete purchase order by ID", - description = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Order not found") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/store/order/{order_id}" - ) - default ResponseEntity deleteOrder( - @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /store/inventory : Returns pet inventories by status - * Returns a map of status codes to quantities - * - * @return successful operation (status code 200) - */ - @Operation( - operationId = "getInventory", - summary = "Returns pet inventories by status", - description = "Returns a map of status codes to quantities", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/json", schema = @Schema(implementation = Map.class)) - }) - }, - security = { - @SecurityRequirement(name = "api_key") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/inventory", - produces = { "application/json" } - ) - default ResponseEntity> getInventory( - - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /store/order/{order_id} : Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - * - * @param orderId ID of pet that needs to be fetched (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @Operation( - operationId = "getOrderById", - summary = "Find purchase order by ID", - description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Order.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Order.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - @ApiResponse(responseCode = "404", description = "Order not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/order/{order_id}", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity getOrderById( - @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /store/order : Place an order for a pet - * - * @param body order placed for purchasing the pet (required) - * @return successful operation (status code 200) - * or Invalid Order (status code 400) - */ - @Operation( - operationId = "placeOrder", - summary = "Place an order for a pet", - tags = { "store" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = Order.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = Order.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid Order") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/store/order", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java deleted file mode 100644 index 1292dc0b721..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApiController.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class StoreApiController implements StoreApi { - - private final NativeWebRequest request; - - @Autowired - public StoreApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java deleted file mode 100644 index 13c3f8176e6..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ /dev/null @@ -1,294 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Tag(name = "user", description = "Operations about user") -public interface UserApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /user : Create user - * This can only be done by the logged in user. - * - * @param body Created user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUser", - summary = "Create user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user" - ) - default ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /user/createWithArray : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUsersWithArrayInput", - summary = "Creates list of users with given input array", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithArray" - ) - default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /user/createWithList : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @Operation( - operationId = "createUsersWithListInput", - summary = "Creates list of users with given input array", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithList" - ) - default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * DELETE /user/{username} : Delete user - * This can only be done by the logged in user. - * - * @param username The name that needs to be deleted (required) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "deleteUser", - summary = "Delete user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/user/{username}" - ) - default ResponseEntity deleteUser( - @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/{username} : Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. (required) - * @return successful operation (status code 200) - * or Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "getUserByName", - summary = "Get user by user name", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = User.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = User.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid username supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/{username}", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity getUserByName( - @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 aeiou aeiou aeiou aeiou aeiou aeiou 123 "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/login : Logs user into the system - * - * @param username The user name for login (required) - * @param password The password for login in clear text (required) - * @return successful operation (status code 200) - * or Invalid username/password supplied (status code 400) - */ - @Operation( - operationId = "loginUser", - summary = "Logs user into the system", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "200", description = "successful operation", content = { - @Content(mediaType = "application/xml", schema = @Schema(implementation = String.class)), - @Content(mediaType = "application/json", schema = @Schema(implementation = String.class)) - }), - @ApiResponse(responseCode = "400", description = "Invalid username/password supplied") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/login", - produces = { "application/xml", "application/json" } - ) - default ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/logout : Logs out current logged in user session - * - * @return successful operation (status code 200) - */ - @Operation( - operationId = "logoutUser", - summary = "Logs out current logged in user session", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "default", description = "successful operation") - } - ) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/logout" - ) - default ResponseEntity logoutUser( - - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /user/{username} : Updated user - * This can only be done by the logged in user. - * - * @param username name that need to be deleted (required) - * @param body Updated user object (required) - * @return Invalid user supplied (status code 400) - * or User not found (status code 404) - */ - @Operation( - operationId = "updateUser", - summary = "Updated user", - description = "This can only be done by the logged in user.", - tags = { "user" }, - responses = { - @ApiResponse(responseCode = "400", description = "Invalid user supplied"), - @ApiResponse(responseCode = "404", description = "User not found") - } - ) - @RequestMapping( - method = RequestMethod.PUT, - value = "/user/{username}" - ) - default ResponseEntity updateUser( - @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java deleted file mode 100644 index ca00184d2a5..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApiController.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.context.request.NativeWebRequest; - -import javax.validation.constraints.*; -import javax.validation.Valid; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Controller -@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") -public class UserApiController implements UserApi { - - private final NativeWebRequest request; - - @Autowired - public UserApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java deleted file mode 100644 index b257cf0a16c..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.openapitools.configuration; - -import org.openapitools.model.EnumClass; -import org.openapitools.model.OuterEnum; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.convert.converter.Converter; - -@Configuration -public class EnumConverterConfiguration { - - @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") - Converter enumClassConverter() { - return new Converter() { - @Override - public EnumClass convert(String source) { - return EnumClass.fromValue(source); - } - }; - } - @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.outerEnumConverter") - Converter outerEnumConverter() { - return new Converter() { - @Override - public OuterEnum convert(String source) { - return OuterEnum.fromValue(source); - } - }; - } - -} diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/HomeController.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/HomeController.java deleted file mode 100644 index 9aa29284ab5..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/HomeController.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.openapitools.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * Home redirection to OpenAPI api documentation - */ -@Controller -public class HomeController { - - @RequestMapping("/") - public String index() { - return "redirect:swagger-ui.html"; - } - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java deleted file mode 100644 index a32f1f67787..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.openapitools.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.License; -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.security.SecurityScheme; - -@Configuration -public class SpringDocConfiguration { - - @Bean(name = "org.openapitools.configuration.SpringDocConfiguration.apiInfo") - OpenAPI apiInfo() { - return new OpenAPI() - .info( - new Info() - .title("OpenAPI Petstore") - .description("This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\") - .license( - new License() - .name("Apache-2.0") - .url("https://www.apache.org/licenses/LICENSE-2.0.html") - ) - .version("1.0.0") - ) - .components( - new Components() - .addSecuritySchemes("petstore_auth", new SecurityScheme() - .type(SecurityScheme.Type.OAUTH2) - ) - .addSecuritySchemes("api_key", new SecurityScheme() - .type(SecurityScheme.Type.APIKEY) - .in(SecurityScheme.In.HEADER) - .name("api_key") - ) - .addSecuritySchemes("api_key_query", new SecurityScheme() - .type(SecurityScheme.Type.APIKEY) - .in(SecurityScheme.In.QUERY) - .name("api_key_query") - ) - .addSecuritySchemes("http_basic_test", new SecurityScheme() - .type(SecurityScheme.Type.HTTP) - .scheme("basic") - ) - ) - ; - } -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java deleted file mode 100644 index 0661c1a9a8d..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesAnyType - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesAnyType extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesAnyType name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; - return Objects.equals(this.name, additionalPropertiesAnyType.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesAnyType {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java deleted file mode 100644 index a3f9c905789..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesArray - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesArray extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesArray name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; - return Objects.equals(this.name, additionalPropertiesArray.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesArray {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java deleted file mode 100644 index db5f8d3ce35..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesBoolean - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesBoolean extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesBoolean name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; - return Objects.equals(this.name, additionalPropertiesBoolean.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesBoolean {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java deleted file mode 100644 index 14e13504a8c..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ /dev/null @@ -1,399 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesClass { - - @JsonProperty("map_string") - @Valid - private Map mapString = null; - - @JsonProperty("map_number") - @Valid - private Map mapNumber = null; - - @JsonProperty("map_integer") - @Valid - private Map mapInteger = null; - - @JsonProperty("map_boolean") - @Valid - private Map mapBoolean = null; - - @JsonProperty("map_array_integer") - @Valid - private Map> mapArrayInteger = null; - - @JsonProperty("map_array_anytype") - @Valid - private Map> mapArrayAnytype = null; - - @JsonProperty("map_map_string") - @Valid - private Map> mapMapString = null; - - @JsonProperty("map_map_anytype") - @Valid - private Map> mapMapAnytype = null; - - @JsonProperty("anytype_1") - private Object anytype1; - - @JsonProperty("anytype_2") - private Object anytype2; - - @JsonProperty("anytype_3") - private Object anytype3; - - public AdditionalPropertiesClass mapString(Map mapString) { - this.mapString = mapString; - return this; - } - - public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { - if (this.mapString == null) { - this.mapString = new HashMap<>(); - } - this.mapString.put(key, mapStringItem); - return this; - } - - /** - * Get mapString - * @return mapString - */ - - @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapString() { - return mapString; - } - - public void setMapString(Map mapString) { - this.mapString = mapString; - } - - public AdditionalPropertiesClass mapNumber(Map mapNumber) { - this.mapNumber = mapNumber; - return this; - } - - public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { - if (this.mapNumber == null) { - this.mapNumber = new HashMap<>(); - } - this.mapNumber.put(key, mapNumberItem); - return this; - } - - /** - * Get mapNumber - * @return mapNumber - */ - @Valid - @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapNumber() { - return mapNumber; - } - - public void setMapNumber(Map mapNumber) { - this.mapNumber = mapNumber; - } - - public AdditionalPropertiesClass mapInteger(Map mapInteger) { - this.mapInteger = mapInteger; - return this; - } - - public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { - if (this.mapInteger == null) { - this.mapInteger = new HashMap<>(); - } - this.mapInteger.put(key, mapIntegerItem); - return this; - } - - /** - * Get mapInteger - * @return mapInteger - */ - - @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapInteger() { - return mapInteger; - } - - public void setMapInteger(Map mapInteger) { - this.mapInteger = mapInteger; - } - - public AdditionalPropertiesClass mapBoolean(Map mapBoolean) { - this.mapBoolean = mapBoolean; - return this; - } - - public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { - if (this.mapBoolean == null) { - this.mapBoolean = new HashMap<>(); - } - this.mapBoolean.put(key, mapBooleanItem); - return this; - } - - /** - * Get mapBoolean - * @return mapBoolean - */ - - @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapBoolean() { - return mapBoolean; - } - - public void setMapBoolean(Map mapBoolean) { - this.mapBoolean = mapBoolean; - } - - public AdditionalPropertiesClass mapArrayInteger(Map> mapArrayInteger) { - this.mapArrayInteger = mapArrayInteger; - return this; - } - - public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { - if (this.mapArrayInteger == null) { - this.mapArrayInteger = new HashMap<>(); - } - this.mapArrayInteger.put(key, mapArrayIntegerItem); - return this; - } - - /** - * Get mapArrayInteger - * @return mapArrayInteger - */ - @Valid - @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapArrayInteger() { - return mapArrayInteger; - } - - public void setMapArrayInteger(Map> mapArrayInteger) { - this.mapArrayInteger = mapArrayInteger; - } - - public AdditionalPropertiesClass mapArrayAnytype(Map> mapArrayAnytype) { - this.mapArrayAnytype = mapArrayAnytype; - return this; - } - - public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { - if (this.mapArrayAnytype == null) { - this.mapArrayAnytype = new HashMap<>(); - } - this.mapArrayAnytype.put(key, mapArrayAnytypeItem); - return this; - } - - /** - * Get mapArrayAnytype - * @return mapArrayAnytype - */ - @Valid - @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapArrayAnytype() { - return mapArrayAnytype; - } - - public void setMapArrayAnytype(Map> mapArrayAnytype) { - this.mapArrayAnytype = mapArrayAnytype; - } - - public AdditionalPropertiesClass mapMapString(Map> mapMapString) { - this.mapMapString = mapMapString; - return this; - } - - public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { - if (this.mapMapString == null) { - this.mapMapString = new HashMap<>(); - } - this.mapMapString.put(key, mapMapStringItem); - return this; - } - - /** - * Get mapMapString - * @return mapMapString - */ - @Valid - @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapString() { - return mapMapString; - } - - public void setMapMapString(Map> mapMapString) { - this.mapMapString = mapMapString; - } - - public AdditionalPropertiesClass mapMapAnytype(Map> mapMapAnytype) { - this.mapMapAnytype = mapMapAnytype; - return this; - } - - public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { - if (this.mapMapAnytype == null) { - this.mapMapAnytype = new HashMap<>(); - } - this.mapMapAnytype.put(key, mapMapAnytypeItem); - return this; - } - - /** - * Get mapMapAnytype - * @return mapMapAnytype - */ - @Valid - @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapAnytype() { - return mapMapAnytype; - } - - public void setMapMapAnytype(Map> mapMapAnytype) { - this.mapMapAnytype = mapMapAnytype; - } - - public AdditionalPropertiesClass anytype1(Object anytype1) { - this.anytype1 = anytype1; - return this; - } - - /** - * Get anytype1 - * @return anytype1 - */ - - @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype1() { - return anytype1; - } - - public void setAnytype1(Object anytype1) { - this.anytype1 = anytype1; - } - - public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; - return this; - } - - /** - * Get anytype2 - * @return anytype2 - */ - - @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype2() { - return anytype2; - } - - public void setAnytype2(Object anytype2) { - this.anytype2 = anytype2; - } - - public AdditionalPropertiesClass anytype3(Object anytype3) { - this.anytype3 = anytype3; - return this; - } - - /** - * Get anytype3 - * @return anytype3 - */ - - @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype3() { - return anytype3; - } - - public void setAnytype3(Object anytype3) { - this.anytype3 = anytype3; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; - return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && - Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && - Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && - Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && - Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && - Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && - Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && - Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && - Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && - Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); - } - - @Override - public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesClass {\n"); - sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); - sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); - sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); - sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); - sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); - sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); - sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); - sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); - sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); - sb.append(" anytype2: ").append(toIndentedString(anytype2)).append("\n"); - sb.append(" anytype3: ").append(toIndentedString(anytype3)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java deleted file mode 100644 index ff0d6d7241e..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesInteger - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesInteger extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesInteger name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; - return Objects.equals(this.name, additionalPropertiesInteger.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesInteger {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java deleted file mode 100644 index cc212be855d..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesNumber - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesNumber extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesNumber name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; - return Objects.equals(this.name, additionalPropertiesNumber.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesNumber {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java deleted file mode 100644 index 7c74b7de08d..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesObject - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesObject extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesObject name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; - return Objects.equals(this.name, additionalPropertiesObject.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesObject {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java deleted file mode 100644 index 6087e70dba7..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * AdditionalPropertiesString - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class AdditionalPropertiesString extends HashMap { - - @JsonProperty("name") - private String name; - - public AdditionalPropertiesString name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; - return Objects.equals(this.name, additionalPropertiesString.name) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(name, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesString {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java deleted file mode 100644 index 1ecf10efc5c..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ /dev/null @@ -1,140 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Animal - */ - -@JsonIgnoreProperties( - value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization - allowSetters = true // allows the className to be set during deserialization -) -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) -@JsonSubTypes({ - @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"), - @JsonSubTypes.Type(value = Cat.class, name = "Cat"), - @JsonSubTypes.Type(value = Dog.class, name = "Dog") -}) - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Animal { - - @JsonProperty("className") - private String className; - - @JsonProperty("color") - private String color = "red"; - - /** - * Default constructor - * @deprecated Use {@link Animal#Animal(String)} - */ - @Deprecated - public Animal() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Animal(String className) { - this.className = className; - } - - public Animal className(String className) { - this.className = className; - return this; - } - - /** - * Get className - * @return className - */ - @NotNull - @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED) - public String getClassName() { - return className; - } - - public void setClassName(String className) { - this.className = className; - } - - public Animal color(String color) { - this.color = color; - return this; - } - - /** - * Get color - * @return color - */ - - @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getColor() { - return color; - } - - public void setColor(String color) { - this.color = color; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Animal animal = (Animal) o; - return Objects.equals(this.className, animal.className) && - Objects.equals(this.color, animal.color); - } - - @Override - public int hashCode() { - return Objects.hash(className, color); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Animal {\n"); - sb.append(" className: ").append(toIndentedString(className)).append("\n"); - sb.append(" color: ").append(toIndentedString(color)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java deleted file mode 100644 index 42600354f74..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayOfArrayOfNumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayOfArrayOfNumberOnly { - - @JsonProperty("ArrayArrayNumber") - @Valid - private List> arrayArrayNumber = null; - - public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { - this.arrayArrayNumber = arrayArrayNumber; - return this; - } - - public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { - if (this.arrayArrayNumber == null) { - this.arrayArrayNumber = new ArrayList<>(); - } - this.arrayArrayNumber.add(arrayArrayNumberItem); - return this; - } - - /** - * Get arrayArrayNumber - * @return arrayArrayNumber - */ - @Valid - @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayNumber() { - return arrayArrayNumber; - } - - public void setArrayArrayNumber(List> arrayArrayNumber) { - this.arrayArrayNumber = arrayArrayNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o; - return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber); - } - - @Override - public int hashCode() { - return Objects.hash(arrayArrayNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayOfArrayOfNumberOnly {\n"); - sb.append(" arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java deleted file mode 100644 index 2f6c19a8344..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayOfNumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayOfNumberOnly { - - @JsonProperty("ArrayNumber") - @Valid - private List arrayNumber = null; - - public ArrayOfNumberOnly arrayNumber(List arrayNumber) { - this.arrayNumber = arrayNumber; - return this; - } - - public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { - if (this.arrayNumber == null) { - this.arrayNumber = new ArrayList<>(); - } - this.arrayNumber.add(arrayNumberItem); - return this; - } - - /** - * Get arrayNumber - * @return arrayNumber - */ - @Valid - @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayNumber() { - return arrayNumber; - } - - public void setArrayNumber(List arrayNumber) { - this.arrayNumber = arrayNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o; - return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber); - } - - @Override - public int hashCode() { - return Objects.hash(arrayNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayOfNumberOnly {\n"); - sb.append(" arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java deleted file mode 100644 index 23ee84ce8b5..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.model.ReadOnlyFirst; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ArrayTest - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ArrayTest { - - @JsonProperty("array_of_string") - @Valid - private List arrayOfString = null; - - @JsonProperty("array_array_of_integer") - @Valid - private List> arrayArrayOfInteger = null; - - @JsonProperty("array_array_of_model") - @Valid - private List> arrayArrayOfModel = null; - - public ArrayTest arrayOfString(List arrayOfString) { - this.arrayOfString = arrayOfString; - return this; - } - - public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { - if (this.arrayOfString == null) { - this.arrayOfString = new ArrayList<>(); - } - this.arrayOfString.add(arrayOfStringItem); - return this; - } - - /** - * Get arrayOfString - * @return arrayOfString - */ - - @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayOfString() { - return arrayOfString; - } - - public void setArrayOfString(List arrayOfString) { - this.arrayOfString = arrayOfString; - } - - public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { - this.arrayArrayOfInteger = arrayArrayOfInteger; - return this; - } - - public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { - if (this.arrayArrayOfInteger == null) { - this.arrayArrayOfInteger = new ArrayList<>(); - } - this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); - return this; - } - - /** - * Get arrayArrayOfInteger - * @return arrayArrayOfInteger - */ - @Valid - @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayOfInteger() { - return arrayArrayOfInteger; - } - - public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { - this.arrayArrayOfInteger = arrayArrayOfInteger; - } - - public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { - this.arrayArrayOfModel = arrayArrayOfModel; - return this; - } - - public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayOfModelItem) { - if (this.arrayArrayOfModel == null) { - this.arrayArrayOfModel = new ArrayList<>(); - } - this.arrayArrayOfModel.add(arrayArrayOfModelItem); - return this; - } - - /** - * Get arrayArrayOfModel - * @return arrayArrayOfModel - */ - @Valid - @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List> getArrayArrayOfModel() { - return arrayArrayOfModel; - } - - public void setArrayArrayOfModel(List> arrayArrayOfModel) { - this.arrayArrayOfModel = arrayArrayOfModel; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ArrayTest arrayTest = (ArrayTest) o; - return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) && - Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) && - Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel); - } - - @Override - public int hashCode() { - return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayTest {\n"); - sb.append(" arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n"); - sb.append(" arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n"); - sb.append(" arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java deleted file mode 100644 index 8c5453c4a5b..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.model.Cat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * BigCat - */ - - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class BigCat extends Cat { - - /** - * Gets or Sets kind - */ - public enum KindEnum { - LIONS("lions"), - - TIGERS("tigers"), - - LEOPARDS("leopards"), - - JAGUARS("jaguars"); - - private String value; - - KindEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static KindEnum fromValue(String value) { - for (KindEnum b : KindEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("kind") - private KindEnum kind; - - /** - * Default constructor - * @deprecated Use {@link BigCat#BigCat(String)} - */ - @Deprecated - public BigCat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public BigCat(String className) { - super(className); - } - - public BigCat kind(KindEnum kind) { - this.kind = kind; - return this; - } - - /** - * Get kind - * @return kind - */ - - @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public KindEnum getKind() { - return kind; - } - - public void setKind(KindEnum kind) { - this.kind = kind; - } - - public BigCat declawed(Boolean declawed) { - super.setDeclawed(declawed); - return this; - } - - public BigCat className(String className) { - super.setClassName(className); - return this; - } - - public BigCat color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - BigCat bigCat = (BigCat) o; - return Objects.equals(this.kind, bigCat.kind) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(kind, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class BigCat {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" kind: ").append(toIndentedString(kind)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java deleted file mode 100644 index 741de9f41a3..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * BigCatAllOf - */ - -@JsonTypeName("BigCat_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class BigCatAllOf { - - /** - * Gets or Sets kind - */ - public enum KindEnum { - LIONS("lions"), - - TIGERS("tigers"), - - LEOPARDS("leopards"), - - JAGUARS("jaguars"); - - private String value; - - KindEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static KindEnum fromValue(String value) { - for (KindEnum b : KindEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("kind") - private KindEnum kind; - - public BigCatAllOf kind(KindEnum kind) { - this.kind = kind; - return this; - } - - /** - * Get kind - * @return kind - */ - - @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public KindEnum getKind() { - return kind; - } - - public void setKind(KindEnum kind) { - this.kind = kind; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - BigCatAllOf bigCatAllOf = (BigCatAllOf) o; - return Objects.equals(this.kind, bigCatAllOf.kind); - } - - @Override - public int hashCode() { - return Objects.hash(kind); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class BigCatAllOf {\n"); - sb.append(" kind: ").append(toIndentedString(kind)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java deleted file mode 100644 index 0c56400050b..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ /dev/null @@ -1,203 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Capitalization - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Capitalization { - - @JsonProperty("smallCamel") - private String smallCamel; - - @JsonProperty("CapitalCamel") - private String capitalCamel; - - @JsonProperty("small_Snake") - private String smallSnake; - - @JsonProperty("Capital_Snake") - private String capitalSnake; - - @JsonProperty("SCA_ETH_Flow_Points") - private String scAETHFlowPoints; - - @JsonProperty("ATT_NAME") - private String ATT_NAME; - - public Capitalization smallCamel(String smallCamel) { - this.smallCamel = smallCamel; - return this; - } - - /** - * Get smallCamel - * @return smallCamel - */ - - @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSmallCamel() { - return smallCamel; - } - - public void setSmallCamel(String smallCamel) { - this.smallCamel = smallCamel; - } - - public Capitalization capitalCamel(String capitalCamel) { - this.capitalCamel = capitalCamel; - return this; - } - - /** - * Get capitalCamel - * @return capitalCamel - */ - - @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getCapitalCamel() { - return capitalCamel; - } - - public void setCapitalCamel(String capitalCamel) { - this.capitalCamel = capitalCamel; - } - - public Capitalization smallSnake(String smallSnake) { - this.smallSnake = smallSnake; - return this; - } - - /** - * Get smallSnake - * @return smallSnake - */ - - @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSmallSnake() { - return smallSnake; - } - - public void setSmallSnake(String smallSnake) { - this.smallSnake = smallSnake; - } - - public Capitalization capitalSnake(String capitalSnake) { - this.capitalSnake = capitalSnake; - return this; - } - - /** - * Get capitalSnake - * @return capitalSnake - */ - - @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getCapitalSnake() { - return capitalSnake; - } - - public void setCapitalSnake(String capitalSnake) { - this.capitalSnake = capitalSnake; - } - - public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { - this.scAETHFlowPoints = scAETHFlowPoints; - return this; - } - - /** - * Get scAETHFlowPoints - * @return scAETHFlowPoints - */ - - @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getScAETHFlowPoints() { - return scAETHFlowPoints; - } - - public void setScAETHFlowPoints(String scAETHFlowPoints) { - this.scAETHFlowPoints = scAETHFlowPoints; - } - - public Capitalization ATT_NAME(String ATT_NAME) { - this.ATT_NAME = ATT_NAME; - return this; - } - - /** - * Name of the pet - * @return ATT_NAME - */ - - @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getATTNAME() { - return ATT_NAME; - } - - public void setATTNAME(String ATT_NAME) { - this.ATT_NAME = ATT_NAME; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Capitalization capitalization = (Capitalization) o; - return Objects.equals(this.smallCamel, capitalization.smallCamel) && - Objects.equals(this.capitalCamel, capitalization.capitalCamel) && - Objects.equals(this.smallSnake, capitalization.smallSnake) && - Objects.equals(this.capitalSnake, capitalization.capitalSnake) && - Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) && - Objects.equals(this.ATT_NAME, capitalization.ATT_NAME); - } - - @Override - public int hashCode() { - return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Capitalization {\n"); - sb.append(" smallCamel: ").append(toIndentedString(smallCamel)).append("\n"); - sb.append(" capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n"); - sb.append(" smallSnake: ").append(toIndentedString(smallSnake)).append("\n"); - sb.append(" capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n"); - sb.append(" scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n"); - sb.append(" ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java deleted file mode 100644 index a2feece8de8..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Cat - */ - -@JsonIgnoreProperties( - value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization - allowSetters = true // allows the className to be set during deserialization -) -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) -@JsonSubTypes({ - @JsonSubTypes.Type(value = BigCat.class, name = "BigCat") -}) - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Cat extends Animal { - - @JsonProperty("declawed") - private Boolean declawed; - - /** - * Default constructor - * @deprecated Use {@link Cat#Cat(String)} - */ - @Deprecated - public Cat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Cat(String className) { - super(className); - } - - public Cat declawed(Boolean declawed) { - this.declawed = declawed; - return this; - } - - /** - * Get declawed - * @return declawed - */ - - @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getDeclawed() { - return declawed; - } - - public void setDeclawed(Boolean declawed) { - this.declawed = declawed; - } - - public Cat className(String className) { - super.setClassName(className); - return this; - } - - public Cat color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Cat cat = (Cat) o; - return Objects.equals(this.declawed, cat.declawed) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(declawed, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Cat {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java deleted file mode 100644 index 50a9c2cdce9..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * CatAllOf - */ - -@JsonTypeName("Cat_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class CatAllOf { - - @JsonProperty("declawed") - private Boolean declawed; - - public CatAllOf declawed(Boolean declawed) { - this.declawed = declawed; - return this; - } - - /** - * Get declawed - * @return declawed - */ - - @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getDeclawed() { - return declawed; - } - - public void setDeclawed(Boolean declawed) { - this.declawed = declawed; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - CatAllOf catAllOf = (CatAllOf) o; - return Objects.equals(this.declawed, catAllOf.declawed); - } - - @Override - public int hashCode() { - return Objects.hash(declawed); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class CatAllOf {\n"); - sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java deleted file mode 100644 index 7ee1fde0646..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ /dev/null @@ -1,123 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Category - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Category { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name = "default-name"; - - /** - * Default constructor - * @deprecated Use {@link Category#Category(String)} - */ - @Deprecated - public Category() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Category(String name) { - this.name = name; - } - - public Category id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Category name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Category category = (Category) o; - return Objects.equals(this.id, category.id) && - Objects.equals(this.name, category.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Category {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java deleted file mode 100644 index a1942e9c404..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model with \"_class\" property - */ - -@Schema(name = "ClassModel", description = "Model for testing model with \"_class\" property") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ClassModel { - - @JsonProperty("_class") - private String propertyClass; - - public ClassModel propertyClass(String propertyClass) { - this.propertyClass = propertyClass; - return this; - } - - /** - * Get propertyClass - * @return propertyClass - */ - - @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPropertyClass() { - return propertyClass; - } - - public void setPropertyClass(String propertyClass) { - this.propertyClass = propertyClass; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ClassModel classModel = (ClassModel) o; - return Objects.equals(this.propertyClass, classModel.propertyClass); - } - - @Override - public int hashCode() { - return Objects.hash(propertyClass); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ClassModel {\n"); - sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java deleted file mode 100644 index c38b26829be..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Client - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Client { - - @JsonProperty("client") - private String client; - - public Client client(String client) { - this.client = client; - return this; - } - - /** - * Get client - * @return client - */ - - @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getClient() { - return client; - } - - public void setClient(String client) { - this.client = client; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Client client = (Client) o; - return Objects.equals(this.client, client.client); - } - - @Override - public int hashCode() { - return Objects.hash(client); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Client {\n"); - sb.append(" client: ").append(toIndentedString(client)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java deleted file mode 100644 index 1bb3d6b5102..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.Animal; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Dog - */ - - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Dog extends Animal { - - @JsonProperty("breed") - private String breed; - - /** - * Default constructor - * @deprecated Use {@link Dog#Dog(String)} - */ - @Deprecated - public Dog() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Dog(String className) { - super(className); - } - - public Dog breed(String breed) { - this.breed = breed; - return this; - } - - /** - * Get breed - * @return breed - */ - - @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBreed() { - return breed; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - public Dog className(String className) { - super.setClassName(className); - return this; - } - - public Dog color(String color) { - super.setColor(color); - return this; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Dog dog = (Dog) o; - return Objects.equals(this.breed, dog.breed) && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(breed, super.hashCode()); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Dog {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java deleted file mode 100644 index 256925a7841..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * DogAllOf - */ - -@JsonTypeName("Dog_allOf") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class DogAllOf { - - @JsonProperty("breed") - private String breed; - - public DogAllOf breed(String breed) { - this.breed = breed; - return this; - } - - /** - * Get breed - * @return breed - */ - - @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBreed() { - return breed; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - DogAllOf dogAllOf = (DogAllOf) o; - return Objects.equals(this.breed, dogAllOf.breed); - } - - @Override - public int hashCode() { - return Objects.hash(breed); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class DogAllOf {\n"); - sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java deleted file mode 100644 index 2720e81c227..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ /dev/null @@ -1,189 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * EnumArrays - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class EnumArrays { - - /** - * Gets or Sets justSymbol - */ - public enum JustSymbolEnum { - GREATER_THAN_OR_EQUAL_TO(">="), - - DOLLAR("$"); - - private String value; - - JustSymbolEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static JustSymbolEnum fromValue(String value) { - for (JustSymbolEnum b : JustSymbolEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("just_symbol") - private JustSymbolEnum justSymbol; - - /** - * Gets or Sets arrayEnum - */ - public enum ArrayEnumEnum { - FISH("fish"), - - CRAB("crab"); - - private String value; - - ArrayEnumEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static ArrayEnumEnum fromValue(String value) { - for (ArrayEnumEnum b : ArrayEnumEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("array_enum") - @Valid - private List arrayEnum = null; - - public EnumArrays justSymbol(JustSymbolEnum justSymbol) { - this.justSymbol = justSymbol; - return this; - } - - /** - * Get justSymbol - * @return justSymbol - */ - - @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public JustSymbolEnum getJustSymbol() { - return justSymbol; - } - - public void setJustSymbol(JustSymbolEnum justSymbol) { - this.justSymbol = justSymbol; - } - - public EnumArrays arrayEnum(List arrayEnum) { - this.arrayEnum = arrayEnum; - return this; - } - - public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { - if (this.arrayEnum == null) { - this.arrayEnum = new ArrayList<>(); - } - this.arrayEnum.add(arrayEnumItem); - return this; - } - - /** - * Get arrayEnum - * @return arrayEnum - */ - - @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getArrayEnum() { - return arrayEnum; - } - - public void setArrayEnum(List arrayEnum) { - this.arrayEnum = arrayEnum; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - EnumArrays enumArrays = (EnumArrays) o; - return Objects.equals(this.justSymbol, enumArrays.justSymbol) && - Objects.equals(this.arrayEnum, enumArrays.arrayEnum); - } - - @Override - public int hashCode() { - return Objects.hash(justSymbol, arrayEnum); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class EnumArrays {\n"); - sb.append(" justSymbol: ").append(toIndentedString(justSymbol)).append("\n"); - sb.append(" arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumClass.java deleted file mode 100644 index 4e6027d16c4..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumClass.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Gets or Sets EnumClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public enum EnumClass { - - _ABC("_abc"), - - _EFG("-efg"), - - _XYZ_("(xyz)"); - - private String value; - - EnumClass(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java deleted file mode 100644 index 6f08d4ee9fb..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ /dev/null @@ -1,343 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.model.OuterEnum; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * EnumTest - */ - -@JsonTypeName("Enum_Test") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class EnumTest { - - /** - * Gets or Sets enumString - */ - public enum EnumStringEnum { - UPPER("UPPER"), - - LOWER("lower"), - - EMPTY(""); - - private String value; - - EnumStringEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumStringEnum fromValue(String value) { - for (EnumStringEnum b : EnumStringEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_string") - private EnumStringEnum enumString; - - /** - * Gets or Sets enumStringRequired - */ - public enum EnumStringRequiredEnum { - UPPER("UPPER"), - - LOWER("lower"), - - EMPTY(""); - - private String value; - - EnumStringRequiredEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumStringRequiredEnum fromValue(String value) { - for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_string_required") - private EnumStringRequiredEnum enumStringRequired; - - /** - * Gets or Sets enumInteger - */ - public enum EnumIntegerEnum { - NUMBER_1(1), - - NUMBER_MINUS_1(-1); - - private Integer value; - - EnumIntegerEnum(Integer value) { - this.value = value; - } - - @JsonValue - public Integer getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumIntegerEnum fromValue(Integer value) { - for (EnumIntegerEnum b : EnumIntegerEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_integer") - private EnumIntegerEnum enumInteger; - - /** - * Gets or Sets enumNumber - */ - public enum EnumNumberEnum { - NUMBER_1_DOT_1(1.1), - - NUMBER_MINUS_1_DOT_2(-1.2); - - private Double value; - - EnumNumberEnum(Double value) { - this.value = value; - } - - @JsonValue - public Double getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static EnumNumberEnum fromValue(Double value) { - for (EnumNumberEnum b : EnumNumberEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("enum_number") - private EnumNumberEnum enumNumber; - - @JsonProperty("outerEnum") - private OuterEnum outerEnum; - - /** - * Default constructor - * @deprecated Use {@link EnumTest#EnumTest(EnumStringRequiredEnum)} - */ - @Deprecated - public EnumTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public EnumTest(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - - public EnumTest enumString(EnumStringEnum enumString) { - this.enumString = enumString; - return this; - } - - /** - * Get enumString - * @return enumString - */ - - @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumStringEnum getEnumString() { - return enumString; - } - - public void setEnumString(EnumStringEnum enumString) { - this.enumString = enumString; - } - - public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - return this; - } - - /** - * Get enumStringRequired - * @return enumStringRequired - */ - @NotNull - @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED) - public EnumStringRequiredEnum getEnumStringRequired() { - return enumStringRequired; - } - - public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - - public EnumTest enumInteger(EnumIntegerEnum enumInteger) { - this.enumInteger = enumInteger; - return this; - } - - /** - * Get enumInteger - * @return enumInteger - */ - - @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumIntegerEnum getEnumInteger() { - return enumInteger; - } - - public void setEnumInteger(EnumIntegerEnum enumInteger) { - this.enumInteger = enumInteger; - } - - public EnumTest enumNumber(EnumNumberEnum enumNumber) { - this.enumNumber = enumNumber; - return this; - } - - /** - * Get enumNumber - * @return enumNumber - */ - - @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public EnumNumberEnum getEnumNumber() { - return enumNumber; - } - - public void setEnumNumber(EnumNumberEnum enumNumber) { - this.enumNumber = enumNumber; - } - - public EnumTest outerEnum(OuterEnum outerEnum) { - this.outerEnum = outerEnum; - return this; - } - - /** - * Get outerEnum - * @return outerEnum - */ - @Valid - @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OuterEnum getOuterEnum() { - return outerEnum; - } - - public void setOuterEnum(OuterEnum outerEnum) { - this.outerEnum = outerEnum; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - EnumTest enumTest = (EnumTest) o; - return Objects.equals(this.enumString, enumTest.enumString) && - Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && - Objects.equals(this.enumInteger, enumTest.enumInteger) && - Objects.equals(this.enumNumber, enumTest.enumNumber) && - Objects.equals(this.outerEnum, enumTest.outerEnum); - } - - @Override - public int hashCode() { - return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class EnumTest {\n"); - sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n"); - sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n"); - sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n"); - sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n"); - sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java deleted file mode 100644 index bf750ccdcb7..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Must be named `File` for test. - */ - -@Schema(name = "File", description = "Must be named `File` for test.") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class File { - - @JsonProperty("sourceURI") - private String sourceURI; - - public File sourceURI(String sourceURI) { - this.sourceURI = sourceURI; - return this; - } - - /** - * Test capitalization - * @return sourceURI - */ - - @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getSourceURI() { - return sourceURI; - } - - public void setSourceURI(String sourceURI) { - this.sourceURI = sourceURI; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - File file = (File) o; - return Objects.equals(this.sourceURI, file.sourceURI); - } - - @Override - public int hashCode() { - return Objects.hash(sourceURI); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class File {\n"); - sb.append(" sourceURI: ").append(toIndentedString(sourceURI)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java deleted file mode 100644 index 8b196d5d7de..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * FileSchemaTestClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class FileSchemaTestClass { - - @JsonProperty("file") - private File file; - - @JsonProperty("files") - @Valid - private List<@Valid File> files = null; - - public FileSchemaTestClass file(File file) { - this.file = file; - return this; - } - - /** - * Get file - * @return file - */ - @Valid - @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public File getFile() { - return file; - } - - public void setFile(File file) { - this.file = file; - } - - public FileSchemaTestClass files(List<@Valid File> files) { - this.files = files; - return this; - } - - public FileSchemaTestClass addFilesItem(File filesItem) { - if (this.files == null) { - this.files = new ArrayList<>(); - } - this.files.add(filesItem); - return this; - } - - /** - * Get files - * @return files - */ - @Valid - @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List<@Valid File> getFiles() { - return files; - } - - public void setFiles(List<@Valid File> files) { - this.files = files; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o; - return Objects.equals(this.file, fileSchemaTestClass.file) && - Objects.equals(this.files, fileSchemaTestClass.files); - } - - @Override - public int hashCode() { - return Objects.hash(file, files); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class FileSchemaTestClass {\n"); - sb.append(" file: ").append(toIndentedString(file)).append("\n"); - sb.append(" files: ").append(toIndentedString(files)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java deleted file mode 100644 index 06e9dde8e89..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java +++ /dev/null @@ -1,434 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.OffsetDateTime; -import java.util.Arrays; -import java.util.UUID; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * FormatTest - */ - -@JsonTypeName("format_test") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class FormatTest { - - @JsonProperty("integer") - private Integer integer; - - @JsonProperty("int32") - private Integer int32; - - @JsonProperty("int64") - private Long int64; - - @JsonProperty("number") - private BigDecimal number; - - @JsonProperty("float") - private Float _float; - - @JsonProperty("double") - private Double _double; - - @JsonProperty("string") - private String string; - - @JsonProperty("byte") - private byte[] _byte; - - @JsonProperty("binary") - private org.springframework.core.io.Resource binary; - - @JsonProperty("date") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; - - @JsonProperty("dateTime") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; - - @JsonProperty("uuid") - private UUID uuid; - - @JsonProperty("password") - private String password; - - @JsonProperty("BigDecimal") - private BigDecimal bigDecimal; - - /** - * Default constructor - * @deprecated Use {@link FormatTest#FormatTest(BigDecimal, byte[], LocalDate, String)} - */ - @Deprecated - public FormatTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { - this.number = number; - this._byte = _byte; - this.date = date; - this.password = password; - } - - public FormatTest integer(Integer integer) { - this.integer = integer; - return this; - } - - /** - * Get integer - * minimum: 10 - * maximum: 100 - * @return integer - */ - @Min(10) @Max(100) - @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getInteger() { - return integer; - } - - public void setInteger(Integer integer) { - this.integer = integer; - } - - public FormatTest int32(Integer int32) { - this.int32 = int32; - return this; - } - - /** - * Get int32 - * minimum: 20 - * maximum: 200 - * @return int32 - */ - @Min(20) @Max(200) - @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getInt32() { - return int32; - } - - public void setInt32(Integer int32) { - this.int32 = int32; - } - - public FormatTest int64(Long int64) { - this.int64 = int64; - return this; - } - - /** - * Get int64 - * @return int64 - */ - - @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getInt64() { - return int64; - } - - public void setInt64(Long int64) { - this.int64 = int64; - } - - public FormatTest number(BigDecimal number) { - this.number = number; - return this; - } - - /** - * Get number - * minimum: 32.1 - * maximum: 543.2 - * @return number - */ - @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") - @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumber() { - return number; - } - - public void setNumber(BigDecimal number) { - this.number = number; - } - - public FormatTest _float(Float _float) { - this._float = _float; - return this; - } - - /** - * Get _float - * minimum: 54.3 - * maximum: 987.6 - * @return _float - */ - @DecimalMin("54.3") @DecimalMax("987.6") - @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Float getFloat() { - return _float; - } - - public void setFloat(Float _float) { - this._float = _float; - } - - public FormatTest _double(Double _double) { - this._double = _double; - return this; - } - - /** - * Get _double - * minimum: 67.8 - * maximum: 123.4 - * @return _double - */ - @DecimalMin("67.8") @DecimalMax("123.4") - @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Double getDouble() { - return _double; - } - - public void setDouble(Double _double) { - this._double = _double; - } - - public FormatTest string(String string) { - this.string = string; - return this; - } - - /** - * Get string - * @return string - */ - @Pattern(regexp = "/[a-z]/i") - @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getString() { - return string; - } - - public void setString(String string) { - this.string = string; - } - - public FormatTest _byte(byte[] _byte) { - this._byte = _byte; - return this; - } - - /** - * Get _byte - * @return _byte - */ - @NotNull - @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED) - public byte[] getByte() { - return _byte; - } - - public void setByte(byte[] _byte) { - this._byte = _byte; - } - - public FormatTest binary(org.springframework.core.io.Resource binary) { - this.binary = binary; - return this; - } - - /** - * Get binary - * @return binary - */ - @Valid - @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public org.springframework.core.io.Resource getBinary() { - return binary; - } - - public void setBinary(org.springframework.core.io.Resource binary) { - this.binary = binary; - } - - public FormatTest date(LocalDate date) { - this.date = date; - return this; - } - - /** - * Get date - * @return date - */ - @NotNull @Valid - @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) - public LocalDate getDate() { - return date; - } - - public void setDate(LocalDate date) { - this.date = date; - } - - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - return this; - } - - /** - * Get dateTime - * @return dateTime - */ - @Valid - @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - } - - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; - return this; - } - - /** - * Get uuid - * @return uuid - */ - @Valid - @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - - public FormatTest password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - @NotNull @Size(min = 10, max = 64) - @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; - return this; - } - - /** - * Get bigDecimal - * @return bigDecimal - */ - @Valid - @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getBigDecimal() { - return bigDecimal; - } - - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && - Objects.equals(this.int32, formatTest.int32) && - Objects.equals(this.int64, formatTest.int64) && - Objects.equals(this.number, formatTest.number) && - Objects.equals(this._float, formatTest._float) && - Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && - Arrays.equals(this._byte, formatTest._byte) && - Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && - Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); - } - - @Override - public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); - sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); - sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); - sb.append(" number: ").append(toIndentedString(number)).append("\n"); - sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); - sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); - sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); - sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java deleted file mode 100644 index c218d0e02b8..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * HasOnlyReadOnly - */ - -@JsonTypeName("hasOnlyReadOnly") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class HasOnlyReadOnly { - - @JsonProperty("bar") - private String bar; - - @JsonProperty("foo") - private String foo; - - public HasOnlyReadOnly bar(String bar) { - this.bar = bar; - return this; - } - - /** - * Get bar - * @return bar - */ - - @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBar() { - return bar; - } - - public void setBar(String bar) { - this.bar = bar; - } - - public HasOnlyReadOnly foo(String foo) { - this.foo = foo; - return this; - } - - /** - * Get foo - * @return foo - */ - - @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getFoo() { - return foo; - } - - public void setFoo(String foo) { - this.foo = foo; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o; - return Objects.equals(this.bar, hasOnlyReadOnly.bar) && - Objects.equals(this.foo, hasOnlyReadOnly.foo); - } - - @Override - public int hashCode() { - return Objects.hash(bar, foo); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class HasOnlyReadOnly {\n"); - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append(" foo: ").append(toIndentedString(foo)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java deleted file mode 100644 index 9811806e0c8..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ /dev/null @@ -1,229 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.HashMap; -import java.util.Map; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * MapTest - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class MapTest { - - @JsonProperty("map_map_of_string") - @Valid - private Map> mapMapOfString = null; - - /** - * Gets or Sets inner - */ - public enum InnerEnum { - UPPER("UPPER"), - - LOWER("lower"); - - private String value; - - InnerEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static InnerEnum fromValue(String value) { - for (InnerEnum b : InnerEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("map_of_enum_string") - @Valid - private Map mapOfEnumString = null; - - @JsonProperty("direct_map") - @Valid - private Map directMap = null; - - @JsonProperty("indirect_map") - @Valid - private Map indirectMap = null; - - public MapTest mapMapOfString(Map> mapMapOfString) { - this.mapMapOfString = mapMapOfString; - return this; - } - - public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { - if (this.mapMapOfString == null) { - this.mapMapOfString = new HashMap<>(); - } - this.mapMapOfString.put(key, mapMapOfStringItem); - return this; - } - - /** - * Get mapMapOfString - * @return mapMapOfString - */ - @Valid - @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map> getMapMapOfString() { - return mapMapOfString; - } - - public void setMapMapOfString(Map> mapMapOfString) { - this.mapMapOfString = mapMapOfString; - } - - public MapTest mapOfEnumString(Map mapOfEnumString) { - this.mapOfEnumString = mapOfEnumString; - return this; - } - - public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { - if (this.mapOfEnumString == null) { - this.mapOfEnumString = new HashMap<>(); - } - this.mapOfEnumString.put(key, mapOfEnumStringItem); - return this; - } - - /** - * Get mapOfEnumString - * @return mapOfEnumString - */ - - @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMapOfEnumString() { - return mapOfEnumString; - } - - public void setMapOfEnumString(Map mapOfEnumString) { - this.mapOfEnumString = mapOfEnumString; - } - - public MapTest directMap(Map directMap) { - this.directMap = directMap; - return this; - } - - public MapTest putDirectMapItem(String key, Boolean directMapItem) { - if (this.directMap == null) { - this.directMap = new HashMap<>(); - } - this.directMap.put(key, directMapItem); - return this; - } - - /** - * Get directMap - * @return directMap - */ - - @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getDirectMap() { - return directMap; - } - - public void setDirectMap(Map directMap) { - this.directMap = directMap; - } - - public MapTest indirectMap(Map indirectMap) { - this.indirectMap = indirectMap; - return this; - } - - public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { - if (this.indirectMap == null) { - this.indirectMap = new HashMap<>(); - } - this.indirectMap.put(key, indirectMapItem); - return this; - } - - /** - * Get indirectMap - * @return indirectMap - */ - - @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getIndirectMap() { - return indirectMap; - } - - public void setIndirectMap(Map indirectMap) { - this.indirectMap = indirectMap; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MapTest mapTest = (MapTest) o; - return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) && - Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) && - Objects.equals(this.directMap, mapTest.directMap) && - Objects.equals(this.indirectMap, mapTest.indirectMap); - } - - @Override - public int hashCode() { - return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MapTest {\n"); - sb.append(" mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n"); - sb.append(" mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n"); - sb.append(" directMap: ").append(toIndentedString(directMap)).append("\n"); - sb.append(" indirectMap: ").append(toIndentedString(indirectMap)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java deleted file mode 100644 index bcf0155a1b2..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.time.OffsetDateTime; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import org.openapitools.model.Animal; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * MixedPropertiesAndAdditionalPropertiesClass - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class MixedPropertiesAndAdditionalPropertiesClass { - - @JsonProperty("uuid") - private UUID uuid; - - @JsonProperty("dateTime") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; - - @JsonProperty("map") - @Valid - private Map map = null; - - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; - return this; - } - - /** - * Get uuid - * @return uuid - */ - @Valid - @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - return this; - } - - /** - * Get dateTime - * @return dateTime - */ - @Valid - @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; - } - - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; - return this; - } - - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); - } - this.map.put(key, mapItem); - return this; - } - - /** - * Get map - * @return map - */ - @Valid - @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Map getMap() { - return map; - } - - public void setMap(Map map) { - this.map = map; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); - } - - @Override - public int hashCode() { - return Objects.hash(uuid, dateTime, map); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java deleted file mode 100644 index 9ca96d114aa..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model name starting with number - */ - -@Schema(name = "200_response", description = "Model for testing model name starting with number") -@JsonTypeName("200_response") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Model200Response { - - @JsonProperty("name") - private Integer name; - - @JsonProperty("class") - private String propertyClass; - - public Model200Response name(Integer name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getName() { - return name; - } - - public void setName(Integer name) { - this.name = name; - } - - public Model200Response propertyClass(String propertyClass) { - this.propertyClass = propertyClass; - return this; - } - - /** - * Get propertyClass - * @return propertyClass - */ - - @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPropertyClass() { - return propertyClass; - } - - public void setPropertyClass(String propertyClass) { - this.propertyClass = propertyClass; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Model200Response _200response = (Model200Response) o; - return Objects.equals(this.name, _200response.name) && - Objects.equals(this.propertyClass, _200response.propertyClass); - } - - @Override - public int hashCode() { - return Objects.hash(name, propertyClass); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Model200Response {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java deleted file mode 100644 index 06c806057b5..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ /dev/null @@ -1,133 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ModelApiResponse - */ - -@JsonTypeName("ApiResponse") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelApiResponse { - - @JsonProperty("code") - private Integer code; - - @JsonProperty("type") - private String type; - - @JsonProperty("message") - private String message; - - public ModelApiResponse code(Integer code) { - this.code = code; - return this; - } - - /** - * Get code - * @return code - */ - - @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public ModelApiResponse type(String type) { - this.type = type; - return this; - } - - /** - * Get type - * @return type - */ - - @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public ModelApiResponse message(String message) { - this.message = message; - return this; - } - - /** - * Get message - * @return message - */ - - @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelApiResponse _apiResponse = (ModelApiResponse) o; - return Objects.equals(this.code, _apiResponse.code) && - Objects.equals(this.type, _apiResponse.type) && - Objects.equals(this.message, _apiResponse.message); - } - - @Override - public int hashCode() { - return Objects.hash(code, type, message); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelApiResponse {\n"); - sb.append(" code: ").append(toIndentedString(code)).append("\n"); - sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" message: ").append(toIndentedString(message)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelFile.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelFile.java deleted file mode 100644 index de11d272cc3..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelFile.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; - -/** - * Must be named `File` for test. - */ -@Schema(name = "File",description = "Must be named `File` for test.") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelFile { - @JsonProperty("sourceURI") - private String sourceURI; - - public ModelFile sourceURI(String sourceURI) { - this.sourceURI = sourceURI; - return this; - } - - /** - * Test capitalization - * @return sourceURI - */ - @Schema(name = "sourceURI", defaultValue = "Test capitalization") - - - public String getSourceURI() { - return sourceURI; - } - - public void setSourceURI(String sourceURI) { - this.sourceURI = sourceURI; - } - - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelFile _file = (ModelFile) o; - return Objects.equals(this.sourceURI, _file.sourceURI); - } - - @Override - public int hashCode() { - return Objects.hash(sourceURI); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelFile {\n"); - - sb.append(" sourceURI: ").append(toIndentedString(sourceURI)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java deleted file mode 100644 index f168748f6a2..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ModelList - */ - -@JsonTypeName("List") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelList { - - @JsonProperty("123-list") - private String _123list; - - public ModelList _123list(String _123list) { - this._123list = _123list; - return this; - } - - /** - * Get _123list - * @return _123list - */ - - @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String get123list() { - return _123list; - } - - public void set123list(String _123list) { - this._123list = _123list; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelList _list = (ModelList) o; - return Objects.equals(this._123list, _list._123list); - } - - @Override - public int hashCode() { - return Objects.hash(_123list); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelList {\n"); - sb.append(" _123list: ").append(toIndentedString(_123list)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java deleted file mode 100644 index 641c56cd81c..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing reserved words - */ - -@Schema(name = "Return", description = "Model for testing reserved words") -@JsonTypeName("Return") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelReturn { - - @JsonProperty("return") - private Integer _return; - - public ModelReturn _return(Integer _return) { - this._return = _return; - return this; - } - - /** - * Get _return - * @return _return - */ - - @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getReturn() { - return _return; - } - - public void setReturn(Integer _return) { - this._return = _return; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelReturn _return = (ModelReturn) o; - return Objects.equals(this._return, _return._return); - } - - @Override - public int hashCode() { - return Objects.hash(_return); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelReturn {\n"); - sb.append(" _return: ").append(toIndentedString(_return)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java deleted file mode 100644 index d6dcb665651..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ /dev/null @@ -1,172 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Model for testing model name same as property name - */ - -@Schema(name = "Name", description = "Model for testing model name same as property name") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Name { - - @JsonProperty("name") - private Integer name; - - @JsonProperty("snake_case") - private Integer snakeCase; - - @JsonProperty("property") - private String property; - - @JsonProperty("123Number") - private Integer _123number; - - /** - * Default constructor - * @deprecated Use {@link Name#Name(Integer)} - */ - @Deprecated - public Name() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Name(Integer name) { - this.name = name; - } - - public Name name(Integer name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getName() { - return name; - } - - public void setName(Integer name) { - this.name = name; - } - - public Name snakeCase(Integer snakeCase) { - this.snakeCase = snakeCase; - return this; - } - - /** - * Get snakeCase - * @return snakeCase - */ - - @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getSnakeCase() { - return snakeCase; - } - - public void setSnakeCase(Integer snakeCase) { - this.snakeCase = snakeCase; - } - - public Name property(String property) { - this.property = property; - return this; - } - - /** - * Get property - * @return property - */ - - @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getProperty() { - return property; - } - - public void setProperty(String property) { - this.property = property; - } - - public Name _123number(Integer _123number) { - this._123number = _123number; - return this; - } - - /** - * Get _123number - * @return _123number - */ - - @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer get123number() { - return _123number; - } - - public void set123number(Integer _123number) { - this._123number = _123number; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Name name = (Name) o; - return Objects.equals(this.name, name.name) && - Objects.equals(this.snakeCase, name.snakeCase) && - Objects.equals(this.property, name.property) && - Objects.equals(this._123number, name._123number); - } - - @Override - public int hashCode() { - return Objects.hash(name, snakeCase, property, _123number); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Name {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n"); - sb.append(" property: ").append(toIndentedString(property)).append("\n"); - sb.append(" _123number: ").append(toIndentedString(_123number)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java deleted file mode 100644 index 4a3b6beffa2..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * NumberOnly - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class NumberOnly { - - @JsonProperty("JustNumber") - private BigDecimal justNumber; - - public NumberOnly justNumber(BigDecimal justNumber) { - this.justNumber = justNumber; - return this; - } - - /** - * Get justNumber - * @return justNumber - */ - @Valid - @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getJustNumber() { - return justNumber; - } - - public void setJustNumber(BigDecimal justNumber) { - this.justNumber = justNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - NumberOnly numberOnly = (NumberOnly) o; - return Objects.equals(this.justNumber, numberOnly.justNumber); - } - - @Override - public int hashCode() { - return Objects.hash(justNumber); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class NumberOnly {\n"); - sb.append(" justNumber: ").append(toIndentedString(justNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java deleted file mode 100644 index 9a5b61bad43..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ /dev/null @@ -1,244 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.OffsetDateTime; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Order - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Order { - - @JsonProperty("id") - private Long id; - - @JsonProperty("petId") - private Long petId; - - @JsonProperty("quantity") - private Integer quantity; - - @JsonProperty("shipDate") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime shipDate; - - /** - * Order Status - */ - public enum StatusEnum { - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - @JsonProperty("complete") - private Boolean complete = false; - - public Order id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Order petId(Long petId) { - this.petId = petId; - return this; - } - - /** - * Get petId - * @return petId - */ - - @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getPetId() { - return petId; - } - - public void setPetId(Long petId) { - this.petId = petId; - } - - public Order quantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - /** - * Get quantity - * @return quantity - */ - - @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getQuantity() { - return quantity; - } - - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - public Order shipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - return this; - } - - /** - * Get shipDate - * @return shipDate - */ - @Valid - @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public OffsetDateTime getShipDate() { - return shipDate; - } - - public void setShipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - } - - public Order status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * Order Status - * @return status - */ - - @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - public Order complete(Boolean complete) { - this.complete = complete; - return this; - } - - /** - * Get complete - * @return complete - */ - - @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getComplete() { - return complete; - } - - public void setComplete(Boolean complete) { - this.complete = complete; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Order order = (Order) o; - return Objects.equals(this.id, order.id) && - Objects.equals(this.petId, order.petId) && - Objects.equals(this.quantity, order.quantity) && - Objects.equals(this.shipDate, order.shipDate) && - Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete); - } - - @Override - public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Order {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); - sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); - sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java deleted file mode 100644 index b66d6d38afb..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * OuterComposite - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class OuterComposite { - - @JsonProperty("my_number") - private BigDecimal myNumber; - - @JsonProperty("my_string") - private String myString; - - @JsonProperty("my_boolean") - private Boolean myBoolean; - - public OuterComposite myNumber(BigDecimal myNumber) { - this.myNumber = myNumber; - return this; - } - - /** - * Get myNumber - * @return myNumber - */ - @Valid - @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getMyNumber() { - return myNumber; - } - - public void setMyNumber(BigDecimal myNumber) { - this.myNumber = myNumber; - } - - public OuterComposite myString(String myString) { - this.myString = myString; - return this; - } - - /** - * Get myString - * @return myString - */ - - @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getMyString() { - return myString; - } - - public void setMyString(String myString) { - this.myString = myString; - } - - public OuterComposite myBoolean(Boolean myBoolean) { - this.myBoolean = myBoolean; - return this; - } - - /** - * Get myBoolean - * @return myBoolean - */ - - @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getMyBoolean() { - return myBoolean; - } - - public void setMyBoolean(Boolean myBoolean) { - this.myBoolean = myBoolean; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - OuterComposite outerComposite = (OuterComposite) o; - return Objects.equals(this.myNumber, outerComposite.myNumber) && - Objects.equals(this.myString, outerComposite.myString) && - Objects.equals(this.myBoolean, outerComposite.myBoolean); - } - - @Override - public int hashCode() { - return Objects.hash(myNumber, myString, myBoolean); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OuterComposite {\n"); - sb.append(" myNumber: ").append(toIndentedString(myNumber)).append("\n"); - sb.append(" myString: ").append(toIndentedString(myString)).append("\n"); - sb.append(" myBoolean: ").append(toIndentedString(myBoolean)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterEnum.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterEnum.java deleted file mode 100644 index 7fdf6f47de3..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterEnum.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Gets or Sets OuterEnum - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public enum OuterEnum { - - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - OuterEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java deleted file mode 100644 index 6adaaba97d7..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ /dev/null @@ -1,281 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import org.openapitools.model.Category; -import org.openapitools.model.Tag; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Pet - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Pet { - - @JsonProperty("id") - private Long id; - - @JsonProperty("category") - private Category category; - - @JsonProperty("name") - private String name; - - @JsonProperty("photoUrls") - @Valid - private Set photoUrls = new LinkedHashSet<>(); - - @JsonProperty("tags") - @Valid - private List<@Valid Tag> tags = null; - - /** - * pet status in the store - */ - public enum StatusEnum { - AVAILABLE("available"), - - PENDING("pending"), - - SOLD("sold"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - /** - * Default constructor - * @deprecated Use {@link Pet#Pet(String, Set)} - */ - @Deprecated - public Pet() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Pet(String name, Set photoUrls) { - this.name = name; - this.photoUrls = photoUrls; - } - - public Pet id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Pet category(Category category) { - this.category = category; - return this; - } - - /** - * Get category - * @return category - */ - @Valid - @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Category getCategory() { - return category; - } - - public void setCategory(Category category) { - this.category = category; - } - - public Pet name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - @NotNull - @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Pet photoUrls(Set photoUrls) { - this.photoUrls = photoUrls; - return this; - } - - public Pet addPhotoUrlsItem(String photoUrlsItem) { - this.photoUrls.add(photoUrlsItem); - return this; - } - - /** - * Get photoUrls - * @return photoUrls - */ - @NotNull - @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) - public Set getPhotoUrls() { - return photoUrls; - } - - @JsonDeserialize(as = LinkedHashSet.class) - public void setPhotoUrls(Set photoUrls) { - this.photoUrls = photoUrls; - } - - public Pet tags(List<@Valid Tag> tags) { - this.tags = tags; - return this; - } - - public Pet addTagsItem(Tag tagsItem) { - if (this.tags == null) { - this.tags = new ArrayList<>(); - } - this.tags.add(tagsItem); - return this; - } - - /** - * Get tags - * @return tags - */ - @Valid - @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List<@Valid Tag> getTags() { - return tags; - } - - public void setTags(List<@Valid Tag> tags) { - this.tags = tags; - } - - public Pet status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * pet status in the store - * @return status - */ - - @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Pet pet = (Pet) o; - return Objects.equals(this.id, pet.id) && - Objects.equals(this.category, pet.category) && - Objects.equals(this.name, pet.name) && - Objects.equals(this.photoUrls, pet.photoUrls) && - Objects.equals(this.tags, pet.tags) && - Objects.equals(this.status, pet.status); - } - - @Override - public int hashCode() { - return Objects.hash(id, category, name, photoUrls, tags, status); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Pet {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" category: ").append(toIndentedString(category)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java deleted file mode 100644 index 8c43e7e8c30..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * ReadOnlyFirst - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ReadOnlyFirst { - - @JsonProperty("bar") - private String bar; - - @JsonProperty("baz") - private String baz; - - public ReadOnlyFirst bar(String bar) { - this.bar = bar; - return this; - } - - /** - * Get bar - * @return bar - */ - - @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBar() { - return bar; - } - - public void setBar(String bar) { - this.bar = bar; - } - - public ReadOnlyFirst baz(String baz) { - this.baz = baz; - return this; - } - - /** - * Get baz - * @return baz - */ - - @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getBaz() { - return baz; - } - - public void setBaz(String baz) { - this.baz = baz; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o; - return Objects.equals(this.bar, readOnlyFirst.bar) && - Objects.equals(this.baz, readOnlyFirst.baz); - } - - @Override - public int hashCode() { - return Objects.hash(bar, baz); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ReadOnlyFirst {\n"); - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append(" baz: ").append(toIndentedString(baz)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java deleted file mode 100644 index c3d3aa9182e..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * SpecialModelName - */ - -@JsonTypeName("$special[model.name]") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class SpecialModelName { - - @JsonProperty("$special[property.name]") - private Long $specialPropertyName; - - public SpecialModelName $specialPropertyName(Long $specialPropertyName) { - this.$specialPropertyName = $specialPropertyName; - return this; - } - - /** - * Get $specialPropertyName - * @return $specialPropertyName - */ - - @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long get$SpecialPropertyName() { - return $specialPropertyName; - } - - public void set$SpecialPropertyName(Long $specialPropertyName) { - this.$specialPropertyName = $specialPropertyName; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); - } - - @Override - public int hashCode() { - return Objects.hash($specialPropertyName); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class SpecialModelName {\n"); - sb.append(" $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java deleted file mode 100644 index 03d5607e29b..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Tag - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Tag { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Tag id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Tag name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Tag tag = (Tag) o; - return Objects.equals(this.id, tag.id) && - Objects.equals(this.name, tag.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Tag {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java deleted file mode 100644 index 67ef036857d..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ /dev/null @@ -1,208 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * TypeHolderDefault - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class TypeHolderDefault { - - @JsonProperty("string_item") - private String stringItem = "what"; - - @JsonProperty("number_item") - private BigDecimal numberItem; - - @JsonProperty("integer_item") - private Integer integerItem; - - @JsonProperty("bool_item") - private Boolean boolItem = true; - - @JsonProperty("array_item") - @Valid - private List arrayItem = new ArrayList<>(); - - /** - * Default constructor - * @deprecated Use {@link TypeHolderDefault#TypeHolderDefault(String, BigDecimal, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderDefault() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderDefault(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - - public TypeHolderDefault stringItem(String stringItem) { - this.stringItem = stringItem; - return this; - } - - /** - * Get stringItem - * @return stringItem - */ - @NotNull - @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) - public String getStringItem() { - return stringItem; - } - - public void setStringItem(String stringItem) { - this.stringItem = stringItem; - } - - public TypeHolderDefault numberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - return this; - } - - /** - * Get numberItem - * @return numberItem - */ - @NotNull @Valid - @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumberItem() { - return numberItem; - } - - public void setNumberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - } - - public TypeHolderDefault integerItem(Integer integerItem) { - this.integerItem = integerItem; - return this; - } - - /** - * Get integerItem - * @return integerItem - */ - @NotNull - @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getIntegerItem() { - return integerItem; - } - - public void setIntegerItem(Integer integerItem) { - this.integerItem = integerItem; - } - - public TypeHolderDefault boolItem(Boolean boolItem) { - this.boolItem = boolItem; - return this; - } - - /** - * Get boolItem - * @return boolItem - */ - @NotNull - @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) - public Boolean getBoolItem() { - return boolItem; - } - - public void setBoolItem(Boolean boolItem) { - this.boolItem = boolItem; - } - - public TypeHolderDefault arrayItem(List arrayItem) { - this.arrayItem = arrayItem; - return this; - } - - public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { - this.arrayItem.add(arrayItemItem); - return this; - } - - /** - * Get arrayItem - * @return arrayItem - */ - @NotNull - @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) - public List getArrayItem() { - return arrayItem; - } - - public void setArrayItem(List arrayItem) { - this.arrayItem = arrayItem; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o; - return Objects.equals(this.stringItem, typeHolderDefault.stringItem) && - Objects.equals(this.numberItem, typeHolderDefault.numberItem) && - Objects.equals(this.integerItem, typeHolderDefault.integerItem) && - Objects.equals(this.boolItem, typeHolderDefault.boolItem) && - Objects.equals(this.arrayItem, typeHolderDefault.arrayItem); - } - - @Override - public int hashCode() { - return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class TypeHolderDefault {\n"); - sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n"); - sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n"); - sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n"); - sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n"); - sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java deleted file mode 100644 index 5b77bee14c1..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ /dev/null @@ -1,233 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * TypeHolderExample - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class TypeHolderExample { - - @JsonProperty("string_item") - private String stringItem; - - @JsonProperty("number_item") - private BigDecimal numberItem; - - @JsonProperty("float_item") - private Float floatItem; - - @JsonProperty("integer_item") - private Integer integerItem; - - @JsonProperty("bool_item") - private Boolean boolItem; - - @JsonProperty("array_item") - @Valid - private List arrayItem = new ArrayList<>(); - - /** - * Default constructor - * @deprecated Use {@link TypeHolderExample#TypeHolderExample(String, BigDecimal, Float, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderExample() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderExample(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.floatItem = floatItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - - public TypeHolderExample stringItem(String stringItem) { - this.stringItem = stringItem; - return this; - } - - /** - * Get stringItem - * @return stringItem - */ - @NotNull - @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) - public String getStringItem() { - return stringItem; - } - - public void setStringItem(String stringItem) { - this.stringItem = stringItem; - } - - public TypeHolderExample numberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - return this; - } - - /** - * Get numberItem - * @return numberItem - */ - @NotNull @Valid - @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) - public BigDecimal getNumberItem() { - return numberItem; - } - - public void setNumberItem(BigDecimal numberItem) { - this.numberItem = numberItem; - } - - public TypeHolderExample floatItem(Float floatItem) { - this.floatItem = floatItem; - return this; - } - - /** - * Get floatItem - * @return floatItem - */ - @NotNull - @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) - public Float getFloatItem() { - return floatItem; - } - - public void setFloatItem(Float floatItem) { - this.floatItem = floatItem; - } - - public TypeHolderExample integerItem(Integer integerItem) { - this.integerItem = integerItem; - return this; - } - - /** - * Get integerItem - * @return integerItem - */ - @NotNull - @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) - public Integer getIntegerItem() { - return integerItem; - } - - public void setIntegerItem(Integer integerItem) { - this.integerItem = integerItem; - } - - public TypeHolderExample boolItem(Boolean boolItem) { - this.boolItem = boolItem; - return this; - } - - /** - * Get boolItem - * @return boolItem - */ - @NotNull - @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) - public Boolean getBoolItem() { - return boolItem; - } - - public void setBoolItem(Boolean boolItem) { - this.boolItem = boolItem; - } - - public TypeHolderExample arrayItem(List arrayItem) { - this.arrayItem = arrayItem; - return this; - } - - public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { - this.arrayItem.add(arrayItemItem); - return this; - } - - /** - * Get arrayItem - * @return arrayItem - */ - @NotNull - @Schema(name = "array_item", example = "[0, 1, 2, 3]", requiredMode = Schema.RequiredMode.REQUIRED) - public List getArrayItem() { - return arrayItem; - } - - public void setArrayItem(List arrayItem) { - this.arrayItem = arrayItem; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TypeHolderExample typeHolderExample = (TypeHolderExample) o; - return Objects.equals(this.stringItem, typeHolderExample.stringItem) && - Objects.equals(this.numberItem, typeHolderExample.numberItem) && - Objects.equals(this.floatItem, typeHolderExample.floatItem) && - Objects.equals(this.integerItem, typeHolderExample.integerItem) && - Objects.equals(this.boolItem, typeHolderExample.boolItem) && - Objects.equals(this.arrayItem, typeHolderExample.arrayItem); - } - - @Override - public int hashCode() { - return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class TypeHolderExample {\n"); - sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n"); - sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n"); - sb.append(" floatItem: ").append(toIndentedString(floatItem)).append("\n"); - sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n"); - sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n"); - sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java deleted file mode 100644 index e09df9be7b7..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ /dev/null @@ -1,251 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * User - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class User { - - @JsonProperty("id") - private Long id; - - @JsonProperty("username") - private String username; - - @JsonProperty("firstName") - private String firstName; - - @JsonProperty("lastName") - private String lastName; - - @JsonProperty("email") - private String email; - - @JsonProperty("password") - private String password; - - @JsonProperty("phone") - private String phone; - - @JsonProperty("userStatus") - private Integer userStatus; - - public User id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public User username(String username) { - this.username = username; - return this; - } - - /** - * Get username - * @return username - */ - - @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public User firstName(String firstName) { - this.firstName = firstName; - return this; - } - - /** - * Get firstName - * @return firstName - */ - - @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public User lastName(String lastName) { - this.lastName = lastName; - return this; - } - - /** - * Get lastName - * @return lastName - */ - - @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public User email(String email) { - this.email = email; - return this; - } - - /** - * Get email - * @return email - */ - - @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public User password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - - @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public User phone(String phone) { - this.phone = phone; - return this; - } - - /** - * Get phone - * @return phone - */ - - @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public User userStatus(Integer userStatus) { - this.userStatus = userStatus; - return this; - } - - /** - * User Status - * @return userStatus - */ - - @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getUserStatus() { - return userStatus; - } - - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - User user = (User) o; - return Objects.equals(this.id, user.id) && - Objects.equals(this.username, user.username) && - Objects.equals(this.firstName, user.firstName) && - Objects.equals(this.lastName, user.lastName) && - Objects.equals(this.email, user.email) && - Objects.equals(this.password, user.password) && - Objects.equals(this.phone, user.phone) && - Objects.equals(this.userStatus, user.userStatus); - } - - @Override - public int hashCode() { - return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" username: ").append(toIndentedString(username)).append("\n"); - sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); - sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); - sb.append(" email: ").append(toIndentedString(email)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); - sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java deleted file mode 100644 index 1a4455cdaa8..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ /dev/null @@ -1,839 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * XmlItem - */ - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class XmlItem { - - @JsonProperty("attribute_string") - private String attributeString; - - @JsonProperty("attribute_number") - private BigDecimal attributeNumber; - - @JsonProperty("attribute_integer") - private Integer attributeInteger; - - @JsonProperty("attribute_boolean") - private Boolean attributeBoolean; - - @JsonProperty("wrapped_array") - @Valid - private List wrappedArray = null; - - @JsonProperty("name_string") - private String nameString; - - @JsonProperty("name_number") - private BigDecimal nameNumber; - - @JsonProperty("name_integer") - private Integer nameInteger; - - @JsonProperty("name_boolean") - private Boolean nameBoolean; - - @JsonProperty("name_array") - @Valid - private List nameArray = null; - - @JsonProperty("name_wrapped_array") - @Valid - private List nameWrappedArray = null; - - @JsonProperty("prefix_string") - private String prefixString; - - @JsonProperty("prefix_number") - private BigDecimal prefixNumber; - - @JsonProperty("prefix_integer") - private Integer prefixInteger; - - @JsonProperty("prefix_boolean") - private Boolean prefixBoolean; - - @JsonProperty("prefix_array") - @Valid - private List prefixArray = null; - - @JsonProperty("prefix_wrapped_array") - @Valid - private List prefixWrappedArray = null; - - @JsonProperty("namespace_string") - private String namespaceString; - - @JsonProperty("namespace_number") - private BigDecimal namespaceNumber; - - @JsonProperty("namespace_integer") - private Integer namespaceInteger; - - @JsonProperty("namespace_boolean") - private Boolean namespaceBoolean; - - @JsonProperty("namespace_array") - @Valid - private List namespaceArray = null; - - @JsonProperty("namespace_wrapped_array") - @Valid - private List namespaceWrappedArray = null; - - @JsonProperty("prefix_ns_string") - private String prefixNsString; - - @JsonProperty("prefix_ns_number") - private BigDecimal prefixNsNumber; - - @JsonProperty("prefix_ns_integer") - private Integer prefixNsInteger; - - @JsonProperty("prefix_ns_boolean") - private Boolean prefixNsBoolean; - - @JsonProperty("prefix_ns_array") - @Valid - private List prefixNsArray = null; - - @JsonProperty("prefix_ns_wrapped_array") - @Valid - private List prefixNsWrappedArray = null; - - public XmlItem attributeString(String attributeString) { - this.attributeString = attributeString; - return this; - } - - /** - * Get attributeString - * @return attributeString - */ - - @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getAttributeString() { - return attributeString; - } - - public void setAttributeString(String attributeString) { - this.attributeString = attributeString; - } - - public XmlItem attributeNumber(BigDecimal attributeNumber) { - this.attributeNumber = attributeNumber; - return this; - } - - /** - * Get attributeNumber - * @return attributeNumber - */ - @Valid - @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getAttributeNumber() { - return attributeNumber; - } - - public void setAttributeNumber(BigDecimal attributeNumber) { - this.attributeNumber = attributeNumber; - } - - public XmlItem attributeInteger(Integer attributeInteger) { - this.attributeInteger = attributeInteger; - return this; - } - - /** - * Get attributeInteger - * @return attributeInteger - */ - - @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getAttributeInteger() { - return attributeInteger; - } - - public void setAttributeInteger(Integer attributeInteger) { - this.attributeInteger = attributeInteger; - } - - public XmlItem attributeBoolean(Boolean attributeBoolean) { - this.attributeBoolean = attributeBoolean; - return this; - } - - /** - * Get attributeBoolean - * @return attributeBoolean - */ - - @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getAttributeBoolean() { - return attributeBoolean; - } - - public void setAttributeBoolean(Boolean attributeBoolean) { - this.attributeBoolean = attributeBoolean; - } - - public XmlItem wrappedArray(List wrappedArray) { - this.wrappedArray = wrappedArray; - return this; - } - - public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { - if (this.wrappedArray == null) { - this.wrappedArray = new ArrayList<>(); - } - this.wrappedArray.add(wrappedArrayItem); - return this; - } - - /** - * Get wrappedArray - * @return wrappedArray - */ - - @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getWrappedArray() { - return wrappedArray; - } - - public void setWrappedArray(List wrappedArray) { - this.wrappedArray = wrappedArray; - } - - public XmlItem nameString(String nameString) { - this.nameString = nameString; - return this; - } - - /** - * Get nameString - * @return nameString - */ - - @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getNameString() { - return nameString; - } - - public void setNameString(String nameString) { - this.nameString = nameString; - } - - public XmlItem nameNumber(BigDecimal nameNumber) { - this.nameNumber = nameNumber; - return this; - } - - /** - * Get nameNumber - * @return nameNumber - */ - @Valid - @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getNameNumber() { - return nameNumber; - } - - public void setNameNumber(BigDecimal nameNumber) { - this.nameNumber = nameNumber; - } - - public XmlItem nameInteger(Integer nameInteger) { - this.nameInteger = nameInteger; - return this; - } - - /** - * Get nameInteger - * @return nameInteger - */ - - @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getNameInteger() { - return nameInteger; - } - - public void setNameInteger(Integer nameInteger) { - this.nameInteger = nameInteger; - } - - public XmlItem nameBoolean(Boolean nameBoolean) { - this.nameBoolean = nameBoolean; - return this; - } - - /** - * Get nameBoolean - * @return nameBoolean - */ - - @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getNameBoolean() { - return nameBoolean; - } - - public void setNameBoolean(Boolean nameBoolean) { - this.nameBoolean = nameBoolean; - } - - public XmlItem nameArray(List nameArray) { - this.nameArray = nameArray; - return this; - } - - public XmlItem addNameArrayItem(Integer nameArrayItem) { - if (this.nameArray == null) { - this.nameArray = new ArrayList<>(); - } - this.nameArray.add(nameArrayItem); - return this; - } - - /** - * Get nameArray - * @return nameArray - */ - - @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNameArray() { - return nameArray; - } - - public void setNameArray(List nameArray) { - this.nameArray = nameArray; - } - - public XmlItem nameWrappedArray(List nameWrappedArray) { - this.nameWrappedArray = nameWrappedArray; - return this; - } - - public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { - if (this.nameWrappedArray == null) { - this.nameWrappedArray = new ArrayList<>(); - } - this.nameWrappedArray.add(nameWrappedArrayItem); - return this; - } - - /** - * Get nameWrappedArray - * @return nameWrappedArray - */ - - @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNameWrappedArray() { - return nameWrappedArray; - } - - public void setNameWrappedArray(List nameWrappedArray) { - this.nameWrappedArray = nameWrappedArray; - } - - public XmlItem prefixString(String prefixString) { - this.prefixString = prefixString; - return this; - } - - /** - * Get prefixString - * @return prefixString - */ - - @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPrefixString() { - return prefixString; - } - - public void setPrefixString(String prefixString) { - this.prefixString = prefixString; - } - - public XmlItem prefixNumber(BigDecimal prefixNumber) { - this.prefixNumber = prefixNumber; - return this; - } - - /** - * Get prefixNumber - * @return prefixNumber - */ - @Valid - @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getPrefixNumber() { - return prefixNumber; - } - - public void setPrefixNumber(BigDecimal prefixNumber) { - this.prefixNumber = prefixNumber; - } - - public XmlItem prefixInteger(Integer prefixInteger) { - this.prefixInteger = prefixInteger; - return this; - } - - /** - * Get prefixInteger - * @return prefixInteger - */ - - @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getPrefixInteger() { - return prefixInteger; - } - - public void setPrefixInteger(Integer prefixInteger) { - this.prefixInteger = prefixInteger; - } - - public XmlItem prefixBoolean(Boolean prefixBoolean) { - this.prefixBoolean = prefixBoolean; - return this; - } - - /** - * Get prefixBoolean - * @return prefixBoolean - */ - - @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getPrefixBoolean() { - return prefixBoolean; - } - - public void setPrefixBoolean(Boolean prefixBoolean) { - this.prefixBoolean = prefixBoolean; - } - - public XmlItem prefixArray(List prefixArray) { - this.prefixArray = prefixArray; - return this; - } - - public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { - if (this.prefixArray == null) { - this.prefixArray = new ArrayList<>(); - } - this.prefixArray.add(prefixArrayItem); - return this; - } - - /** - * Get prefixArray - * @return prefixArray - */ - - @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixArray() { - return prefixArray; - } - - public void setPrefixArray(List prefixArray) { - this.prefixArray = prefixArray; - } - - public XmlItem prefixWrappedArray(List prefixWrappedArray) { - this.prefixWrappedArray = prefixWrappedArray; - return this; - } - - public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { - if (this.prefixWrappedArray == null) { - this.prefixWrappedArray = new ArrayList<>(); - } - this.prefixWrappedArray.add(prefixWrappedArrayItem); - return this; - } - - /** - * Get prefixWrappedArray - * @return prefixWrappedArray - */ - - @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixWrappedArray() { - return prefixWrappedArray; - } - - public void setPrefixWrappedArray(List prefixWrappedArray) { - this.prefixWrappedArray = prefixWrappedArray; - } - - public XmlItem namespaceString(String namespaceString) { - this.namespaceString = namespaceString; - return this; - } - - /** - * Get namespaceString - * @return namespaceString - */ - - @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getNamespaceString() { - return namespaceString; - } - - public void setNamespaceString(String namespaceString) { - this.namespaceString = namespaceString; - } - - public XmlItem namespaceNumber(BigDecimal namespaceNumber) { - this.namespaceNumber = namespaceNumber; - return this; - } - - /** - * Get namespaceNumber - * @return namespaceNumber - */ - @Valid - @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getNamespaceNumber() { - return namespaceNumber; - } - - public void setNamespaceNumber(BigDecimal namespaceNumber) { - this.namespaceNumber = namespaceNumber; - } - - public XmlItem namespaceInteger(Integer namespaceInteger) { - this.namespaceInteger = namespaceInteger; - return this; - } - - /** - * Get namespaceInteger - * @return namespaceInteger - */ - - @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getNamespaceInteger() { - return namespaceInteger; - } - - public void setNamespaceInteger(Integer namespaceInteger) { - this.namespaceInteger = namespaceInteger; - } - - public XmlItem namespaceBoolean(Boolean namespaceBoolean) { - this.namespaceBoolean = namespaceBoolean; - return this; - } - - /** - * Get namespaceBoolean - * @return namespaceBoolean - */ - - @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getNamespaceBoolean() { - return namespaceBoolean; - } - - public void setNamespaceBoolean(Boolean namespaceBoolean) { - this.namespaceBoolean = namespaceBoolean; - } - - public XmlItem namespaceArray(List namespaceArray) { - this.namespaceArray = namespaceArray; - return this; - } - - public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { - if (this.namespaceArray == null) { - this.namespaceArray = new ArrayList<>(); - } - this.namespaceArray.add(namespaceArrayItem); - return this; - } - - /** - * Get namespaceArray - * @return namespaceArray - */ - - @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNamespaceArray() { - return namespaceArray; - } - - public void setNamespaceArray(List namespaceArray) { - this.namespaceArray = namespaceArray; - } - - public XmlItem namespaceWrappedArray(List namespaceWrappedArray) { - this.namespaceWrappedArray = namespaceWrappedArray; - return this; - } - - public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { - if (this.namespaceWrappedArray == null) { - this.namespaceWrappedArray = new ArrayList<>(); - } - this.namespaceWrappedArray.add(namespaceWrappedArrayItem); - return this; - } - - /** - * Get namespaceWrappedArray - * @return namespaceWrappedArray - */ - - @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getNamespaceWrappedArray() { - return namespaceWrappedArray; - } - - public void setNamespaceWrappedArray(List namespaceWrappedArray) { - this.namespaceWrappedArray = namespaceWrappedArray; - } - - public XmlItem prefixNsString(String prefixNsString) { - this.prefixNsString = prefixNsString; - return this; - } - - /** - * Get prefixNsString - * @return prefixNsString - */ - - @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String getPrefixNsString() { - return prefixNsString; - } - - public void setPrefixNsString(String prefixNsString) { - this.prefixNsString = prefixNsString; - } - - public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { - this.prefixNsNumber = prefixNsNumber; - return this; - } - - /** - * Get prefixNsNumber - * @return prefixNsNumber - */ - @Valid - @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public BigDecimal getPrefixNsNumber() { - return prefixNsNumber; - } - - public void setPrefixNsNumber(BigDecimal prefixNsNumber) { - this.prefixNsNumber = prefixNsNumber; - } - - public XmlItem prefixNsInteger(Integer prefixNsInteger) { - this.prefixNsInteger = prefixNsInteger; - return this; - } - - /** - * Get prefixNsInteger - * @return prefixNsInteger - */ - - @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Integer getPrefixNsInteger() { - return prefixNsInteger; - } - - public void setPrefixNsInteger(Integer prefixNsInteger) { - this.prefixNsInteger = prefixNsInteger; - } - - public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { - this.prefixNsBoolean = prefixNsBoolean; - return this; - } - - /** - * Get prefixNsBoolean - * @return prefixNsBoolean - */ - - @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Boolean getPrefixNsBoolean() { - return prefixNsBoolean; - } - - public void setPrefixNsBoolean(Boolean prefixNsBoolean) { - this.prefixNsBoolean = prefixNsBoolean; - } - - public XmlItem prefixNsArray(List prefixNsArray) { - this.prefixNsArray = prefixNsArray; - return this; - } - - public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { - if (this.prefixNsArray == null) { - this.prefixNsArray = new ArrayList<>(); - } - this.prefixNsArray.add(prefixNsArrayItem); - return this; - } - - /** - * Get prefixNsArray - * @return prefixNsArray - */ - - @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixNsArray() { - return prefixNsArray; - } - - public void setPrefixNsArray(List prefixNsArray) { - this.prefixNsArray = prefixNsArray; - } - - public XmlItem prefixNsWrappedArray(List prefixNsWrappedArray) { - this.prefixNsWrappedArray = prefixNsWrappedArray; - return this; - } - - public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { - if (this.prefixNsWrappedArray == null) { - this.prefixNsWrappedArray = new ArrayList<>(); - } - this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); - return this; - } - - /** - * Get prefixNsWrappedArray - * @return prefixNsWrappedArray - */ - - @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public List getPrefixNsWrappedArray() { - return prefixNsWrappedArray; - } - - public void setPrefixNsWrappedArray(List prefixNsWrappedArray) { - this.prefixNsWrappedArray = prefixNsWrappedArray; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - XmlItem xmlItem = (XmlItem) o; - return Objects.equals(this.attributeString, xmlItem.attributeString) && - Objects.equals(this.attributeNumber, xmlItem.attributeNumber) && - Objects.equals(this.attributeInteger, xmlItem.attributeInteger) && - Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) && - Objects.equals(this.wrappedArray, xmlItem.wrappedArray) && - Objects.equals(this.nameString, xmlItem.nameString) && - Objects.equals(this.nameNumber, xmlItem.nameNumber) && - Objects.equals(this.nameInteger, xmlItem.nameInteger) && - Objects.equals(this.nameBoolean, xmlItem.nameBoolean) && - Objects.equals(this.nameArray, xmlItem.nameArray) && - Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) && - Objects.equals(this.prefixString, xmlItem.prefixString) && - Objects.equals(this.prefixNumber, xmlItem.prefixNumber) && - Objects.equals(this.prefixInteger, xmlItem.prefixInteger) && - Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) && - Objects.equals(this.prefixArray, xmlItem.prefixArray) && - Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) && - Objects.equals(this.namespaceString, xmlItem.namespaceString) && - Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) && - Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) && - Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) && - Objects.equals(this.namespaceArray, xmlItem.namespaceArray) && - Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) && - Objects.equals(this.prefixNsString, xmlItem.prefixNsString) && - Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) && - Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) && - Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) && - Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) && - Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray); - } - - @Override - public int hashCode() { - return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class XmlItem {\n"); - sb.append(" attributeString: ").append(toIndentedString(attributeString)).append("\n"); - sb.append(" attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n"); - sb.append(" attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n"); - sb.append(" attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n"); - sb.append(" wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n"); - sb.append(" nameString: ").append(toIndentedString(nameString)).append("\n"); - sb.append(" nameNumber: ").append(toIndentedString(nameNumber)).append("\n"); - sb.append(" nameInteger: ").append(toIndentedString(nameInteger)).append("\n"); - sb.append(" nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n"); - sb.append(" nameArray: ").append(toIndentedString(nameArray)).append("\n"); - sb.append(" nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n"); - sb.append(" prefixString: ").append(toIndentedString(prefixString)).append("\n"); - sb.append(" prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n"); - sb.append(" prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n"); - sb.append(" prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n"); - sb.append(" prefixArray: ").append(toIndentedString(prefixArray)).append("\n"); - sb.append(" prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n"); - sb.append(" namespaceString: ").append(toIndentedString(namespaceString)).append("\n"); - sb.append(" namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n"); - sb.append(" namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n"); - sb.append(" namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n"); - sb.append(" namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n"); - sb.append(" namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n"); - sb.append(" prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n"); - sb.append(" prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n"); - sb.append(" prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n"); - sb.append(" prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n"); - sb.append(" prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n"); - sb.append(" prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/application.properties b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/application.properties deleted file mode 100644 index 9d06609db66..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/application.properties +++ /dev/null @@ -1,3 +0,0 @@ -server.port=80 -spring.jackson.date-format=org.openapitools.RFC3339DateFormat -spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml deleted file mode 100644 index 658d8a96b30..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ /dev/null @@ -1,2285 +0,0 @@ -openapi: 3.0.1 -info: - description: "This spec is mainly for testing Petstore server and contains fake\ - \ endpoints, models. Please do not use this for any other purpose. Special characters:\ - \ \" \\" - license: - name: Apache-2.0 - url: https://www.apache.org/licenses/LICENSE-2.0.html - title: OpenAPI Petstore - version: 1.0.0 -servers: -- url: http://petstore.swagger.io:80/v2 -tags: -- description: Everything about your Pets - name: pet -- description: Access to Petstore orders - name: store -- description: Operations about user - name: user -paths: - /pet: - post: - operationId: addPet - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true - responses: - "200": - content: {} - description: successful operation - "405": - content: {} - description: Invalid input - security: - - petstore_auth: - - write:pets - - read:pets - summary: Add a new pet to the store - tags: - - pet - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: pet - put: - operationId: updatePet - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true - responses: - "200": - content: {} - description: successful operation - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Pet not found - "405": - content: {} - description: Validation exception - security: - - petstore_auth: - - write:pets - - read:pets - summary: Update an existing pet - tags: - - pet - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: pet - /pet/findByStatus: - get: - description: Multiple status values can be provided with comma separated strings - operationId: findPetsByStatus - parameters: - - description: Status values that need to be considered for filter - explode: false - in: query - name: status - required: true - schema: - items: - default: available - enum: - - available - - pending - - sold - type: string - type: array - style: form - responses: - "200": - content: - application/xml: - schema: - items: - $ref: '#/components/schemas/Pet' - type: array - application/json: - schema: - items: - $ref: '#/components/schemas/Pet' - type: array - description: successful operation - "400": - content: {} - description: Invalid status value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Finds Pets by status - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - /pet/findByTags: - get: - deprecated: true - description: "Multiple tags can be provided with comma separated strings. Use\ - \ tag1, tag2, tag3 for testing." - operationId: findPetsByTags - parameters: - - description: Tags to filter by - explode: false - in: query - name: tags - required: true - schema: - items: - type: string - type: array - uniqueItems: true - style: form - responses: - "200": - content: - application/xml: - schema: - items: - $ref: '#/components/schemas/Pet' - type: array - uniqueItems: true - application/json: - schema: - items: - $ref: '#/components/schemas/Pet' - type: array - uniqueItems: true - description: successful operation - "400": - content: {} - description: Invalid tag value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Finds Pets by tags - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - /pet/{petId}: - delete: - operationId: deletePet - parameters: - - in: header - name: api_key - schema: - type: string - - description: Pet id to delete - in: path - name: petId - required: true - schema: - format: int64 - type: integer - responses: - "200": - content: {} - description: successful operation - "400": - content: {} - description: Invalid pet value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Deletes a pet - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - get: - description: Returns a single pet - operationId: getPetById - parameters: - - description: ID of pet to return - in: path - name: petId - required: true - schema: - format: int64 - type: integer - responses: - "200": - content: - application/xml: - schema: - $ref: '#/components/schemas/Pet' - application/json: - schema: - $ref: '#/components/schemas/Pet' - description: successful operation - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Pet not found - security: - - api_key: [] - summary: Find pet by ID - tags: - - pet - x-accepts: application/json - x-tags: - - tag: pet - post: - operationId: updatePetWithForm - parameters: - - description: ID of pet that needs to be updated - in: path - name: petId - required: true - schema: - format: int64 - type: integer - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: '#/components/schemas/updatePetWithForm_request' - responses: - "405": - content: {} - description: Invalid input - security: - - petstore_auth: - - write:pets - - read:pets - summary: Updates a pet in the store with form data - tags: - - pet - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: pet - /pet/{petId}/uploadImage: - post: - operationId: uploadFile - parameters: - - description: ID of pet to update - in: path - name: petId - required: true - schema: - format: int64 - type: integer - requestBody: - content: - multipart/form-data: - schema: - $ref: '#/components/schemas/uploadFile_request' - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/ApiResponse' - description: successful operation - security: - - petstore_auth: - - write:pets - - read:pets - summary: uploads an image - tags: - - pet - x-content-type: multipart/form-data - x-accepts: application/json - x-tags: - - tag: pet - /store/inventory: - get: - description: Returns a map of status codes to quantities - operationId: getInventory - responses: - "200": - content: - application/json: - schema: - additionalProperties: - format: int32 - type: integer - type: object - description: successful operation - security: - - api_key: [] - summary: Returns pet inventories by status - tags: - - store - x-accepts: application/json - x-tags: - - tag: store - /store/order: - post: - operationId: placeOrder - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/Order' - description: order placed for purchasing the pet - required: true - responses: - "200": - content: - application/xml: - schema: - $ref: '#/components/schemas/Order' - application/json: - schema: - $ref: '#/components/schemas/Order' - description: successful operation - "400": - content: {} - description: Invalid Order - summary: Place an order for a pet - tags: - - store - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: store - /store/order/{order_id}: - delete: - description: For valid response try integer IDs with value < 1000. Anything - above 1000 or nonintegers will generate API errors - operationId: deleteOrder - parameters: - - description: ID of the order that needs to be deleted - in: path - name: order_id - required: true - schema: - type: string - responses: - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Order not found - summary: Delete purchase order by ID - tags: - - store - x-accepts: application/json - x-tags: - - tag: store - get: - description: For valid response try integer IDs with value <= 5 or > 10. Other - values will generate exceptions - operationId: getOrderById - parameters: - - description: ID of pet that needs to be fetched - in: path - name: order_id - required: true - schema: - format: int64 - maximum: 5 - minimum: 1 - type: integer - responses: - "200": - content: - application/xml: - schema: - $ref: '#/components/schemas/Order' - application/json: - schema: - $ref: '#/components/schemas/Order' - description: successful operation - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Order not found - summary: Find purchase order by ID - tags: - - store - x-accepts: application/json - x-tags: - - tag: store - /user: - post: - description: This can only be done by the logged in user. - operationId: createUser - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/User' - description: Created user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Create user - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user - /user/createWithArray: - post: - operationId: createUsersWithArrayInput - requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Creates list of users with given input array - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user - /user/createWithList: - post: - operationId: createUsersWithListInput - requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Creates list of users with given input array - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user - /user/login: - get: - operationId: loginUser - parameters: - - description: The user name for login - in: query - name: username - required: true - schema: - type: string - - description: The password for login in clear text - in: query - name: password - required: true - schema: - type: string - responses: - "200": - content: - application/xml: - schema: - type: string - application/json: - schema: - type: string - description: successful operation - headers: - X-Rate-Limit: - description: calls per hour allowed by the user - schema: - format: int32 - type: integer - X-Expires-After: - description: date in UTC when token expires - schema: - format: date-time - type: string - "400": - content: {} - description: Invalid username/password supplied - summary: Logs user into the system - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - /user/logout: - get: - operationId: logoutUser - responses: - default: - content: {} - description: successful operation - summary: Logs out current logged in user session - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - /user/{username}: - delete: - description: This can only be done by the logged in user. - operationId: deleteUser - parameters: - - description: The name that needs to be deleted - in: path - name: username - required: true - schema: - type: string - responses: - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - summary: Delete user - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - get: - operationId: getUserByName - parameters: - - description: The name that needs to be fetched. Use user1 for testing. - in: path - name: username - required: true - schema: - type: string - responses: - "200": - content: - application/xml: - schema: - $ref: '#/components/schemas/User' - application/json: - schema: - $ref: '#/components/schemas/User' - description: successful operation - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - summary: Get user by user name - tags: - - user - x-accepts: application/json - x-tags: - - tag: user - put: - description: This can only be done by the logged in user. - operationId: updateUser - parameters: - - description: name that need to be deleted - in: path - name: username - required: true - schema: - type: string - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/User' - description: Updated user object - required: true - responses: - "400": - content: {} - description: Invalid user supplied - "404": - content: {} - description: User not found - summary: Updated user - tags: - - user - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: application/json - x-tags: - - tag: user - /fake_classname_test: - patch: - description: To test class name in snake case - operationId: testClassname - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: successful operation - security: - - api_key_query: [] - summary: To test class name in snake case - tags: - - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake_classname_tags 123#$%^ - /fake: - delete: - description: Fake endpoint to test group parameters (optional) - operationId: testGroupParameters - parameters: - - description: Required String in group parameters - in: query - name: required_string_group - required: true - schema: - type: integer - - description: Required Boolean in group parameters - in: header - name: required_boolean_group - required: true - schema: - type: boolean - - description: Required Integer in group parameters - in: query - name: required_int64_group - required: true - schema: - format: int64 - type: integer - - description: String in group parameters - in: query - name: string_group - schema: - type: integer - - description: Boolean in group parameters - in: header - name: boolean_group - schema: - type: boolean - - description: Integer in group parameters - in: query - name: int64_group - schema: - format: int64 - type: integer - responses: - "400": - content: {} - description: Something wrong - summary: Fake endpoint to test group parameters (optional) - tags: - - fake - x-group-parameters: true - x-accepts: application/json - x-tags: - - tag: fake - get: - description: To test enum parameters - operationId: testEnumParameters - parameters: - - description: Header parameter enum test (string array) - explode: false - in: header - name: enum_header_string_array - schema: - items: - default: $ - enum: - - '>' - - $ - type: string - type: array - style: simple - - description: Header parameter enum test (string) - in: header - name: enum_header_string - schema: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string - - description: Query parameter enum test (string array) - explode: false - in: query - name: enum_query_string_array - schema: - items: - default: $ - enum: - - '>' - - $ - type: string - type: array - style: form - - description: Query parameter enum test (string) - in: query - name: enum_query_string - schema: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string - - description: Query parameter enum test (double) - in: query - name: enum_query_integer - schema: - enum: - - 1 - - -2 - format: int32 - type: integer - - description: Query parameter enum test (double) - in: query - name: enum_query_double - schema: - enum: - - 1.1 - - -1.2 - format: double - type: number - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: '#/components/schemas/testEnumParameters_request' - responses: - "400": - content: {} - description: Invalid request - "404": - content: {} - description: Not found - summary: To test enum parameters - tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake - patch: - description: To test "client" model - operationId: testClientModel - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: successful operation - summary: To test "client" model - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake - post: - description: |- - Fake endpoint for testing various parameters - 假端點 - 偽のエンドポイント - 가짜 엔드 포인트 - operationId: testEndpointParameters - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: '#/components/schemas/testEndpointParameters_request' - required: true - responses: - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - security: - - http_basic_test: [] - summary: |- - Fake endpoint for testing various parameters - 假端點 - 偽のエンドポイント - 가짜 엔드 포인트 - tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake - /fake/outer/number: - post: - description: Test serialization of outer number types - operationId: fakeOuterNumberSerialize - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterNumber' - description: Input number as post body - required: false - responses: - "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterNumber' - description: Output number - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake - /fake/outer/string: - post: - description: Test serialization of outer string types - operationId: fakeOuterStringSerialize - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterString' - description: Input string as post body - required: false - responses: - "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterString' - description: Output string - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake - /fake/outer/boolean: - post: - description: Test serialization of outer boolean types - operationId: fakeOuterBooleanSerialize - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterBoolean' - description: Input boolean as post body - required: false - responses: - "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterBoolean' - description: Output boolean - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake - /fake/outer/composite: - post: - description: Test serialization of object with outer number type - operationId: fakeOuterCompositeSerialize - requestBody: - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterComposite' - description: Input composite as post body - required: false - responses: - "200": - content: - '*/*': - schema: - $ref: '#/components/schemas/OuterComposite' - description: Output composite - tags: - - fake - x-codegen-request-body-name: body - x-content-type: '*/*' - x-accepts: '*/*' - x-tags: - - tag: fake - /fake/jsonFormData: - get: - operationId: testJsonFormData - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: '#/components/schemas/testJsonFormData_request' - required: true - responses: - "200": - content: {} - description: successful operation - summary: test json serialization of form data - tags: - - fake - x-content-type: application/x-www-form-urlencoded - x-accepts: application/json - x-tags: - - tag: fake - /fake/inline-additionalProperties: - post: - operationId: testInlineAdditionalProperties - requestBody: - content: - application/json: - schema: - additionalProperties: - type: string - type: object - description: request body - required: true - responses: - "200": - content: {} - description: successful operation - summary: test inline additionalProperties - tags: - - fake - x-codegen-request-body-name: param - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake - /fake/body-with-query-params: - put: - operationId: testBodyWithQueryParams - parameters: - - in: query - name: query - required: true - schema: - type: string - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/User' - required: true - responses: - "200": - content: {} - description: Success - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake - /fake/create_xml_item: - post: - description: this route creates an XmlItem - operationId: createXmlItem - requestBody: - content: - application/xml: - schema: - $ref: '#/components/schemas/XmlItem' - application/xml; charset=utf-8: - schema: - $ref: '#/components/schemas/XmlItem' - application/xml; charset=utf-16: - schema: - $ref: '#/components/schemas/XmlItem' - text/xml: - schema: - $ref: '#/components/schemas/XmlItem' - text/xml; charset=utf-8: - schema: - $ref: '#/components/schemas/XmlItem' - text/xml; charset=utf-16: - schema: - $ref: '#/components/schemas/XmlItem' - description: XmlItem Body - required: true - responses: - "200": - content: {} - description: successful operation - summary: creates an XmlItem - tags: - - fake - x-codegen-request-body-name: XmlItem - x-content-type: application/xml - x-accepts: application/json - x-tags: - - tag: fake - /another-fake/dummy: - patch: - description: To test special tags and operation ID starting with number - operationId: 123_test_@#$%_special_tags - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: successful operation - summary: To test special tags - tags: - - $another-fake? - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: $another-fake? - /fake/body-with-file-schema: - put: - description: "For this test, the body for this request much reference a schema\ - \ named `File`." - operationId: testBodyWithFileSchema - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/FileSchemaTestClass' - required: true - responses: - "200": - content: {} - description: Success - tags: - - fake - x-codegen-request-body-name: body - x-content-type: application/json - x-accepts: application/json - x-tags: - - tag: fake - /fake/test-query-parameters: - put: - description: To test the collection format in query parameters - operationId: testQueryParameterCollectionFormat - parameters: - - explode: false - in: query - name: pipe - required: true - schema: - items: - type: string - type: array - style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query - name: http - required: true - schema: - items: - type: string - type: array - style: spaceDelimited - - explode: false - in: query - name: url - required: true - schema: - items: - type: string - type: array - style: form - - explode: true - in: query - name: context - required: true - schema: - items: - type: string - type: array - style: form - responses: - "200": - content: {} - description: Success - tags: - - fake - x-accepts: application/json - x-tags: - - tag: fake - /fake/{petId}/uploadImageWithRequiredFile: - post: - operationId: uploadFileWithRequiredFile - parameters: - - description: ID of pet to update - in: path - name: petId - required: true - schema: - format: int64 - type: integer - requestBody: - content: - multipart/form-data: - schema: - $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/ApiResponse' - description: successful operation - security: - - petstore_auth: - - write:pets - - read:pets - summary: uploads an image (required) - tags: - - pet - x-content-type: multipart/form-data - x-accepts: application/json - x-tags: - - tag: pet -components: - schemas: - Order: - example: - petId: 6 - quantity: 1 - id: 0 - shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false - status: placed - properties: - id: - format: int64 - type: integer - petId: - format: int64 - type: integer - quantity: - format: int32 - type: integer - shipDate: - format: date-time - type: string - status: - description: Order Status - enum: - - placed - - approved - - delivered - type: string - complete: - default: false - type: boolean - type: object - xml: - name: Order - Category: - example: - name: default-name - id: 6 - properties: - id: - format: int64 - type: integer - name: - default: default-name - type: string - required: - - name - type: object - xml: - name: Category - User: - example: - firstName: firstName - lastName: lastName - password: password - userStatus: 6 - phone: phone - id: 0 - email: email - username: username - properties: - id: - format: int64 - type: integer - x-is-unique: true - username: - type: string - firstName: - type: string - lastName: - type: string - email: - type: string - password: - type: string - phone: - type: string - userStatus: - description: User Status - format: int32 - type: integer - type: object - xml: - name: User - Tag: - example: - name: name - id: 1 - properties: - id: - format: int64 - type: integer - name: - type: string - type: object - xml: - name: Tag - Pet: - example: - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 - category: - name: default-name - id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - properties: - id: - format: int64 - type: integer - x-is-unique: true - category: - $ref: '#/components/schemas/Category' - name: - example: doggie - type: string - photoUrls: - items: - type: string - type: array - uniqueItems: true - xml: - name: photoUrl - wrapped: true - tags: - items: - $ref: '#/components/schemas/Tag' - type: array - xml: - name: tag - wrapped: true - status: - description: pet status in the store - enum: - - available - - pending - - sold - type: string - required: - - name - - photoUrls - type: object - xml: - name: Pet - ApiResponse: - example: - code: 0 - type: type - message: message - properties: - code: - format: int32 - type: integer - type: - type: string - message: - type: string - type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" - Return: - description: Model for testing reserved words - properties: - return: - format: int32 - type: integer - type: object - xml: - name: Return - Name: - description: Model for testing model name same as property name - properties: - name: - format: int32 - type: integer - snake_case: - format: int32 - readOnly: true - type: integer - property: - type: string - "123Number": - readOnly: true - type: integer - required: - - name - type: object - xml: - name: Name - "200_response": - description: Model for testing model name starting with number - properties: - name: - format: int32 - type: integer - class: - type: string - type: object - xml: - name: Name - ClassModel: - description: Model for testing model with "_class" property - properties: - _class: - type: string - type: object - Dog: - allOf: - - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Dog_allOf' - Cat: - allOf: - - $ref: '#/components/schemas/Animal' - - $ref: '#/components/schemas/Cat_allOf' - BigCat: - allOf: - - $ref: '#/components/schemas/Cat' - - $ref: '#/components/schemas/BigCat_allOf' - Animal: - discriminator: - propertyName: className - properties: - className: - type: string - color: - default: red - type: string - required: - - className - type: object - AnimalFarm: - items: - $ref: '#/components/schemas/Animal' - type: array - format_test: - properties: - integer: - maximum: 100 - minimum: 10 - type: integer - int32: - format: int32 - maximum: 200 - minimum: 20 - type: integer - int64: - format: int64 - type: integer - number: - maximum: 543.2 - minimum: 32.1 - type: number - float: - format: float - maximum: 987.6 - minimum: 54.3 - type: number - double: - format: double - maximum: 123.4 - minimum: 67.8 - type: number - string: - pattern: "/[a-z]/i" - type: string - byte: - format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" - type: string - binary: - format: binary - type: string - date: - format: date - type: string - dateTime: - format: date-time - type: string - uuid: - example: 72f98069-206d-4f12-9f12-3d1e525a8e84 - format: uuid - type: string - password: - format: password - maxLength: 64 - minLength: 10 - type: string - BigDecimal: - format: number - type: string - required: - - byte - - date - - number - - password - type: object - EnumClass: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string - Enum_Test: - properties: - enum_string: - enum: - - UPPER - - lower - - "" - type: string - enum_string_required: - enum: - - UPPER - - lower - - "" - type: string - enum_integer: - enum: - - 1 - - -1 - format: int32 - type: integer - enum_number: - enum: - - 1.1 - - -1.2 - format: double - type: number - outerEnum: - $ref: '#/components/schemas/OuterEnum' - required: - - enum_string_required - type: object - AdditionalPropertiesClass: - properties: - map_string: - additionalProperties: - type: string - type: object - map_number: - additionalProperties: - type: number - type: object - map_integer: - additionalProperties: - type: integer - type: object - map_boolean: - additionalProperties: - type: boolean - type: object - map_array_integer: - additionalProperties: - items: - type: integer - type: array - type: object - map_array_anytype: - additionalProperties: - items: - properties: {} - type: object - type: array - type: object - map_map_string: - additionalProperties: - additionalProperties: - type: string - type: object - type: object - map_map_anytype: - additionalProperties: - additionalProperties: - properties: {} - type: object - type: object - type: object - anytype_1: - properties: {} - type: object - anytype_2: - type: object - anytype_3: - properties: {} - type: object - type: object - AdditionalPropertiesString: - additionalProperties: - type: string - properties: - name: - type: string - type: object - AdditionalPropertiesInteger: - additionalProperties: - type: integer - properties: - name: - type: string - type: object - AdditionalPropertiesNumber: - additionalProperties: - type: number - properties: - name: - type: string - type: object - AdditionalPropertiesBoolean: - additionalProperties: - type: boolean - properties: - name: - type: string - type: object - AdditionalPropertiesArray: - additionalProperties: - items: - properties: {} - type: object - type: array - properties: - name: - type: string - type: object - AdditionalPropertiesObject: - additionalProperties: - additionalProperties: - properties: {} - type: object - type: object - properties: - name: - type: string - type: object - AdditionalPropertiesAnyType: - additionalProperties: - properties: {} - type: object - properties: - name: - type: string - type: object - MixedPropertiesAndAdditionalPropertiesClass: - properties: - uuid: - format: uuid - type: string - dateTime: - format: date-time - type: string - map: - additionalProperties: - $ref: '#/components/schemas/Animal' - type: object - type: object - List: - properties: - "123-list": - type: string - type: object - Client: - example: - client: client - properties: - client: - type: string - type: object - ReadOnlyFirst: - properties: - bar: - readOnly: true - type: string - baz: - type: string - type: object - hasOnlyReadOnly: - properties: - bar: - readOnly: true - type: string - foo: - readOnly: true - type: string - type: object - Capitalization: - properties: - smallCamel: - type: string - CapitalCamel: - type: string - small_Snake: - type: string - Capital_Snake: - type: string - SCA_ETH_Flow_Points: - type: string - ATT_NAME: - description: | - Name of the pet - type: string - type: object - MapTest: - properties: - map_map_of_string: - additionalProperties: - additionalProperties: - type: string - type: object - type: object - map_of_enum_string: - additionalProperties: - enum: - - UPPER - - lower - type: string - type: object - direct_map: - additionalProperties: - type: boolean - type: object - indirect_map: - additionalProperties: - type: boolean - type: object - type: object - ArrayTest: - properties: - array_of_string: - items: - type: string - type: array - array_array_of_integer: - items: - items: - format: int64 - type: integer - type: array - type: array - array_array_of_model: - items: - items: - $ref: '#/components/schemas/ReadOnlyFirst' - type: array - type: array - type: object - NumberOnly: - properties: - JustNumber: - type: number - type: object - ArrayOfNumberOnly: - properties: - ArrayNumber: - items: - type: number - type: array - type: object - ArrayOfArrayOfNumberOnly: - properties: - ArrayArrayNumber: - items: - items: - type: number - type: array - type: array - type: object - EnumArrays: - properties: - just_symbol: - enum: - - '>=' - - $ - type: string - array_enum: - items: - enum: - - fish - - crab - type: string - type: array - type: object - OuterEnum: - enum: - - placed - - approved - - delivered - type: string - OuterComposite: - example: - my_string: my_string - my_number: 0.8008281904610115 - my_boolean: true - properties: - my_number: - type: number - my_string: - type: string - my_boolean: - type: boolean - x-codegen-body-parameter-name: boolean_post_body - type: object - OuterNumber: - type: number - OuterString: - type: string - OuterBoolean: - type: boolean - x-codegen-body-parameter-name: boolean_post_body - StringBooleanMap: - additionalProperties: - type: boolean - type: object - FileSchemaTestClass: - example: - file: - sourceURI: sourceURI - files: - - sourceURI: sourceURI - - sourceURI: sourceURI - properties: - file: - $ref: '#/components/schemas/File' - files: - items: - $ref: '#/components/schemas/File' - type: array - type: object - File: - description: Must be named `File` for test. - example: - sourceURI: sourceURI - properties: - sourceURI: - description: Test capitalization - type: string - type: object - TypeHolderDefault: - properties: - string_item: - default: what - type: string - number_item: - type: number - integer_item: - type: integer - bool_item: - default: true - type: boolean - array_item: - items: - type: integer - type: array - required: - - array_item - - bool_item - - integer_item - - number_item - - string_item - type: object - TypeHolderExample: - properties: - string_item: - example: what - type: string - number_item: - example: 1.234 - type: number - float_item: - example: 1.234 - format: float - type: number - integer_item: - example: -2 - type: integer - bool_item: - example: true - type: boolean - array_item: - example: - - 0 - - 1 - - 2 - - 3 - items: - type: integer - type: array - required: - - array_item - - bool_item - - float_item - - integer_item - - number_item - - string_item - type: object - XmlItem: - properties: - attribute_string: - example: string - type: string - xml: - attribute: true - attribute_number: - example: 1.234 - type: number - xml: - attribute: true - attribute_integer: - example: -2 - type: integer - xml: - attribute: true - attribute_boolean: - example: true - type: boolean - xml: - attribute: true - wrapped_array: - items: - type: integer - type: array - xml: - wrapped: true - name_string: - example: string - type: string - xml: - name: xml_name_string - name_number: - example: 1.234 - type: number - xml: - name: xml_name_number - name_integer: - example: -2 - type: integer - xml: - name: xml_name_integer - name_boolean: - example: true - type: boolean - xml: - name: xml_name_boolean - name_array: - items: - type: integer - xml: - name: xml_name_array_item - type: array - name_wrapped_array: - items: - type: integer - xml: - name: xml_name_wrapped_array_item - type: array - xml: - name: xml_name_wrapped_array - wrapped: true - prefix_string: - example: string - type: string - xml: - prefix: ab - prefix_number: - example: 1.234 - type: number - xml: - prefix: cd - prefix_integer: - example: -2 - type: integer - xml: - prefix: ef - prefix_boolean: - example: true - type: boolean - xml: - prefix: gh - prefix_array: - items: - type: integer - xml: - prefix: ij - type: array - prefix_wrapped_array: - items: - type: integer - xml: - prefix: mn - type: array - xml: - prefix: kl - wrapped: true - namespace_string: - example: string - type: string - xml: - namespace: http://a.com/schema - namespace_number: - example: 1.234 - type: number - xml: - namespace: http://b.com/schema - namespace_integer: - example: -2 - type: integer - xml: - namespace: http://c.com/schema - namespace_boolean: - example: true - type: boolean - xml: - namespace: http://d.com/schema - namespace_array: - items: - type: integer - xml: - namespace: http://e.com/schema - type: array - namespace_wrapped_array: - items: - type: integer - xml: - namespace: http://g.com/schema - type: array - xml: - namespace: http://f.com/schema - wrapped: true - prefix_ns_string: - example: string - type: string - xml: - namespace: http://a.com/schema - prefix: a - prefix_ns_number: - example: 1.234 - type: number - xml: - namespace: http://b.com/schema - prefix: b - prefix_ns_integer: - example: -2 - type: integer - xml: - namespace: http://c.com/schema - prefix: c - prefix_ns_boolean: - example: true - type: boolean - xml: - namespace: http://d.com/schema - prefix: d - prefix_ns_array: - items: - type: integer - xml: - namespace: http://e.com/schema - prefix: e - type: array - prefix_ns_wrapped_array: - items: - type: integer - xml: - namespace: http://g.com/schema - prefix: g - type: array - xml: - namespace: http://f.com/schema - prefix: f - wrapped: true - type: object - xml: - namespace: http://a.com/schema - prefix: pre - updatePetWithForm_request: - properties: - name: - description: Updated name of the pet - type: string - status: - description: Updated status of the pet - type: string - type: object - uploadFile_request: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - file: - description: file to upload - format: binary - type: string - type: object - testEnumParameters_request: - properties: - enum_form_string_array: - description: Form parameter enum test (string array) - items: - default: $ - enum: - - '>' - - $ - type: string - type: array - enum_form_string: - default: -efg - description: Form parameter enum test (string) - enum: - - _abc - - -efg - - (xyz) - type: string - type: object - testEndpointParameters_request: - properties: - integer: - description: None - format: int32 - maximum: 100 - minimum: 10 - type: integer - int32: - description: None - format: int32 - maximum: 200 - minimum: 20 - type: integer - int64: - description: None - format: int64 - type: integer - number: - description: None - maximum: 543.2 - minimum: 32.1 - type: number - float: - description: None - format: float - maximum: 987.6 - type: number - double: - description: None - format: double - maximum: 123.4 - minimum: 67.8 - type: number - string: - description: None - pattern: "/[a-z]/i" - type: string - pattern_without_delimiter: - description: None - pattern: "^[A-Z].*" - type: string - byte: - description: None - format: byte - type: string - binary: - description: None - format: binary - type: string - date: - description: None - format: date - type: string - dateTime: - description: None - format: date-time - type: string - password: - description: None - format: password - maxLength: 64 - minLength: 10 - type: string - callback: - description: None - type: string - required: - - byte - - double - - number - - pattern_without_delimiter - type: object - testJsonFormData_request: - properties: - param: - description: field1 - type: string - param2: - description: field2 - type: string - required: - - param - - param2 - type: object - uploadFileWithRequiredFile_request: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - requiredFile: - description: file to upload - format: binary - type: string - required: - - requiredFile - type: object - Dog_allOf: - properties: - breed: - type: string - type: object - example: null - Cat_allOf: - properties: - declawed: - type: boolean - type: object - example: null - BigCat_allOf: - properties: - kind: - enum: - - lions - - tigers - - leopards - - jaguars - type: string - type: object - example: null - securitySchemes: - petstore_auth: - flows: - implicit: - authorizationUrl: http://petstore.swagger.io/api/oauth/dialog - scopes: - write:pets: modify pets in your account - read:pets: read your pets - type: oauth2 - api_key: - in: header - name: api_key - type: apiKey - api_key_query: - in: query - name: api_key_query - type: apiKey - http_basic_test: - scheme: basic - type: http -x-original-swagger-version: "2.0" diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java b/samples/openapi3/server/petstore/springboot-useoptional/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java deleted file mode 100644 index 3681f67e770..00000000000 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openapitools; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class OpenApiGeneratorApplicationTests { - - @Test - void contextLoads() { - } - -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index ad48ebd85eb..ce65ccc5025 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java index bcdc28b161b..204aebc64be 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java @@ -55,7 +55,7 @@ public class Pet { @JsonProperty("tags") @JacksonXmlProperty(localName = "tag") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -178,6 +178,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES index 8bf287f9b1f..18561f6ffff 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES @@ -27,6 +27,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java index dca833f9ac9..0b3158a75f8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -41,7 +41,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -62,7 +62,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) ResponseEntity call123testSpecialTags( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index 8223c6747c0..66dfa30d774 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -93,7 +93,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -104,7 +105,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @Operation( @@ -120,10 +121,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) ResponseEntity fakeOuterCompositeSerialize( - @Parameter(name = "body", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) throws Exception; @@ -147,7 +149,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -174,7 +177,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -185,7 +189,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @Operation( @@ -202,7 +206,7 @@ public interface FakeApi { consumes = { "application/json" } ) ResponseEntity testBodyWithFileSchema( - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) throws Exception; @@ -210,7 +214,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @Operation( @@ -227,7 +231,7 @@ public interface FakeApi { ) ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) throws Exception; @@ -235,7 +239,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -256,7 +260,7 @@ public interface FakeApi { consumes = { "application/json" } ) ResponseEntity testClientModel( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) throws Exception; @@ -396,13 +400,15 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @Operation( operationId = "testInlineAdditionalProperties", summary = "test inline additionalProperties", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -414,12 +420,13 @@ public interface FakeApi { consumes = { "application/json" } ) ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) throws Exception; /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -428,6 +435,7 @@ public interface FakeApi { @Operation( operationId = "testJsonFormData", summary = "test json serialization of form data", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -449,7 +457,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -469,7 +476,6 @@ public interface FakeApi { ) ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context @@ -478,6 +484,7 @@ public interface FakeApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) @@ -487,6 +494,7 @@ public interface FakeApi { @Operation( operationId = "uploadFileWithRequiredFile", summary = "uploads an image (required)", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6a6991dc4c1..a2fcaf0975c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -41,7 +41,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @Operation( @@ -65,7 +65,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) ResponseEntity testClassname( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java index cae54689842..b7eda04884f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java @@ -41,14 +41,16 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @Operation( operationId = "addPet", summary = "Add a new pet to the store", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -64,12 +66,13 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -79,6 +82,7 @@ public interface PetApi { @Operation( operationId = "deletePet", summary = "Deletes a pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -206,8 +210,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -216,6 +221,7 @@ public interface PetApi { @Operation( operationId = "updatePet", summary = "Update an existing pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -233,12 +239,13 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -248,6 +255,7 @@ public interface PetApi { @Operation( operationId = "updatePetWithForm", summary = "Updates a pet in the store with form data", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "405", description = "Invalid input") @@ -270,6 +278,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -279,6 +288,7 @@ public interface PetApi { @Operation( operationId = "uploadFile", summary = "uploads an image", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java index d27402541d8..765bb98a312 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java @@ -130,14 +130,16 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @Operation( operationId = "placeOrder", summary = "Place an order for a pet", + description = "", tags = { "store" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -150,10 +152,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java index 8def3b33924..ba2922d98e2 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java @@ -43,7 +43,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @Operation( @@ -57,22 +57,25 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) throws Exception; /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithArrayInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -80,22 +83,25 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) throws Exception; /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithListInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -103,10 +109,11 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) throws Exception; @@ -139,6 +146,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -148,6 +156,7 @@ public interface UserApi { @Operation( operationId = "getUserByName", summary = "Get user by user name", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -170,6 +179,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -179,6 +189,7 @@ public interface UserApi { @Operation( operationId = "loginUser", summary = "Logs user into the system", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -201,12 +212,14 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @Operation( operationId = "logoutUser", summary = "Logs out current logged in user session", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -226,7 +239,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -242,11 +255,12 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) ResponseEntity updateUser( @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 14e13504a8c..66e0aed61c6 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -5,10 +5,13 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -27,41 +30,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -302,7 +305,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -312,11 +315,11 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -357,13 +360,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 42600354f74..ead205932fa 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 2f6c19a8344..7ab62ebdb8f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java index 23ee84ce8b5..4c5a142ddca 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..55d20539817 --- /dev/null +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,224 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java index 2720e81c227..696d07582b9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 8b196d5d7de..9b9f087aaa7 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java index 9811806e0c8..74cab2e2f8c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java @@ -26,7 +26,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -65,15 +65,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index bcf0155a1b2..d6b45daabd7 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java index 6adaaba97d7..3f4cf6872f2 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java index c3d3aa9182e..e0a16a7b89a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -53,8 +53,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java index 67ef036857d..12b55e21185 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -28,17 +28,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -142,6 +142,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java index 5b77bee14c1..8b74b97d38f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -165,6 +165,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -174,7 +177,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @Schema(name = "array_item", example = "[0, 1, 2, 3]", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java index 1a4455cdaa8..03f777866d6 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java index 06109fa9bea..71992dae886 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java @@ -37,7 +37,7 @@ public class ObjectWithUniqueItems { @JsonProperty("notNullSet") @Valid - private Set notNullSet = null; + private Set notNullSet = new LinkedHashSet<>(); @JsonProperty("nullList") @Valid @@ -45,7 +45,7 @@ public class ObjectWithUniqueItems { @JsonProperty("notNullList") @Valid - private List notNullList = null; + private List notNullList = new ArrayList<>(); @JsonProperty("notNullDateField") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index 60af3a5b92a..1f114e8f347 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -165,6 +165,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES index 3c2e959bec0..32921b847d0 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES @@ -38,6 +38,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml index 8995d90039c..8c874b16a53 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - org.openapitools + org.openapitools.openapi3 spring-boot-beanvalidation-no-nullable jar spring-boot-beanvalidation-no-nullable diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index b7316fe0b69..3fc76144032 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -35,7 +35,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -55,7 +55,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 6b7e3be326b..edf5c41ea0f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -90,7 +90,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -104,7 +105,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiOperation( @@ -120,10 +121,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -159,7 +161,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -189,7 +192,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -203,7 +207,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @ApiOperation( @@ -221,7 +225,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -232,7 +236,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @ApiOperation( @@ -251,7 +255,7 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -262,7 +266,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -282,7 +286,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -443,8 +447,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -462,7 +467,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -471,6 +476,7 @@ public interface FakeApi { /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -504,7 +510,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -525,7 +530,6 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context @@ -537,6 +541,7 @@ public interface FakeApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e2bb9e2400c..8d0ca9689bb 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -35,7 +35,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -58,7 +58,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index f81ce10fc92..1d418d2aced 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -35,8 +35,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -62,7 +63,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -71,6 +72,7 @@ public interface PetApi { /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -267,8 +269,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -298,7 +301,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -307,6 +310,7 @@ public interface PetApi { /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -345,6 +349,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 5e285e97c0d..4268160d16e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -145,8 +145,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -164,10 +165,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index fb1f0b0410e..1626c669d49 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -37,7 +37,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -51,10 +51,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -63,8 +64,9 @@ public interface UserApi { /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -78,10 +80,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -90,8 +93,9 @@ public interface UserApi { /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -105,10 +109,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +152,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -194,6 +200,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -227,6 +234,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -256,7 +264,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -272,11 +280,12 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 5f1460876f7..ccad3b7842e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -27,41 +27,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private Object anytype2 = null; @JsonProperty("anytype_3") private Object anytype3; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 8eb8b8652c9..29f12485a49 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index c5b92b31b9d..62ec18eb583 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index 0fb0d1f196d..e2d2fd53a51 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..193fbbcab33 --- /dev/null +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,210 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private List nullableArray; + + @JsonProperty("nullable_required_array") + @Valid + private List nullableRequiredArray; + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = nullableArray; + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null) { + this.nullableArray = new ArrayList<>(); + } + this.nullableArray.add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @ApiModelProperty(value = "") + public List getNullableArray() { + return nullableArray; + } + + public void setNullableArray(List nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null) { + this.nullableRequiredArray = new ArrayList<>(); + } + this.nullableRequiredArray.add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null) { + this.nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); + } + this.nullableArrayWithDefault.add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @ApiModelProperty(value = "") + public List getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return Objects.equals(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + Objects.equals(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + @Override + public int hashCode() { + return Objects.hash(nullableArray, nullableRequiredArray, requiredArray, nullableArrayWithDefault); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index 6ec78baa173..8a9c025c755 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index b233286eebc..9c38fb6815f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java index 7253ca7481e..909f43125d0 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java @@ -26,7 +26,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -65,15 +65,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index ba027c67881..ae7d7930f7e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index 51bf8f52196..67bb307f244 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java index 06b722ccf5f..5f1ed55d3d4 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -19,7 +19,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -53,8 +53,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index 00e1edd884b..ac1c34f7878 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -28,17 +28,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -143,7 +143,7 @@ public class TypeHolderDefault { public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { if (this.arrayItem == null) { - this.arrayItem = new ArrayList<>(); + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); } this.arrayItem.add(arrayItemItem); return this; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index ba77803deb7..ee14d628a10 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -177,7 +177,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index 98a5e28e4dc..560aad3e41f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES index d61b6cf83bf..9ecdb11614b 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES @@ -38,6 +38,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index b7316fe0b69..3fc76144032 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -35,7 +35,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -55,7 +55,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 6b7e3be326b..edf5c41ea0f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -90,7 +90,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -104,7 +105,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiOperation( @@ -120,10 +121,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -159,7 +161,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -189,7 +192,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -203,7 +207,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @ApiOperation( @@ -221,7 +225,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -232,7 +236,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @ApiOperation( @@ -251,7 +255,7 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -262,7 +266,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -282,7 +286,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -443,8 +447,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -462,7 +467,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -471,6 +476,7 @@ public interface FakeApi { /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -504,7 +510,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -525,7 +530,6 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context @@ -537,6 +541,7 @@ public interface FakeApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e2bb9e2400c..8d0ca9689bb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -35,7 +35,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -58,7 +58,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index f81ce10fc92..1d418d2aced 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -35,8 +35,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -62,7 +63,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -71,6 +72,7 @@ public interface PetApi { /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -267,8 +269,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -298,7 +301,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -307,6 +310,7 @@ public interface PetApi { /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -345,6 +349,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 5e285e97c0d..4268160d16e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -145,8 +145,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -164,10 +165,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index fb1f0b0410e..1626c669d49 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -37,7 +37,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -51,10 +51,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -63,8 +64,9 @@ public interface UserApi { /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -78,10 +80,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -90,8 +93,9 @@ public interface UserApi { /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -105,10 +109,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +152,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -194,6 +200,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -227,6 +234,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -256,7 +264,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -272,11 +280,12 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..4d0595e38d0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -7,10 +7,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -28,41 +31,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -303,7 +306,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -313,11 +316,11 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -358,13 +361,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..f513931c718 --- /dev/null +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,225 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index 02620d04526..1beb64aba34 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -167,6 +167,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..1ee2b748142 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..7654de1cd32 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -29,17 +29,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -175,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES index 07f63a0e8be..05fbaa353e8 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES @@ -44,6 +44,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index e287793b31b..edc87a622fb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -31,7 +31,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -51,9 +51,9 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(body); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java index 2d5e24bcd5f..740965f1686 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java @@ -27,11 +27,11 @@ public interface AnotherFakeApiDelegate { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see AnotherFakeApi#call123testSpecialTags */ - default ResponseEntity call123testSpecialTags(Client body) { + default ResponseEntity call123testSpecialTags(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index 0f61213f832..ae78c71d530 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -85,7 +85,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -98,7 +99,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiOperation( @@ -114,12 +115,13 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(body); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -143,7 +145,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -172,7 +175,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -185,7 +189,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @ApiOperation( @@ -203,9 +207,9 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(body); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -213,7 +217,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @ApiOperation( @@ -232,9 +236,9 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, body); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -242,7 +246,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -262,9 +266,9 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(body); + return getDelegate().testClientModel(client); } @@ -410,8 +414,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -429,14 +434,15 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(param); + return getDelegate().testInlineAdditionalProperties(requestBody); } /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -469,7 +475,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -490,17 +495,17 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index 2cd684b90f5..d1a650378e6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -63,11 +63,11 @@ public interface FakeApiDelegate { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) * @see FakeApi#fakeOuterCompositeSerialize */ - default ResponseEntity fakeOuterCompositeSerialize(OuterComposite body) { + default ResponseEntity fakeOuterCompositeSerialize(OuterComposite outerComposite) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { @@ -111,11 +111,11 @@ public interface FakeApiDelegate { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) * @see FakeApi#testBodyWithFileSchema */ - default ResponseEntity testBodyWithFileSchema(FileSchemaTestClass body) { + default ResponseEntity testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -124,12 +124,12 @@ public interface FakeApiDelegate { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) * @see FakeApi#testBodyWithQueryParams */ default ResponseEntity testBodyWithQueryParams(String query, - User body) { + User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -138,11 +138,11 @@ public interface FakeApiDelegate { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see FakeApi#testClientModel */ - default ResponseEntity testClientModel(Client body) { + default ResponseEntity testClientModel(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { @@ -249,18 +249,20 @@ public interface FakeApiDelegate { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) * @see FakeApi#testInlineAdditionalProperties */ - default ResponseEntity testInlineAdditionalProperties(Map param) { + default ResponseEntity testInlineAdditionalProperties(Map requestBody) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -278,7 +280,6 @@ public interface FakeApiDelegate { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -286,7 +287,6 @@ public interface FakeApiDelegate { * @see FakeApi#testQueryParameterCollectionFormat */ default ResponseEntity testQueryParameterCollectionFormat(List pipe, - List ioutil, List http, List url, List context) { @@ -296,6 +296,7 @@ public interface FakeApiDelegate { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e37344594de..12d5e65cbe7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -31,7 +31,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -54,9 +54,9 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(body); + return getDelegate().testClassname(client); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java index fb689b13f94..a15fd1b7728 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java @@ -27,11 +27,11 @@ public interface FakeClassnameTestApiDelegate { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see FakeClassnameTestApi#testClassname */ - default ResponseEntity testClassname(Client body) { + default ResponseEntity testClassname(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index a4a97a06cbb..9b93a0fc3be 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -31,8 +31,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -58,14 +59,15 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(body); + return getDelegate().addPet(pet); } /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -216,8 +218,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -247,14 +250,15 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(body); + return getDelegate().updatePet(pet); } /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -292,6 +296,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java index 1e9ad7f94f4..aded0c3fefc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -27,19 +27,21 @@ public interface PetApiDelegate { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) * @see PetApi#addPet */ - default ResponseEntity addPet(Pet body) { + default ResponseEntity addPet(Pet pet) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -142,21 +144,23 @@ public interface PetApiDelegate { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) * or Validation exception (status code 405) * @see PetApi#updatePet */ - default ResponseEntity updatePet(Pet body) { + default ResponseEntity updatePet(Pet pet) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -173,6 +177,7 @@ public interface PetApiDelegate { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index d80873ebcc9..4fcc6fb311c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -124,8 +124,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -143,12 +144,13 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(body); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java index c4c812a9bb2..84623f79f76 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -81,13 +81,14 @@ public interface StoreApiDelegate { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) * @see StoreApi#placeOrder */ - default ResponseEntity placeOrder(Order body) { + default ResponseEntity placeOrder(Order order) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index 315ff7928d1..033fdc52474 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -33,7 +33,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -47,19 +47,21 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(body); + return getDelegate().createUser(user); } /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -73,19 +75,21 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { - return getDelegate().createUsersWithArrayInput(body); + return getDelegate().createUsersWithArrayInput(user); } /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -99,12 +103,13 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { - return getDelegate().createUsersWithListInput(body); + return getDelegate().createUsersWithListInput(user); } @@ -139,6 +144,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -171,6 +177,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -203,6 +210,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -231,7 +239,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -247,13 +255,14 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, body); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java index c39231c6b29..f0630c08541 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -29,35 +29,37 @@ public interface UserApiDelegate { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) * @see UserApi#createUser */ - default ResponseEntity createUser(User body) { + default ResponseEntity createUser(User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithArrayInput */ - default ResponseEntity createUsersWithArrayInput(List body) { + default ResponseEntity createUsersWithArrayInput(List user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithListInput */ - default ResponseEntity createUsersWithListInput(List body) { + default ResponseEntity createUsersWithListInput(List user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -78,6 +80,7 @@ public interface UserApiDelegate { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -106,6 +109,7 @@ public interface UserApiDelegate { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -121,6 +125,7 @@ public interface UserApiDelegate { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) * @see UserApi#logoutUser @@ -135,13 +140,13 @@ public interface UserApiDelegate { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) * @see UserApi#updateUser */ default ResponseEntity updateUser(String username, - User body) { + User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..4d0595e38d0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -7,10 +7,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -28,41 +31,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -303,7 +306,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -313,11 +316,11 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -358,13 +361,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..f513931c718 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,225 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index 02620d04526..1beb64aba34 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -167,6 +167,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..1ee2b748142 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..7654de1cd32 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -29,17 +29,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -175,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES index 07f63a0e8be..05fbaa353e8 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -44,6 +44,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index e287793b31b..edc87a622fb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -31,7 +31,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -51,9 +51,9 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(body); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java index 2d5e24bcd5f..740965f1686 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java @@ -27,11 +27,11 @@ public interface AnotherFakeApiDelegate { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see AnotherFakeApi#call123testSpecialTags */ - default ResponseEntity call123testSpecialTags(Client body) { + default ResponseEntity call123testSpecialTags(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 0f61213f832..ae78c71d530 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -85,7 +85,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -98,7 +99,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiOperation( @@ -114,12 +115,13 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(body); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -143,7 +145,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -172,7 +175,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -185,7 +189,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @ApiOperation( @@ -203,9 +207,9 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(body); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -213,7 +217,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @ApiOperation( @@ -232,9 +236,9 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, body); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -242,7 +246,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -262,9 +266,9 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(body); + return getDelegate().testClientModel(client); } @@ -410,8 +414,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -429,14 +434,15 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(param); + return getDelegate().testInlineAdditionalProperties(requestBody); } /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -469,7 +475,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -490,17 +495,17 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index 2cd684b90f5..d1a650378e6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -63,11 +63,11 @@ public interface FakeApiDelegate { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) * @see FakeApi#fakeOuterCompositeSerialize */ - default ResponseEntity fakeOuterCompositeSerialize(OuterComposite body) { + default ResponseEntity fakeOuterCompositeSerialize(OuterComposite outerComposite) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { @@ -111,11 +111,11 @@ public interface FakeApiDelegate { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) * @see FakeApi#testBodyWithFileSchema */ - default ResponseEntity testBodyWithFileSchema(FileSchemaTestClass body) { + default ResponseEntity testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -124,12 +124,12 @@ public interface FakeApiDelegate { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) * @see FakeApi#testBodyWithQueryParams */ default ResponseEntity testBodyWithQueryParams(String query, - User body) { + User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -138,11 +138,11 @@ public interface FakeApiDelegate { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see FakeApi#testClientModel */ - default ResponseEntity testClientModel(Client body) { + default ResponseEntity testClientModel(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { @@ -249,18 +249,20 @@ public interface FakeApiDelegate { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) * @see FakeApi#testInlineAdditionalProperties */ - default ResponseEntity testInlineAdditionalProperties(Map param) { + default ResponseEntity testInlineAdditionalProperties(Map requestBody) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -278,7 +280,6 @@ public interface FakeApiDelegate { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -286,7 +287,6 @@ public interface FakeApiDelegate { * @see FakeApi#testQueryParameterCollectionFormat */ default ResponseEntity testQueryParameterCollectionFormat(List pipe, - List ioutil, List http, List url, List context) { @@ -296,6 +296,7 @@ public interface FakeApiDelegate { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e37344594de..12d5e65cbe7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -31,7 +31,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -54,9 +54,9 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(body); + return getDelegate().testClassname(client); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java index fb689b13f94..a15fd1b7728 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java @@ -27,11 +27,11 @@ public interface FakeClassnameTestApiDelegate { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see FakeClassnameTestApi#testClassname */ - default ResponseEntity testClassname(Client body) { + default ResponseEntity testClassname(Client client) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index a4a97a06cbb..9b93a0fc3be 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -31,8 +31,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -58,14 +59,15 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(body); + return getDelegate().addPet(pet); } /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -216,8 +218,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -247,14 +250,15 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(body); + return getDelegate().updatePet(pet); } /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -292,6 +296,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index 1e9ad7f94f4..aded0c3fefc 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -27,19 +27,21 @@ public interface PetApiDelegate { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) * @see PetApi#addPet */ - default ResponseEntity addPet(Pet body) { + default ResponseEntity addPet(Pet pet) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -142,21 +144,23 @@ public interface PetApiDelegate { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) * or Validation exception (status code 405) * @see PetApi#updatePet */ - default ResponseEntity updatePet(Pet body) { + default ResponseEntity updatePet(Pet pet) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -173,6 +177,7 @@ public interface PetApiDelegate { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index d80873ebcc9..4fcc6fb311c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -124,8 +124,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -143,12 +144,13 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(body); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java index c4c812a9bb2..84623f79f76 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -81,13 +81,14 @@ public interface StoreApiDelegate { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) * @see StoreApi#placeOrder */ - default ResponseEntity placeOrder(Order body) { + default ResponseEntity placeOrder(Order order) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 315ff7928d1..033fdc52474 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -33,7 +33,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -47,19 +47,21 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(body); + return getDelegate().createUser(user); } /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -73,19 +75,21 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { - return getDelegate().createUsersWithArrayInput(body); + return getDelegate().createUsersWithArrayInput(user); } /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -99,12 +103,13 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { - return getDelegate().createUsersWithListInput(body); + return getDelegate().createUsersWithListInput(user); } @@ -139,6 +144,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -171,6 +177,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -203,6 +210,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -231,7 +239,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -247,13 +255,14 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, body); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java index c39231c6b29..f0630c08541 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -29,35 +29,37 @@ public interface UserApiDelegate { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) * @see UserApi#createUser */ - default ResponseEntity createUser(User body) { + default ResponseEntity createUser(User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithArrayInput */ - default ResponseEntity createUsersWithArrayInput(List body) { + default ResponseEntity createUsersWithArrayInput(List user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithListInput */ - default ResponseEntity createUsersWithListInput(List body) { + default ResponseEntity createUsersWithListInput(List user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -78,6 +80,7 @@ public interface UserApiDelegate { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -106,6 +109,7 @@ public interface UserApiDelegate { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -121,6 +125,7 @@ public interface UserApiDelegate { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) * @see UserApi#logoutUser @@ -135,13 +140,13 @@ public interface UserApiDelegate { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) * @see UserApi#updateUser */ default ResponseEntity updateUser(String username, - User body) { + User user) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..4d0595e38d0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -7,10 +7,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -28,41 +31,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -303,7 +306,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -313,11 +316,11 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -358,13 +361,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..f513931c718 --- /dev/null +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,225 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index 02620d04526..1beb64aba34 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -167,6 +167,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..1ee2b748142 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..7654de1cd32 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -29,17 +29,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -175,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java index 4f55bcef672..081e4813a03 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java @@ -40,7 +40,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -159,6 +159,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 3c2e959bec0..32921b847d0 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -38,6 +38,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index b7316fe0b69..3fc76144032 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -35,7 +35,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -55,7 +55,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 741ec10f07a..46f0bab3f01 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -90,7 +90,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -104,7 +105,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiOperation( @@ -120,10 +121,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -159,7 +161,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -189,7 +192,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -203,7 +207,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @ApiOperation( @@ -221,7 +225,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -232,7 +236,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @ApiOperation( @@ -251,7 +255,7 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -262,7 +266,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -282,7 +286,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -443,8 +447,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -462,7 +467,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -471,6 +476,7 @@ public interface FakeApi { /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -504,7 +510,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -525,7 +530,6 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context @@ -537,6 +541,7 @@ public interface FakeApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e2bb9e2400c..8d0ca9689bb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -35,7 +35,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -58,7 +58,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 6b895ef76e9..226781e819f 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -35,8 +35,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -62,7 +63,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -71,6 +72,7 @@ public interface PetApi { /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @return successful operation (status code 200) @@ -268,8 +270,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -299,7 +302,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -308,6 +311,7 @@ public interface PetApi { /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -346,6 +350,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 5e285e97c0d..4268160d16e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -145,8 +145,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -164,10 +165,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index fb1f0b0410e..1626c669d49 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -37,7 +37,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -51,10 +51,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -63,8 +64,9 @@ public interface UserApi { /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -78,10 +80,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -90,8 +93,9 @@ public interface UserApi { /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -105,10 +109,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +152,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -194,6 +200,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -227,6 +234,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -256,7 +264,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -272,11 +280,12 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..4d0595e38d0 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -7,10 +7,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -28,41 +31,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -303,7 +306,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -313,11 +316,11 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -358,13 +361,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..f513931c718 --- /dev/null +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,225 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index 02620d04526..1beb64aba34 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -167,6 +167,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..1ee2b748142 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..7654de1cd32 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -29,17 +29,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -175,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES index bf09bb15ac7..a38d317b824 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES @@ -43,6 +43,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/server/petstore/springboot-reactive/pom.xml b/samples/server/petstore/springboot-reactive/pom.xml index 86990714a3b..19d7799e733 100644 --- a/samples/server/petstore/springboot-reactive/pom.xml +++ b/samples/server/petstore/springboot-reactive/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - org.openapitools + org.openapitools.openapi3 springboot-reactive jar springboot-reactive diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 7da21d14c00..ec172a80737 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -36,7 +36,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -56,10 +56,10 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default Mono> call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().call123testSpecialTags(body, exchange); + return getDelegate().call123testSpecialTags(client, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java index 5e5979845e8..7737b06203e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java @@ -32,11 +32,11 @@ public interface AnotherFakeApiDelegate { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see AnotherFakeApi#call123testSpecialTags */ - default Mono> call123testSpecialTags(Mono body, + default Mono> call123testSpecialTags(Mono client, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); @@ -47,7 +47,7 @@ public interface AnotherFakeApiDelegate { break; } } - return result.then(body).then(Mono.empty()); + return result.then(client).then(Mono.empty()); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index 47c0ecbfa68..8e2522bda4e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -91,7 +91,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default Mono> fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body, @@ -105,7 +106,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiOperation( @@ -121,13 +122,14 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default Mono> fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono body, + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterCompositeSerialize(body, exchange); + return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); } @@ -151,7 +153,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default Mono> fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body, @@ -181,7 +184,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default Mono> fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body, @@ -195,7 +199,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @ApiOperation( @@ -213,10 +217,10 @@ public interface FakeApi { consumes = { "application/json" } ) default Mono> testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithFileSchema(body, exchange); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); } @@ -224,7 +228,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @ApiOperation( @@ -243,10 +247,10 @@ public interface FakeApi { ) default Mono> testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithQueryParams(query, body, exchange); + return getDelegate().testBodyWithQueryParams(query, user, exchange); } @@ -254,7 +258,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -274,10 +278,10 @@ public interface FakeApi { consumes = { "application/json" } ) default Mono> testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClientModel(body, exchange); + return getDelegate().testClientModel(client, exchange); } @@ -426,8 +430,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -445,15 +450,16 @@ public interface FakeApi { consumes = { "application/json" } ) default Mono> testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> param, + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testInlineAdditionalProperties(param, exchange); + return getDelegate().testInlineAdditionalProperties(requestBody, exchange); } /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -487,7 +493,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -508,18 +513,18 @@ public interface FakeApi { ) default Mono> testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, exchange); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); } /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index af978b31c2f..db5642bdaa1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -74,11 +74,11 @@ public interface FakeApiDelegate { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) * @see FakeApi#fakeOuterCompositeSerialize */ - default Mono> fakeOuterCompositeSerialize(Mono body, + default Mono> fakeOuterCompositeSerialize(Mono outerComposite, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); @@ -89,7 +89,7 @@ public interface FakeApiDelegate { break; } } - return result.then(body).then(Mono.empty()); + return result.then(outerComposite).then(Mono.empty()); } @@ -129,15 +129,15 @@ public interface FakeApiDelegate { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) * @see FakeApi#testBodyWithFileSchema */ - default Mono> testBodyWithFileSchema(Mono body, + default Mono> testBodyWithFileSchema(Mono fileSchemaTestClass, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); + return result.then(fileSchemaTestClass).then(Mono.empty()); } @@ -145,16 +145,16 @@ public interface FakeApiDelegate { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) * @see FakeApi#testBodyWithQueryParams */ default Mono> testBodyWithQueryParams(String query, - Mono body, + Mono user, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); + return result.then(user).then(Mono.empty()); } @@ -162,11 +162,11 @@ public interface FakeApiDelegate { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see FakeApi#testClientModel */ - default Mono> testClientModel(Mono body, + default Mono> testClientModel(Mono client, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); @@ -177,7 +177,7 @@ public interface FakeApiDelegate { break; } } - return result.then(body).then(Mono.empty()); + return result.then(client).then(Mono.empty()); } @@ -283,21 +283,23 @@ public interface FakeApiDelegate { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) * @see FakeApi#testInlineAdditionalProperties */ - default Mono> testInlineAdditionalProperties(Mono> param, + default Mono> testInlineAdditionalProperties(Mono> requestBody, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(param).then(Mono.empty()); + return result.then(requestBody).then(Mono.empty()); } /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -318,7 +320,6 @@ public interface FakeApiDelegate { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -326,7 +327,6 @@ public interface FakeApiDelegate { * @see FakeApi#testQueryParameterCollectionFormat */ default Mono> testQueryParameterCollectionFormat(List pipe, - List ioutil, List http, List url, List context, @@ -339,6 +339,7 @@ public interface FakeApiDelegate { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 5c5725f6ddd..2df97014b93 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -36,7 +36,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -59,10 +59,10 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default Mono> testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClassname(body, exchange); + return getDelegate().testClassname(client, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java index 6c9ea314d72..d6cb82cb24d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java @@ -32,11 +32,11 @@ public interface FakeClassnameTestApiDelegate { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) * @see FakeClassnameTestApi#testClassname */ - default Mono> testClassname(Mono body, + default Mono> testClassname(Mono client, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); @@ -47,7 +47,7 @@ public interface FakeClassnameTestApiDelegate { break; } } - return result.then(body).then(Mono.empty()); + return result.then(client).then(Mono.empty()); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 5427566daf1..1107e62491b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -36,8 +36,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -63,15 +64,16 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default Mono> addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().addPet(body, exchange); + return getDelegate().addPet(pet, exchange); } /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -226,8 +228,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -257,15 +260,16 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default Mono> updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePet(body, exchange); + return getDelegate().updatePet(pet, exchange); } /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -304,6 +308,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java index 0c9899164ae..ad07e346415 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -32,22 +32,24 @@ public interface PetApiDelegate { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) * @see PetApi#addPet */ - default Mono> addPet(Mono body, + default Mono> addPet(Mono pet, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); + return result.then(pet).then(Mono.empty()); } /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -156,24 +158,26 @@ public interface PetApiDelegate { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) * or Validation exception (status code 405) * @see PetApi#updatePet */ - default Mono> updatePet(Mono body, + default Mono> updatePet(Mono pet, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); + return result.then(pet).then(Mono.empty()); } /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -193,6 +197,7 @@ public interface PetApiDelegate { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index ab235f201eb..a4feea3e7e5 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -131,8 +131,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -150,13 +151,14 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default Mono> placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().placeOrder(body, exchange); + return getDelegate().placeOrder(order, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java index 48ed7540684..81f26555788 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -92,13 +92,14 @@ public interface StoreApiDelegate { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) * @see StoreApi#placeOrder */ - default Mono> placeOrder(Mono body, + default Mono> placeOrder(Mono order, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); @@ -114,7 +115,7 @@ public interface StoreApiDelegate { break; } } - return result.then(body).then(Mono.empty()); + return result.then(order).then(Mono.empty()); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index 88448ffc54d..47ef0c6c6d5 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -38,7 +38,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -52,20 +52,22 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default Mono> createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUser(body, exchange); + return getDelegate().createUser(user, exchange); } /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -79,20 +81,22 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default Mono> createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux body, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithArrayInput(body, exchange); + return getDelegate().createUsersWithArrayInput(user, exchange); } /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -106,13 +110,14 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default Mono> createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux body, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithListInput(body, exchange); + return getDelegate().createUsersWithListInput(user, exchange); } @@ -148,6 +153,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -181,6 +187,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -214,6 +221,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -242,7 +250,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -258,14 +266,15 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default Mono> updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono body, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updateUser(username, body, exchange); + return getDelegate().updateUser(username, user, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java index bb61d43b378..eecd786ba93 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -34,45 +34,47 @@ public interface UserApiDelegate { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) * @see UserApi#createUser */ - default Mono> createUser(Mono body, + default Mono> createUser(Mono user, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); + return result.then(user).then(Mono.empty()); } /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithArrayInput */ - default Mono> createUsersWithArrayInput(Flux body, + default Mono> createUsersWithArrayInput(Flux user, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.thenMany(body).then(Mono.empty()); + return result.thenMany(user).then(Mono.empty()); } /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithListInput */ - default Mono> createUsersWithListInput(Flux body, + default Mono> createUsersWithListInput(Flux user, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.thenMany(body).then(Mono.empty()); + return result.thenMany(user).then(Mono.empty()); } @@ -95,6 +97,7 @@ public interface UserApiDelegate { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -124,6 +127,7 @@ public interface UserApiDelegate { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -142,6 +146,7 @@ public interface UserApiDelegate { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) * @see UserApi#logoutUser @@ -158,17 +163,17 @@ public interface UserApiDelegate { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) * @see UserApi#updateUser */ default Mono> updateUser(String username, - Mono body, + Mono user, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); - return result.then(body).then(Mono.empty()); + return result.then(user).then(Mono.empty()); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..4d0595e38d0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -7,10 +7,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -28,41 +31,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -303,7 +306,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -313,11 +316,11 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -358,13 +361,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..f513931c718 --- /dev/null +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,225 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index 02620d04526..1beb64aba34 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -167,6 +167,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..1ee2b748142 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..7654de1cd32 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -29,17 +29,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -175,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..8bbdc0a2482 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,35 +28,35 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java index 9e739aefac2..5830ee0680d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..54679942725 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..7f2cc3784a1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..8bbdc0a2482 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,35 +28,35 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java index 9e739aefac2..5830ee0680d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..54679942725 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..7f2cc3784a1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..8bbdc0a2482 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,35 +28,35 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java index 9e739aefac2..5830ee0680d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..54679942725 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..7f2cc3784a1 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..8bbdc0a2482 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,35 +28,35 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 9e739aefac2..5830ee0680d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -164,6 +164,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..54679942725 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..7f2cc3784a1 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES index 3c2e959bec0..32921b847d0 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES @@ -38,6 +38,7 @@ src/main/java/org/openapitools/model/CatAllOf.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ClassModel.java src/main/java/org/openapitools/model/Client.java +src/main/java/org/openapitools/model/ContainerDefaultValue.java src/main/java/org/openapitools/model/Dog.java src/main/java/org/openapitools/model/DogAllOf.java src/main/java/org/openapitools/model/EnumArrays.java diff --git a/samples/server/petstore/springboot-useoptional/pom.xml b/samples/server/petstore/springboot-useoptional/pom.xml index 90594c755f2..7c76b4dc531 100644 --- a/samples/server/petstore/springboot-useoptional/pom.xml +++ b/samples/server/petstore/springboot-useoptional/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - org.openapitools + org.openapitools.openapi3 spring-boot-useoptional jar spring-boot-useoptional diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index b7316fe0b69..3fc76144032 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -35,7 +35,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -55,7 +55,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 36cd1b32c71..adbc6c1f1e8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -90,7 +90,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -104,7 +105,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiOperation( @@ -120,10 +121,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -159,7 +161,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -189,7 +192,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -203,7 +207,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @ApiOperation( @@ -221,7 +225,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -232,7 +236,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @ApiOperation( @@ -251,7 +255,7 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -262,7 +266,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -282,7 +286,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -443,8 +447,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -462,7 +467,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -471,6 +476,7 @@ public interface FakeApi { /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -504,7 +510,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -525,7 +530,6 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context @@ -537,6 +541,7 @@ public interface FakeApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e2bb9e2400c..8d0ca9689bb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -35,7 +35,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -58,7 +58,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index b95c83994f3..36427dddb99 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -35,8 +35,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -62,7 +63,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -71,6 +72,7 @@ public interface PetApi { /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -267,8 +269,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -298,7 +301,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -307,6 +310,7 @@ public interface PetApi { /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -345,6 +349,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 5e285e97c0d..4268160d16e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -145,8 +145,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -164,10 +165,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index fb1f0b0410e..1626c669d49 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -37,7 +37,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -51,10 +51,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -63,8 +64,9 @@ public interface UserApi { /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -78,10 +80,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -90,8 +93,9 @@ public interface UserApi { /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -105,10 +109,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +152,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -194,6 +200,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -227,6 +234,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -256,7 +264,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -272,11 +280,12 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index b5e88d5d7cc..4d0595e38d0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -7,10 +7,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -28,41 +31,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -303,7 +306,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -313,11 +316,11 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -358,13 +361,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index df67eda87fd..e9a28b539c6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 05f1ca376a6..06758b17e90 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index 3e7a107f659..5da3fd898c3 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..f513931c718 --- /dev/null +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -0,0 +1,225 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index dba32cf2b71..9708f0507b4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index d97a088a267..0798c027c7c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index f2867ac5040..d024c5cc5db 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -27,7 +27,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -66,15 +66,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 901c65b2924..6ecb96d5e49 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index 02620d04526..1beb64aba34 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -167,6 +167,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..1ee2b748142 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index fae0d6dac4a..7654de1cd32 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -29,17 +29,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index 068f9dc83fd..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -166,6 +166,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -175,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index 27d5f828281..05a4379fd6c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES index 408f3973f3e..2f1080a4150 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES @@ -38,6 +38,7 @@ src/main/java/org/openapitools/virtualan/model/CatAllOf.java src/main/java/org/openapitools/virtualan/model/Category.java src/main/java/org/openapitools/virtualan/model/ClassModel.java src/main/java/org/openapitools/virtualan/model/Client.java +src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java src/main/java/org/openapitools/virtualan/model/Dog.java src/main/java/org/openapitools/virtualan/model/DogAllOf.java src/main/java/org/openapitools/virtualan/model/EnumArrays.java diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index 2ea7a548535..e274fef5fa8 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -48,7 +48,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiVirtual @@ -70,7 +70,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index e2d740c5e86..a902146a5f8 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -105,7 +105,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -119,7 +120,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerComposite Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiVirtual @@ -136,10 +137,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @Parameter(name = "body", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite body + @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -176,7 +178,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -207,7 +210,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -221,7 +225,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClass (required) * @return Success (status code 200) */ @ApiVirtual @@ -239,7 +243,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody FileSchemaTestClass body + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -250,7 +254,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param user (required) * @return Success (status code 200) */ @ApiVirtual @@ -268,7 +272,7 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "body", description = "", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -279,7 +283,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiVirtual @@ -301,7 +305,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -465,14 +469,16 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiVirtual @Operation( operationId = "testInlineAdditionalProperties", summary = "test inline additionalProperties", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -484,7 +490,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -493,6 +499,7 @@ public interface FakeApi { /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -502,6 +509,7 @@ public interface FakeApi { @Operation( operationId = "testJsonFormData", summary = "test json serialization of form data", + description = "", tags = { "fake" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -526,7 +534,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -547,7 +554,6 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context @@ -559,6 +565,7 @@ public interface FakeApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) @@ -569,6 +576,7 @@ public interface FakeApi { @Operation( operationId = "uploadFileWithRequiredFile", summary = "uploads an image (required)", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index a38d1b3ad43..45606efb970 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -48,7 +48,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param client client model (required) * @return successful operation (status code 200) */ @ApiVirtual @@ -73,7 +73,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @Parameter(name = "body", description = "client model", required = true) @Valid @RequestBody Client body + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index 9726fc8992f..fc43b7f986f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -48,8 +48,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -57,6 +58,7 @@ public interface PetApi { @Operation( operationId = "addPet", summary = "Add a new pet to the store", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -72,7 +74,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -81,6 +83,7 @@ public interface PetApi { /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -91,6 +94,7 @@ public interface PetApi { @Operation( operationId = "deletePet", summary = "Deletes a pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -275,8 +279,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param pet Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -286,6 +291,7 @@ public interface PetApi { @Operation( operationId = "updatePet", summary = "Update an existing pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation"), @@ -303,7 +309,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -312,6 +318,7 @@ public interface PetApi { /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -322,6 +329,7 @@ public interface PetApi { @Operation( operationId = "updatePetWithForm", summary = "Updates a pet in the store with form data", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "405", description = "Invalid input") @@ -347,6 +355,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -357,6 +366,7 @@ public interface PetApi { @Operation( operationId = "uploadFile", summary = "uploads an image", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index 3da0ad05a65..fd6f373cde0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -163,8 +163,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -172,6 +173,7 @@ public interface StoreApi { @Operation( operationId = "placeOrder", summary = "Place an order for a pet", + description = "", tags = { "store" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -184,10 +186,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index 449ad8541f0..eecd4ff12a3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -50,7 +50,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @ApiVirtual @@ -65,10 +65,11 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -77,14 +78,16 @@ public interface UserApi { /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiVirtual @Operation( operationId = "createUsersWithArrayInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -92,10 +95,11 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -104,14 +108,16 @@ public interface UserApi { /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @ApiVirtual @Operation( operationId = "createUsersWithListInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -119,10 +125,11 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -162,6 +169,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -172,6 +180,7 @@ public interface UserApi { @Operation( operationId = "getUserByName", summary = "Get user by user name", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -211,6 +220,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -221,6 +231,7 @@ public interface UserApi { @Operation( operationId = "loginUser", summary = "Logs user into the system", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -246,6 +257,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -253,6 +265,7 @@ public interface UserApi { @Operation( operationId = "logoutUser", summary = "Logs out current logged in user session", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") @@ -275,7 +288,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -292,11 +305,12 @@ public interface UserApi { ) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java index e85950e89e5..170518a544d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java @@ -5,10 +5,13 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -27,41 +30,41 @@ public class AdditionalPropertiesClass { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -302,7 +305,7 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -312,11 +315,11 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -357,13 +360,24 @@ public class AdditionalPropertiesClass { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java index 9e659a77e5f..89ff34c4339 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java index 57218ff5084..56d3db08b40 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java index bd5ffb05a08..43632d35716 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java new file mode 100644 index 00000000000..ed71e7bf9a4 --- /dev/null +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java @@ -0,0 +1,224 @@ +package org.openapitools.virtualan.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValue + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValue { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValue#ContainerDefaultValue(List, List)} + */ + @Deprecated + public ContainerDefaultValue() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValue(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValue requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValue containerDefaultValue = (ContainerDefaultValue) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValue {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java index bf35bb62dfb..ae1f9f62fe5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java index 0fe10da645d..88200ea9640 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = null; + private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java index d10f2317c38..9f6f0f6c589 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java @@ -26,7 +26,7 @@ public class MapTest { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -65,15 +65,15 @@ public class MapTest { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java index 9a92421585e..247cf3cae21 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index acb4d1464ef..d185ee9bf9b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java index c63be2646fe..02f421df163 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java @@ -19,7 +19,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -53,8 +53,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java index 4b652fe3170..0fd5ba6fa7b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java @@ -28,17 +28,17 @@ public class TypeHolderDefault { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -142,6 +142,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java index 3bcd0c5f389..21d9337da76 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java @@ -165,6 +165,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -174,7 +177,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @Schema(name = "array_item", example = "[0, 1, 2, 3]", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java index b13481f3fcd..a28e7c54671 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml index 658d8a96b30..1fa32524cf2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1872,13 +1840,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2103,6 +2078,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2146,7 +2157,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2282,4 +2292,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES index c8573ea8e66..ed149e7e75b 100644 --- a/samples/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/server/petstore/springboot/.openapi-generator/FILES @@ -39,6 +39,7 @@ src/main/java/org/openapitools/model/CatDto.java src/main/java/org/openapitools/model/CategoryDto.java src/main/java/org/openapitools/model/ClassModelDto.java src/main/java/org/openapitools/model/ClientDto.java +src/main/java/org/openapitools/model/ContainerDefaultValueDto.java src/main/java/org/openapitools/model/DogAllOfDto.java src/main/java/org/openapitools/model/DogDto.java src/main/java/org/openapitools/model/EnumArraysDto.java diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index 821148b4a6c..6fc3202d404 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -35,7 +35,7 @@ public interface AnotherFakeApi { * PATCH /another-fake/dummy : To test special tags * To test special tags and operation ID starting with number * - * @param body client model (required) + * @param clientDto client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -55,7 +55,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto body + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index 15b781d8629..d169863b104 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -45,7 +45,7 @@ public interface FakeApi { * POST /fake/create_xml_item : creates an XmlItem * this route creates an XmlItem * - * @param xmlItem XmlItem Body (required) + * @param xmlItemDto XmlItem Body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -63,7 +63,7 @@ public interface FakeApi { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItemDto xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItemDto xmlItemDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -90,7 +90,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/boolean", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body @@ -104,7 +105,7 @@ public interface FakeApi { * POST /fake/outer/composite * Test serialization of object with outer number type * - * @param body Input composite as post body (optional) + * @param outerCompositeDto Input composite as post body (optional) * @return Output composite (status code 200) */ @ApiOperation( @@ -120,10 +121,11 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/composite", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterCompositeDto body + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterCompositeDto outerCompositeDto ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -159,7 +161,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/number", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body @@ -189,7 +192,8 @@ public interface FakeApi { @RequestMapping( method = RequestMethod.POST, value = "/fake/outer/string", - produces = { "*/*" } + produces = { "*/*" }, + consumes = { "application/json" } ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) String body @@ -203,7 +207,7 @@ public interface FakeApi { * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. * - * @param body (required) + * @param fileSchemaTestClassDto (required) * @return Success (status code 200) */ @ApiOperation( @@ -221,7 +225,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClassDto body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -232,7 +236,7 @@ public interface FakeApi { * PUT /fake/body-with-query-params * * @param query (required) - * @param body (required) + * @param userDto (required) * @return Success (status code 200) */ @ApiOperation( @@ -251,7 +255,7 @@ public interface FakeApi { ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody UserDto body + @ApiParam(value = "", required = true) @Valid @RequestBody UserDto userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -262,7 +266,7 @@ public interface FakeApi { * PATCH /fake : To test \"client\" model * To test \"client\" model * - * @param body client model (required) + * @param clientDto client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -282,7 +286,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto body + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -443,8 +447,9 @@ public interface FakeApi { /** * POST /fake/inline-additionalProperties : test inline additionalProperties + * * - * @param param request body (required) + * @param requestBody request body (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -462,7 +467,7 @@ public interface FakeApi { consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -471,6 +476,7 @@ public interface FakeApi { /** * GET /fake/jsonFormData : test json serialization of form data + * * * @param param field1 (required) * @param param2 field2 (required) @@ -504,7 +510,6 @@ public interface FakeApi { * To test the collection format in query parameters * * @param pipe (required) - * @param ioutil (required) * @param http (required) * @param url (required) * @param context (required) @@ -525,7 +530,6 @@ public interface FakeApi { ) default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context @@ -537,6 +541,7 @@ public interface FakeApi { /** * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required) + * * * @param petId ID of pet to update (required) * @param requiredFile file to upload (required) diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 7787e2f3557..35ca94fe7d8 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -35,7 +35,7 @@ public interface FakeClassnameTestApi { * PATCH /fake_classname_test : To test class name in snake case * To test class name in snake case * - * @param body client model (required) + * @param clientDto client model (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -58,7 +58,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto body + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index afbe5c099a4..d45f1f96dba 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -35,8 +35,9 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) + * @param petDto Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid input (status code 405) */ @@ -62,7 +63,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -71,6 +72,7 @@ public interface PetApi { /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -267,8 +269,9 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) + * @param petDto Pet object that needs to be added to the store (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) @@ -298,7 +301,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -307,6 +310,7 @@ public interface PetApi { /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -345,6 +349,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index c1a5207a307..d1e8cad1c07 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -145,8 +145,9 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param orderDto order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @@ -164,10 +165,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = { "application/xml", "application/json" } + produces = { "application/xml", "application/json" }, + consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody OrderDto body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody OrderDto orderDto ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 13e1a4674fa..85dfc6505aa 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -37,7 +37,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param userDto Created user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -51,10 +51,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody UserDto body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody UserDto userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -63,8 +64,9 @@ public interface UserApi { /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param userDto List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -78,10 +80,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -90,8 +93,9 @@ public interface UserApi { /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param userDto List of user object (required) * @return successful operation (status code 200) */ @ApiOperation( @@ -105,10 +109,11 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +152,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -194,6 +200,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -227,6 +234,7 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @@ -256,7 +264,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param userDto Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -272,11 +280,12 @@ public interface UserApi { }) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = { "application/json" } ) default ResponseEntity updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody UserDto body + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody UserDto userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 54cc686549a..fda780a36c3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -8,10 +8,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; @@ -30,41 +33,41 @@ public class AdditionalPropertiesClassDto { @JsonProperty("map_string") @Valid - private Map mapString = null; + private Map mapString = new HashMap<>(); @JsonProperty("map_number") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @JsonProperty("map_integer") @Valid - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @JsonProperty("map_boolean") @Valid - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @JsonProperty("map_array_integer") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @JsonProperty("map_array_anytype") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @JsonProperty("map_map_string") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @JsonProperty("map_map_anytype") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @JsonProperty("anytype_1") private Object anytype1; @JsonProperty("anytype_2") - private Object anytype2; + private JsonNullable anytype2 = JsonNullable.undefined(); @JsonProperty("anytype_3") private Object anytype3; @@ -305,7 +308,7 @@ public class AdditionalPropertiesClassDto { } public AdditionalPropertiesClassDto anytype2(Object anytype2) { - this.anytype2 = anytype2; + this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -315,11 +318,11 @@ public class AdditionalPropertiesClassDto { */ @ApiModelProperty(value = "") - public Object getAnytype2() { + public JsonNullable getAnytype2() { return anytype2; } - public void setAnytype2(Object anytype2) { + public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } @@ -360,13 +363,24 @@ public class AdditionalPropertiesClassDto { Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && - Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); } + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + @Override public int hashCode() { - return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3); + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 2424bb2cf10..7a49dba2337 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -29,7 +29,7 @@ public class ArrayOfArrayOfNumberOnlyDto { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 558810f5c49..e40c3d19ce3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -29,7 +29,7 @@ public class ArrayOfNumberOnlyDto { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java index 179d5c1979e..f57a7567219 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -29,15 +29,15 @@ public class ArrayTestDto { @JsonProperty("array_of_string") @Valid - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java new file mode 100644 index 00000000000..cea6d655ab4 --- /dev/null +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -0,0 +1,227 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ContainerDefaultValueDto + */ + +@JsonTypeName("ContainerDefaultValue") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ContainerDefaultValueDto { + + @JsonProperty("nullable_array") + @Valid + private JsonNullable> nullableArray = JsonNullable.undefined(); + + @JsonProperty("nullable_required_array") + @Valid + private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); + + @JsonProperty("required_array") + @Valid + private List requiredArray = new ArrayList<>(); + + @JsonProperty("nullable_array_with_default") + @Valid + private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); + + /** + * Default constructor + * @deprecated Use {@link ContainerDefaultValueDto#ContainerDefaultValueDto(List, List)} + */ + @Deprecated + public ContainerDefaultValueDto() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ContainerDefaultValueDto(List nullableRequiredArray, List requiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + this.requiredArray = requiredArray; + } + + public ContainerDefaultValueDto nullableArray(List nullableArray) { + this.nullableArray = JsonNullable.of(nullableArray); + return this; + } + + public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + /** + * Get nullableArray + * @return nullableArray + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(JsonNullable> nullableArray) { + this.nullableArray = nullableArray; + } + + public ContainerDefaultValueDto nullableRequiredArray(List nullableRequiredArray) { + this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); + return this; + } + + public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequiredArrayItem) { + if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) { + this.nullableRequiredArray = JsonNullable.of(new ArrayList<>()); + } + this.nullableRequiredArray.get().add(nullableRequiredArrayItem); + return this; + } + + /** + * Get nullableRequiredArray + * @return nullableRequiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public JsonNullable> getNullableRequiredArray() { + return nullableRequiredArray; + } + + public void setNullableRequiredArray(JsonNullable> nullableRequiredArray) { + this.nullableRequiredArray = nullableRequiredArray; + } + + public ContainerDefaultValueDto requiredArray(List requiredArray) { + this.requiredArray = requiredArray; + return this; + } + + public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) { + if (this.requiredArray == null) { + this.requiredArray = new ArrayList<>(); + } + this.requiredArray.add(requiredArrayItem); + return this; + } + + /** + * Get requiredArray + * @return requiredArray + */ + @NotNull + @ApiModelProperty(required = true, value = "") + public List getRequiredArray() { + return requiredArray; + } + + public void setRequiredArray(List requiredArray) { + this.requiredArray = requiredArray; + } + + public ContainerDefaultValueDto nullableArrayWithDefault(List nullableArrayWithDefault) { + this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); + return this; + } + + public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) { + if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) { + this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar"))); + } + this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem); + return this; + } + + /** + * Get nullableArrayWithDefault + * @return nullableArrayWithDefault + */ + + @ApiModelProperty(value = "") + public JsonNullable> getNullableArrayWithDefault() { + return nullableArrayWithDefault; + } + + public void setNullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { + this.nullableArrayWithDefault = nullableArrayWithDefault; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContainerDefaultValueDto containerDefaultValue = (ContainerDefaultValueDto) o; + return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) && + Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) && + Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) && + equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ContainerDefaultValueDto {\n"); + sb.append(" nullableArray: ").append(toIndentedString(nullableArray)).append("\n"); + sb.append(" nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n"); + sb.append(" requiredArray: ").append(toIndentedString(requiredArray)).append("\n"); + sb.append(" nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java index ef02dec9464..9d6f6c243cb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -102,7 +102,7 @@ public class EnumArraysDto { @JsonProperty("array_enum") @Valid - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 3df831dd0d1..9da0395f194 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -32,7 +32,7 @@ public class FileSchemaTestClassDto { @JsonProperty("files") @Valid - private List<@Valid FileDto> files = null; + private List<@Valid FileDto> files = new ArrayList<>(); public FileSchemaTestClassDto file(FileDto file) { this.file = file; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java index 2d47fa769e0..7edf8258281 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java @@ -29,7 +29,7 @@ public class MapTestDto { @JsonProperty("map_map_of_string") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -68,15 +68,15 @@ public class MapTestDto { @JsonProperty("map_of_enum_string") @Valid - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @JsonProperty("direct_map") @Valid - private Map directMap = null; + private Map directMap = new HashMap<>(); @JsonProperty("indirect_map") @Valid - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index d105480477d..c602c9a77e0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -39,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { @JsonProperty("map") @Valid - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java index 2a8f59a30af..ea524893059 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java @@ -47,7 +47,7 @@ public class PetDto { @JsonProperty("tags") @Valid - private List<@Valid TagDto> tags = null; + private List<@Valid TagDto> tags = new ArrayList<>(); /** * pet status in the store @@ -169,6 +169,9 @@ public class PetDto { } public PetDto addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java index 0214f949034..f5ea44d681a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelNameDto */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model.name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelNameDto { @@ -54,8 +54,8 @@ public class SpecialModelNameDto { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelNameDto $SpecialModelName = (SpecialModelNameDto) o; - return Objects.equals(this.$SpecialPropertyName, $SpecialModelName.$SpecialPropertyName); + SpecialModelNameDto specialModelName = (SpecialModelNameDto) o; + return Objects.equals(this.$SpecialPropertyName, specialModelName.$SpecialPropertyName); } @Override diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 33a4f10606c..465fb77c08c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -31,17 +31,17 @@ public class TypeHolderDefaultDto { private String stringItem = "what"; @JsonProperty("number_item") - private BigDecimal numberItem; + private BigDecimal numberItem = new BigDecimal("1.234"); @JsonProperty("integer_item") - private Integer integerItem; + private Integer integerItem = -2; @JsonProperty("bool_item") private Boolean boolItem = true; @JsonProperty("array_item") @Valid - private List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); /** * Default constructor @@ -145,6 +145,9 @@ public class TypeHolderDefaultDto { } public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 396dab179f4..15dc401681a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -168,6 +168,9 @@ public class TypeHolderExampleDto { } public TypeHolderExampleDto addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } @@ -177,7 +180,7 @@ public class TypeHolderExampleDto { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java index cbc3d3a1aea..f93e04f2759 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java @@ -41,7 +41,7 @@ public class XmlItemDto { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @JsonProperty("name_string") private String nameString; @@ -57,11 +57,11 @@ public class XmlItemDto { @JsonProperty("name_array") @Valid - private List nameArray = null; + private List nameArray = new ArrayList<>(); @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @JsonProperty("prefix_string") private String prefixString; @@ -77,11 +77,11 @@ public class XmlItemDto { @JsonProperty("prefix_array") @Valid - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @JsonProperty("namespace_string") private String namespaceString; @@ -97,11 +97,11 @@ public class XmlItemDto { @JsonProperty("namespace_array") @Valid - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -117,11 +117,11 @@ public class XmlItemDto { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml index dd15cd15820..c2cce49a800 100644 --- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml @@ -1,4 +1,4 @@ -openapi: 3.0.1 +openapi: 3.0.0 info: description: "This spec is mainly for testing Petstore server and contains fake\ \ endpoints, models. Please do not use this for any other purpose. Special characters:\ @@ -20,23 +20,14 @@ tags: paths: /pet: post: + description: "" operationId: addPet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "405": - content: {} description: Invalid input security: - petstore_auth: @@ -45,35 +36,23 @@ paths: summary: Add a new pet to the store tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: - tag: pet put: + description: "" operationId: updatePet requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true + $ref: '#/components/requestBodies/Pet' responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found "405": - content: {} description: Validation exception security: - petstore_auth: @@ -82,7 +61,6 @@ paths: summary: Update an existing pet tags: - pet - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -122,7 +100,6 @@ paths: type: array description: successful operation "400": - content: {} description: Invalid status value security: - petstore_auth: @@ -169,7 +146,6 @@ paths: uniqueItems: true description: successful operation "400": - content: {} description: Invalid tag value security: - petstore_auth: @@ -183,25 +159,29 @@ paths: - tag: pet /pet/{petId}: delete: + description: "" operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": - content: {} description: successful operation "400": - content: {} description: Invalid pet value security: - petstore_auth: @@ -218,12 +198,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -235,10 +217,8 @@ paths: $ref: '#/components/schemas/Pet' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Pet not found security: - api_key: [] @@ -249,15 +229,18 @@ paths: x-tags: - tag: pet post: + description: "" operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -265,7 +248,6 @@ paths: $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": - content: {} description: Invalid input security: - petstore_auth: @@ -280,15 +262,18 @@ paths: - tag: pet /pet/{petId}/uploadImage: post: + description: "" operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -336,10 +321,11 @@ paths: - tag: store /store/order: post: + description: "" operationId: placeOrder requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/Order' description: order placed for purchasing the pet @@ -355,13 +341,11 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid Order summary: Place an order for a pet tags: - store - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: store @@ -372,17 +356,17 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Delete purchase order by ID tags: @@ -396,6 +380,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -404,6 +389,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -415,10 +401,8 @@ paths: $ref: '#/components/schemas/Order' description: successful operation "400": - content: {} description: Invalid ID supplied "404": - content: {} description: Order not found summary: Find purchase order by ID tags: @@ -432,87 +416,74 @@ paths: operationId: createUser requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Created user object required: true responses: default: - content: {} description: successful operation summary: Create user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithArray: post: + description: "" operationId: createUsersWithArrayInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/createWithList: post: + description: "" operationId: createUsersWithListInput requestBody: - content: - '*/*': - schema: - items: - $ref: '#/components/schemas/User' - type: array - description: List of user object - required: true + $ref: '#/components/requestBodies/UserArray' responses: default: - content: {} description: successful operation summary: Creates list of users with given input array tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user /user/login: get: + description: "" operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -526,16 +497,19 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": - content: {} description: Invalid username/password supplied summary: Logs user into the system tags: @@ -545,10 +519,10 @@ paths: - tag: user /user/logout: get: + description: "" operationId: logoutUser responses: default: - content: {} description: successful operation summary: Logs out current logged in user session tags: @@ -562,17 +536,17 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Delete user tags: @@ -581,14 +555,17 @@ paths: x-tags: - tag: user get: + description: "" operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -600,10 +577,8 @@ paths: $ref: '#/components/schemas/User' description: successful operation "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found summary: Get user by user name tags: @@ -616,30 +591,29 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/User' description: Updated user object required: true responses: "400": - content: {} description: Invalid user supplied "404": - content: {} description: User not found summary: Updated user tags: - user - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: application/json x-tags: - tag: user @@ -648,12 +622,7 @@ paths: description: To test class name in snake case operationId: testClassname requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -666,7 +635,6 @@ paths: summary: To test class name in snake case tags: - fake_classname_tags 123#$%^ - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -677,43 +645,57 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": - content: {} description: Something wrong summary: Fake endpoint to test group parameters (optional) tags: @@ -730,6 +712,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -740,8 +723,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -749,10 +734,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) - explode: false + explode: true in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -763,8 +750,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -772,24 +761,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -797,10 +793,8 @@ paths: $ref: '#/components/schemas/testEnumParameters_request' responses: "400": - content: {} description: Invalid request "404": - content: {} description: Not found summary: To test enum parameters tags: @@ -813,12 +807,7 @@ paths: description: To test "client" model operationId: testClientModel requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -829,7 +818,6 @@ paths: summary: To test "client" model tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -846,13 +834,10 @@ paths: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testEndpointParameters_request' - required: true responses: "400": - content: {} description: Invalid username supplied "404": - content: {} description: User not found security: - http_basic_test: [] @@ -873,11 +858,10 @@ paths: operationId: fakeOuterNumberSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterNumber' description: Input number as post body - required: false responses: "200": content: @@ -887,8 +871,7 @@ paths: description: Output number tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -898,11 +881,10 @@ paths: operationId: fakeOuterStringSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterString' description: Input string as post body - required: false responses: "200": content: @@ -912,8 +894,7 @@ paths: description: Output string tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -923,11 +904,10 @@ paths: operationId: fakeOuterBooleanSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterBoolean' description: Input boolean as post body - required: false responses: "200": content: @@ -937,8 +917,7 @@ paths: description: Output boolean tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake @@ -948,11 +927,10 @@ paths: operationId: fakeOuterCompositeSerialize requestBody: content: - '*/*': + application/json: schema: $ref: '#/components/schemas/OuterComposite' description: Input composite as post body - required: false responses: "200": content: @@ -962,23 +940,21 @@ paths: description: Output composite tags: - fake - x-codegen-request-body-name: body - x-content-type: '*/*' + x-content-type: application/json x-accepts: '*/*' x-tags: - tag: fake /fake/jsonFormData: get: + description: "" operationId: testJsonFormData requestBody: content: application/x-www-form-urlencoded: schema: $ref: '#/components/schemas/testJsonFormData_request' - required: true responses: "200": - content: {} description: successful operation summary: test json serialization of form data tags: @@ -989,6 +965,7 @@ paths: - tag: fake /fake/inline-additionalProperties: post: + description: "" operationId: testInlineAdditionalProperties requestBody: content: @@ -1001,12 +978,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: test inline additionalProperties tags: - fake - x-codegen-request-body-name: param x-content-type: application/json x-accepts: application/json x-tags: @@ -1015,11 +990,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1028,11 +1005,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1065,12 +1040,10 @@ paths: required: true responses: "200": - content: {} description: successful operation summary: creates an XmlItem tags: - fake - x-codegen-request-body-name: XmlItem x-content-type: application/xml x-accepts: application/json x-tags: @@ -1080,12 +1053,7 @@ paths: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Client' - description: client model - required: true + $ref: '#/components/requestBodies/Client' responses: "200": content: @@ -1096,7 +1064,6 @@ paths: summary: To test special tags tags: - $another-fake? - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1114,11 +1081,9 @@ paths: required: true responses: "200": - content: {} description: Success tags: - fake - x-codegen-request-body-name: body x-content-type: application/json x-accepts: application/json x-tags: @@ -1128,7 +1093,7 @@ paths: description: To test the collection format in query parameters operationId: testQueryParameterCollectionFormat parameters: - - explode: false + - explode: true in: query name: pipe required: true @@ -1137,14 +1102,8 @@ paths: type: string type: array style: form - - in: query - name: ioutil - required: true - schema: - items: - type: string - type: array - - in: query + - explode: false + in: query name: http required: true schema: @@ -1172,7 +1131,6 @@ paths: style: form responses: "200": - content: {} description: Success tags: - fake @@ -1181,21 +1139,23 @@ paths: - tag: fake /fake/{petId}/uploadImageWithRequiredFile: post: + description: "" operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: schema: $ref: '#/components/schemas/uploadFileWithRequiredFile_request' - required: true responses: "200": content: @@ -1215,6 +1175,33 @@ paths: x-tags: - tag: pet components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true schemas: Order: example: @@ -1355,6 +1342,7 @@ components: name: tag wrapped: true status: + deprecated: true description: pet status in the store enum: - available @@ -1381,21 +1369,12 @@ components: message: type: string type: object - $special[model.name]: - properties: - $special[property.name]: - format: int64 - type: integer - type: object - xml: - name: "$special[model.name]" Return: description: Model for testing reserved words properties: return: format: int32 type: integer - type: object xml: name: Return Name: @@ -1415,7 +1394,6 @@ components: type: integer required: - name - type: object xml: name: Name "200_response": @@ -1426,7 +1404,6 @@ components: type: integer class: type: string - type: object xml: name: Name ClassModel: @@ -1434,7 +1411,6 @@ components: properties: _class: type: string - type: object Dog: allOf: - $ref: '#/components/schemas/Animal' @@ -1496,7 +1472,6 @@ components: type: string byte: format: byte - pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" type: string binary: format: binary @@ -1590,7 +1565,6 @@ components: map_array_anytype: additionalProperties: items: - properties: {} type: object type: array type: object @@ -1603,15 +1577,12 @@ components: map_map_anytype: additionalProperties: additionalProperties: - properties: {} type: object type: object type: object anytype_1: - properties: {} - type: object - anytype_2: type: object + anytype_2: {} anytype_3: properties: {} type: object @@ -1647,7 +1618,6 @@ components: AdditionalPropertiesArray: additionalProperties: items: - properties: {} type: object type: array properties: @@ -1657,7 +1627,6 @@ components: AdditionalPropertiesObject: additionalProperties: additionalProperties: - properties: {} type: object type: object properties: @@ -1666,7 +1635,6 @@ components: type: object AdditionalPropertiesAnyType: additionalProperties: - properties: {} type: object properties: name: @@ -1864,13 +1832,20 @@ components: default: what type: string number_item: + default: 1.234 type: number integer_item: + default: -2 type: integer bool_item: default: true type: boolean array_item: + default: + - 0 + - 1 + - 2 + - 3 items: type: integer type: array @@ -2095,6 +2070,42 @@ components: xml: namespace: http://a.com/schema prefix: pre + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + xml: + name: "$special[model.name]" + ContainerDefaultValue: + properties: + nullable_array: + items: + type: string + nullable: true + type: array + nullable_required_array: + items: + type: string + nullable: true + type: array + required_array: + items: + type: string + nullable: false + type: array + nullable_array_with_default: + default: + - foo + - bar + items: + type: string + nullable: true + type: array + required: + - nullable_required_array + - required_array + type: object updatePetWithForm_request: properties: name: @@ -2138,7 +2149,6 @@ components: properties: integer: description: None - format: int32 maximum: 100 minimum: 10 type: integer @@ -2274,4 +2284,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" From 3d4f7b3ce0289dbef218e9a0bb31fa237f8a7d0b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 17 Mar 2023 11:58:49 +0800 Subject: [PATCH 058/131] [java] fix optional array property's default value (#14961) * fix optional array property default value * fix default values * more fixes * update default value for jersey2, 3, okhttp-gson * update default value * fix java okhttp-gson * fix jersey2, 3 --- .../languages/AbstractJavaCodegen.java | 3 +- .../Java/libraries/jersey2/pojo.mustache | 12 +- .../Java/libraries/jersey3/pojo.mustache | 12 +- .../Java/libraries/native/pojo.mustache | 10 +- .../Java/libraries/okhttp-gson/pojo.mustache | 12 +- .../src/main/resources/Java/pojo.mustache | 10 +- .../resources/JavaJaxRS/cxf-cdi/pojo.mustache | 4 - .../main/resources/JavaJaxRS/pojo.mustache | 4 - .../resources/JavaPlayFramework/pojo.mustache | 12 +- .../java-micronaut/common/model/pojo.mustache | 10 +- .../main/resources/java-pkmst/pojo.mustache | 8 +- .../codegen/java/AbstractJavaCodegenTest.java | 4 +- .../codegen/java/JavaModelEnumTest.java | 4 +- .../codegen/java/JavaModelTest.java | 16 +- .../client/model/DefaultValue.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- ...deTrueArrayStringQueryObjectParameter.java | 2 +- .../org/openapitools/client/CustomTest.java | 10 +- .../client/model/DefaultValue.java | 8 +- .../org/openapitools/client/model/Pet.java | 5 +- ...deTrueArrayStringQueryObjectParameter.java | 2 +- .../client/model/DefaultValue.java | 10 +- .../org/openapitools/client/model/Pet.java | 5 +- .../org/openapitools/client/model/Query.java | 2 +- ...deTrueArrayStringQueryObjectParameter.java | 2 +- .../org/openapitools/client/CustomTest.java | 11 +- .../client/model/DefaultValue.java | 8 +- .../org/openapitools/client/model/Pet.java | 5 +- ...deTrueArrayStringQueryObjectParameter.java | 2 +- .../groovy/org/openapitools/model/Pet.groovy | 2 +- .../model/AdditionalPropertiesAnyType.java | 1 + .../model/AdditionalPropertiesArray.java | 1 + .../model/AdditionalPropertiesBoolean.java | 1 + .../model/AdditionalPropertiesClass.java | 1 + .../model/AdditionalPropertiesInteger.java | 1 + .../model/AdditionalPropertiesNumber.java | 1 + .../model/AdditionalPropertiesObject.java | 1 + .../model/AdditionalPropertiesString.java | 1 + .../java/org/openapitools/model/Animal.java | 1 + .../model/ArrayOfArrayOfNumberOnly.java | 1 + .../openapitools/model/ArrayOfNumberOnly.java | 1 + .../org/openapitools/model/ArrayTest.java | 1 + .../java/org/openapitools/model/BigCat.java | 1 + .../org/openapitools/model/BigCatAllOf.java | 1 + .../openapitools/model/Capitalization.java | 1 + .../main/java/org/openapitools/model/Cat.java | 1 + .../java/org/openapitools/model/CatAllOf.java | 1 + .../java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ClassModel.java | 1 + .../main/java/org/openapitools/model/Dog.java | 1 + .../java/org/openapitools/model/DogAllOf.java | 1 + .../org/openapitools/model/EnumArrays.java | 1 + .../java/org/openapitools/model/EnumTest.java | 1 + .../model/FileSchemaTestClass.java | 1 + .../org/openapitools/model/FormatTest.java | 1 + .../openapitools/model/HasOnlyReadOnly.java | 1 + .../java/org/openapitools/model/MapTest.java | 1 + ...ropertiesAndAdditionalPropertiesClass.java | 1 + .../openapitools/model/Model200Response.java | 1 + .../openapitools/model/ModelApiResponse.java | 1 + .../org/openapitools/model/ModelClient.java | 1 + .../org/openapitools/model/ModelFile.java | 1 + .../org/openapitools/model/ModelList.java | 1 + .../org/openapitools/model/ModelReturn.java | 1 + .../java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NumberOnly.java | 1 + .../java/org/openapitools/model/Order.java | 1 + .../openapitools/model/OuterComposite.java | 1 + .../main/java/org/openapitools/model/Pet.java | 1 + .../org/openapitools/model/ReadOnlyFirst.java | 1 + .../openapitools/model/SpecialModelName.java | 1 + .../main/java/org/openapitools/model/Tag.java | 1 + .../openapitools/model/TypeHolderDefault.java | 1 + .../openapitools/model/TypeHolderExample.java | 1 + .../java/org/openapitools/model/User.java | 1 + .../java/org/openapitools/model/XmlItem.java | 1 + .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../client/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../client/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/Drawing.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../client/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/Drawing.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../client/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/Drawing.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../client/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfInlineAllOf.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/Drawing.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../client/model/NullableClass.java | 14 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/PetWithRequiredTags.java | 6 + .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../org/openapitools/client/model/Pet.java | 5 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/AdditionalPropertiesClass.java | 24 + .../model/ArrayOfArrayOfNumberOnly.java | 3 + .../client/model/ArrayOfNumberOnly.java | 3 + .../openapitools/client/model/ArrayTest.java | 9 + .../openapitools/client/model/EnumArrays.java | 3 + .../client/model/FileSchemaTestClass.java | 3 + .../openapitools/client/model/MapTest.java | 12 + ...ropertiesAndAdditionalPropertiesClass.java | 3 + .../org/openapitools/client/model/Pet.java | 6 + .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 27 + .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../client/model/TypeHolderDefault.java | 3 + .../client/model/TypeHolderExample.java | 3 + .../openapitools/client/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../client/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/AdditionalPropertiesClass.java | 6 + .../model/ArrayOfArrayOfNumberOnly.java | 3 + .../client/model/ArrayOfNumberOnly.java | 3 + .../openapitools/client/model/ArrayTest.java | 9 + .../openapitools/client/model/EnumArrays.java | 3 + .../client/model/FileSchemaTestClass.java | 3 + .../openapitools/client/model/MapTest.java | 12 + ...ropertiesAndAdditionalPropertiesClass.java | 3 + .../client/model/NullableClass.java | 6 + .../model/ObjectWithDeprecatedFields.java | 3 + .../org/openapitools/client/model/Pet.java | 6 + .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 6 +- .../org/openapitools/model/EnumArraysDto.java | 2 +- .../model/FileSchemaTestClassDto.java | 2 +- .../java/org/openapitools/model/PetDto.java | 2 +- .../org/openapitools/model/XmlItemDto.java | 18 +- .../org/openapitools/client/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/Drawing.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../client/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 5 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 94 ++ .../openapitools/model/ArrayOfNumberOnly.java | 94 ++ .../org/openapitools/model/ArrayTest.java | 160 ++++ .../org/openapitools/model/EnumArrays.java | 188 ++++ .../model/FileSchemaTestClass.java | 118 +++ .../main/java/org/openapitools/model/Pet.java | 283 ++++++ .../java/org/openapitools/model/XmlItem.java | 838 ++++++++++++++++++ .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../server/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/server/model/ArrayTest.java | 6 +- .../openapitools/server/model/EnumArrays.java | 2 +- .../server/model/FileSchemaTestClass.java | 2 +- .../server/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/server/model/Pet.java | 2 +- .../java/org/openapitools/model/Category.java | 1 + .../openapitools/model/ModelApiResponse.java | 1 + .../java/org/openapitools/model/Order.java | 1 + .../main/java/org/openapitools/model/Pet.java | 1 + .../main/java/org/openapitools/model/Tag.java | 1 + .../java/org/openapitools/model/User.java | 1 + .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../apimodels/ArrayOfArrayOfNumberOnly.java | 6 +- .../app/apimodels/ArrayOfNumberOnly.java | 6 +- .../app/apimodels/ArrayTest.java | 18 +- .../app/apimodels/EnumArrays.java | 6 +- .../app/apimodels/FileSchemaTestClass.java | 6 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/TypeHolderDefault.java | 5 +- .../app/apimodels/TypeHolderExample.java | 5 +- .../app/apimodels/XmlItem.java | 54 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../app/apimodels/Pet.java | 11 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../vertxweb/server/model/Pet.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 5 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../org/openapitools/model/NullableClass.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 5 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 12 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 4 +- .../java/org/openapitools/model/XmlItem.java | 36 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 12 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 4 +- .../java/org/openapitools/model/XmlItem.java | 36 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 5 +- .../openapitools/model/TypeHolderDefault.java | 3 + .../openapitools/model/TypeHolderExample.java | 3 + .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ObjectWithUniqueItems.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../main/java/org/openapitools/model/Pet.java | 5 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayTest.java | 6 +- .../virtualan/model/EnumArrays.java | 2 +- .../virtualan/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/virtualan/model/Pet.java | 2 +- .../openapitools/virtualan/model/XmlItem.java | 18 +- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 6 +- .../org/openapitools/model/EnumArraysDto.java | 2 +- .../model/FileSchemaTestClassDto.java | 2 +- .../java/org/openapitools/model/PetDto.java | 2 +- .../org/openapitools/model/XmlItemDto.java | 18 +- 622 files changed, 3440 insertions(+), 1173 deletions(-) create mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java create mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java create mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java create mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java create mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java create mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java create mode 100644 samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 4a4c1af61de..3f966c439e4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -1051,7 +1051,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code schema = ModelUtils.getReferencedSchema(this.openAPI, schema); if (ModelUtils.isArraySchema(schema)) { if (schema.getDefault() == null) { - if (cp.isNullable || containerDefaultToNull) { // nullable or containerDefaultToNull set to true + // nullable, optional or containerDefaultToNull set to true + if (cp.isNullable || !cp.required || containerDefaultToNull) { return null; } else { if (ModelUtils.isSet(schema)) { diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index f05b3f64ab3..4d60d2b9c05 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -141,13 +141,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/defaultValue}} - {{/required}} this.{{name}}.add({{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} @@ -168,13 +164,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/defaultValue}} - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache index 0c5cbabdac1..e418c1be31e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache @@ -141,13 +141,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/defaultValue}} - {{/required}} this.{{name}}.add({{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} @@ -168,13 +164,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/defaultValue}} - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index bdfa5eb4df7..d8dd7cd3839 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -141,11 +141,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} if (this.{{name}} == null) { - this.{{name}} = new ArrayList<>(); + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/required}} this.{{name}}.add({{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} @@ -166,13 +164,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/defaultValue}} - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache index bd86563c983..726189418cb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache @@ -158,13 +158,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/defaultValue}} - {{/required}} this.{{name}}.add({{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} @@ -185,13 +181,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/defaultValue}} - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index e8d4dc8ee21..1400da9d8c9 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -146,13 +146,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/defaultValue}} - {{/required}} this.{{name}}.add({{name}}Item); return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} @@ -174,11 +170,9 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} - {{#defaultValue}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/defaultValue}} {{/required}} this.{{name}}.put(key, {{name}}Item); return this; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache index 0e071a15317..87f4ec974f1 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache @@ -51,11 +51,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/required}} this.{{name}}.add({{name}}Item); return this; } @@ -64,11 +62,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache index ed27882f268..d60e46927f8 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache @@ -47,11 +47,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/required}} this.{{name}}.add({{name}}Item); return this; } @@ -59,11 +57,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; } diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache index 2a4074e4c6b..8d4e28af4b5 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache @@ -53,23 +53,19 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} - if ({{name}} == null) { - {{name}} = {{{defaultValue}}}; + if (this.{{name}} == null) { + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/required}} - {{name}}.add({{name}}Item); + this.{{name}}.add({{name}}Item); return this; } {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; } diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache index 56fecfe14da..7bd9ab2c8eb 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache @@ -123,7 +123,7 @@ Declare the class with extends and implements public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}); } try { this.{{name}}.get().add({{name}}Item); @@ -135,7 +135,7 @@ Declare the class with extends and implements {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } {{/required}} this.{{name}}.add({{name}}Item); @@ -148,7 +148,7 @@ Declare the class with extends and implements public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}); } try { this.{{name}}.get().put(key, {{name}}Item); @@ -160,7 +160,7 @@ Declare the class with extends and implements {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } {{/required}} this.{{name}}.put(key, {{name}}Item); @@ -404,4 +404,4 @@ Declare the class with extends and implements {{/interfaces.0}} {{/parent}} {{/visitable}} -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache index 6609c81a3ce..19ef6761a7a 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache @@ -44,11 +44,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } - {{/required}} this.{{name}}.add({{name}}Item); return this; } @@ -56,11 +54,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { - {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}); } - {{/required}} this.{{name}}.put(key, {{name}}Item); return this; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index 22c55a4dba1..56be46d46f6 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -601,11 +601,11 @@ public class AbstractJavaCodegenTest { ModelUtils.setGenerateAliasAsModel(false); defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); - Assert.assertEquals(defaultValue, "new ArrayList<>()"); + Assert.assertEquals(defaultValue, null); ModelUtils.setGenerateAliasAsModel(true); defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); - Assert.assertEquals(defaultValue, "new ArrayList<>()"); + Assert.assertEquals(defaultValue, null); // Create a map schema with additionalProperties type set to array alias schema = new MapSchema().additionalProperties(new Schema().$ref("#/components/schemas/NestedArray")); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java index 1f3f48e8a61..2f02be67d22 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java @@ -75,7 +75,7 @@ public class JavaModelEnumTest { Assert.assertEquals(enumVar.dataType, "List"); Assert.assertEquals(enumVar.datatypeWithEnum, "List"); Assert.assertEquals(enumVar.name, "name"); - Assert.assertEquals(enumVar.defaultValue, "new ArrayList<>()"); + Assert.assertEquals(enumVar.defaultValue, null); Assert.assertEquals(enumVar.baseType, "List"); Assert.assertTrue(enumVar.isEnum); @@ -108,7 +108,7 @@ public class JavaModelEnumTest { Assert.assertEquals(enumVar.dataType, "List>"); Assert.assertEquals(enumVar.datatypeWithEnum, "List>"); Assert.assertEquals(enumVar.name, "name"); - Assert.assertEquals(enumVar.defaultValue, "new ArrayList<>()"); + Assert.assertEquals(enumVar.defaultValue, null); Assert.assertEquals(enumVar.baseType, "List"); Assert.assertTrue(enumVar.isEnum); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java index e0b97f867df..221736e4ea5 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java @@ -130,7 +130,7 @@ public class JavaModelTest { Assert.assertEquals(property.setter, "setUrls"); Assert.assertEquals(property.dataType, "List"); Assert.assertEquals(property.name, "urls"); - Assert.assertEquals(property.defaultValue, "new ArrayList<>()"); + Assert.assertEquals(property.defaultValue, null); Assert.assertEquals(property.baseType, "List"); Assert.assertEquals(property.containerType, "array"); Assert.assertFalse(property.required); @@ -162,7 +162,7 @@ public class JavaModelTest { Assert.assertEquals(property.setter, "setUrls"); Assert.assertEquals(property.dataType, "Set"); Assert.assertEquals(property.name, "urls"); - Assert.assertEquals(property.defaultValue, "new LinkedHashSet<>()"); + Assert.assertEquals(property.defaultValue, null); Assert.assertEquals(property.baseType, "Set"); Assert.assertEquals(property.containerType, "set"); Assert.assertFalse(property.required); @@ -248,7 +248,7 @@ public class JavaModelTest { Assert.assertEquals(property.setter, "setList2D"); Assert.assertEquals(property.dataType, "List>"); Assert.assertEquals(property.name, "list2D"); - Assert.assertEquals(property.defaultValue, "new ArrayList<>()"); + Assert.assertEquals(property.defaultValue, null); Assert.assertEquals(property.baseType, "List"); Assert.assertEquals(property.containerType, "array"); Assert.assertFalse(property.required); @@ -333,7 +333,7 @@ public class JavaModelTest { Assert.assertEquals(property.setter, "setChildren"); Assert.assertEquals(property.dataType, "List"); Assert.assertEquals(property.name, "children"); - Assert.assertEquals(property.defaultValue, "new ArrayList<>()"); + Assert.assertEquals(property.defaultValue, null); Assert.assertEquals(property.baseType, "List"); Assert.assertEquals(property.containerType, "array"); Assert.assertFalse(property.required); @@ -396,7 +396,7 @@ public class JavaModelTest { Assert.assertEquals(property.setter, "setChildren"); Assert.assertEquals(property.dataType, "List"); Assert.assertEquals(property.name, "children"); - Assert.assertEquals(property.defaultValue, "new ArrayList<>()"); + Assert.assertEquals(property.defaultValue, null); Assert.assertEquals(property.baseType, "List"); Assert.assertEquals(property.containerType, "array"); Assert.assertFalse(property.required); @@ -429,7 +429,7 @@ public class JavaModelTest { Assert.assertEquals(property.setter, "setChildren"); Assert.assertEquals(property.dataType, "Set"); Assert.assertEquals(property.name, "children"); - Assert.assertEquals(property.defaultValue, "new LinkedHashSet<>()"); + Assert.assertEquals(property.defaultValue, null); Assert.assertEquals(property.baseType, "Set"); Assert.assertEquals(property.containerType, "set"); Assert.assertFalse(property.required); @@ -466,7 +466,7 @@ public class JavaModelTest { Assert.assertEquals(property.setter, "setChildren"); Assert.assertEquals(property.dataType, "List"); Assert.assertEquals(property.name, "children"); - Assert.assertEquals(property.defaultValue, "new ArrayList<>()"); + Assert.assertEquals(property.defaultValue, null); Assert.assertEquals(property.baseType, "List"); Assert.assertEquals(property.containerType, "array"); Assert.assertFalse(property.required); @@ -974,7 +974,7 @@ public class JavaModelTest { Assert.assertEquals(property2.setter, "setArray"); Assert.assertEquals(property2.dataType, "List"); Assert.assertEquals(property2.name, "array"); - Assert.assertEquals(property2.defaultValue, "new ArrayList<>()"); + Assert.assertEquals(property2.defaultValue, null); Assert.assertEquals(property2.baseType, "List"); Assert.assertTrue(property2.isContainer); Assert.assertTrue(property2.isXmlWrapped); diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java index 0cc2f5932b9..0dcf9d88382 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -98,7 +98,7 @@ public class DefaultValue { private List arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); public static final String JSON_PROPERTY_ARRAY_STRING = "array_string"; - private List arrayString = new ArrayList<>(); + private List arrayString; public static final String JSON_PROPERTY_ARRAY_STRING_NULLABLE = "array_string_nullable"; private JsonNullable> arrayStringNullable = JsonNullable.>undefined(); diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java index ffb0408d05b..ad4740217fa 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index 0e5bfd5253a..ae876152c12 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -38,7 +38,7 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { public static final String JSON_PROPERTY_VALUES = "values"; - private List values = new ArrayList<>(); + private List values; public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() { } diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java index 762eb405279..8d85fe88e4b 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java +++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java @@ -175,7 +175,7 @@ public class CustomTest { Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); Assert.assertNull(d.getArrayStringNullable()); - Assert.assertEquals(d.getArrayString().size(), 0); + Assert.assertNull(d.getArrayString()); // test addItem d.addArrayStringEnumDefaultItem(DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED); @@ -218,9 +218,9 @@ public class CustomTest { Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); Assert.assertNull(d.getArrayStringNullable()); - Assert.assertEquals(d.getArrayString().size(), 0); + Assert.assertNull(d.getArrayString()); - Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"success\",\"failure\"],\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3],\"array_string\":[]}"); + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"success\",\"failure\"],\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3]}"); } @Test @@ -246,9 +246,9 @@ public class CustomTest { Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); Assert.assertNull(d.getArrayStringNullable()); - Assert.assertEquals(d.getArrayString().size(), 0); + Assert.assertNull(d.getArrayString()); - Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[]}"); + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3]}"); } @Test diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java index df9a694da6e..62e7e2b8eee 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -98,7 +98,7 @@ public class DefaultValue { public static final String SERIALIZED_NAME_ARRAY_STRING = "array_string"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING) - private List arrayString = new ArrayList<>(); + private List arrayString; public static final String SERIALIZED_NAME_ARRAY_STRING_NULLABLE = "array_string_nullable"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING_NULLABLE) @@ -272,6 +272,9 @@ public class DefaultValue { } public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { + if (this.arrayStringNullable == null) { + this.arrayStringNullable = new ArrayList<>(); + } this.arrayStringNullable.add(arrayStringNullableItem); return this; } @@ -299,6 +302,9 @@ public class DefaultValue { } public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtensionNullableItem) { + if (this.arrayStringExtensionNullable == null) { + this.arrayStringExtensionNullable = new ArrayList<>(); + } this.arrayStringExtensionNullable.add(arrayStringExtensionNullableItem); return this; } diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java index 23b255c290d..4bea6817ccd 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -49,7 +49,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -180,6 +180,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index 845aab85423..e122957e1d4 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -31,7 +31,7 @@ import java.util.List; public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { public static final String SERIALIZED_NAME_VALUES = "values"; @SerializedName(SERIALIZED_NAME_VALUES) - private List values = new ArrayList<>(); + private List values; public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() { } diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java index fbeddeec813..7fa7eb2315b 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -100,7 +100,7 @@ public class DefaultValue { private List arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); public static final String JSON_PROPERTY_ARRAY_STRING = "array_string"; - private List arrayString = new ArrayList<>(); + private List arrayString; public static final String JSON_PROPERTY_ARRAY_STRING_NULLABLE = "array_string_nullable"; private JsonNullable> arrayStringNullable = JsonNullable.>undefined(); @@ -121,7 +121,7 @@ public class DefaultValue { public DefaultValue addArrayStringEnumRefDefaultItem(StringEnumRef arrayStringEnumRefDefaultItem) { if (this.arrayStringEnumRefDefault == null) { - this.arrayStringEnumRefDefault = new ArrayList<>(); + this.arrayStringEnumRefDefault = new ArrayList<>(Arrays.asList(StringEnumRef.SUCCESS, StringEnumRef.FAILURE)); } this.arrayStringEnumRefDefault.add(arrayStringEnumRefDefaultItem); return this; @@ -154,7 +154,7 @@ public class DefaultValue { public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arrayStringEnumDefaultItem) { if (this.arrayStringEnumDefault == null) { - this.arrayStringEnumDefault = new ArrayList<>(); + this.arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE)); } this.arrayStringEnumDefault.add(arrayStringEnumDefaultItem); return this; @@ -187,7 +187,7 @@ public class DefaultValue { public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) { if (this.arrayStringDefault == null) { - this.arrayStringDefault = new ArrayList<>(); + this.arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped")); } this.arrayStringDefault.add(arrayStringDefaultItem); return this; @@ -220,7 +220,7 @@ public class DefaultValue { public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem) { if (this.arrayIntegerDefault == null) { - this.arrayIntegerDefault = new ArrayList<>(); + this.arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); } this.arrayIntegerDefault.add(arrayIntegerDefaultItem); return this; diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java index 9eab225992f..e99220df233 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -184,6 +184,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java index 8e9d339067a..e2e340153db 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java @@ -117,7 +117,7 @@ public class Query { public Query addOutcomesItem(OutcomesEnum outcomesItem) { if (this.outcomes == null) { - this.outcomes = new ArrayList<>(); + this.outcomes = new ArrayList<>(Arrays.asList(OutcomesEnum.SUCCESS, OutcomesEnum.FAILURE)); } this.outcomes.add(outcomesItem); return this; diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index bede74ea0ea..8acdcdb4bf6 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -39,7 +39,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { public static final String JSON_PROPERTY_VALUES = "values"; - private List values = new ArrayList<>(); + private List values; public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() { } diff --git a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java index 16b304c998b..0ce6a0ff875 100644 --- a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java +++ b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java @@ -168,8 +168,7 @@ public class CustomTest { Assert.assertNull(d.getArrayStringNullable()); Assert.assertNull(d.getArrayStringExtensionNullable()); - Assert.assertEquals(d.getArrayString().size(), 0); - + Assert.assertNull(d.getArrayString()); // test addItem d.addArrayStringEnumDefaultItem(DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED); @@ -212,9 +211,9 @@ public class CustomTest { Assert.assertNull(d.getArrayStringNullable()); Assert.assertNull(d.getArrayStringExtensionNullable()); - Assert.assertEquals(d.getArrayString().size(), 0); + Assert.assertNull(d.getArrayString()); - Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"success\",\"failure\"],\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3],\"array_string\":[]}"); + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"success\",\"failure\"],\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3]}"); } @Test @@ -241,9 +240,9 @@ public class CustomTest { Assert.assertNull(d.getArrayStringNullable()); Assert.assertNull(d.getArrayStringExtensionNullable()); - Assert.assertEquals(d.getArrayString().size(), 0); + Assert.assertNull(d.getArrayString()); - Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[]}"); + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3]}"); } @Test diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java index dfdad0cadce..bf07815deb9 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -119,7 +119,7 @@ public class DefaultValue { public static final String SERIALIZED_NAME_ARRAY_STRING = "array_string"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING) - private List arrayString = new ArrayList<>(); + private List arrayString; public static final String SERIALIZED_NAME_ARRAY_STRING_NULLABLE = "array_string_nullable"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING_NULLABLE) @@ -293,6 +293,9 @@ public class DefaultValue { } public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { + if (this.arrayStringNullable == null) { + this.arrayStringNullable = new ArrayList<>(); + } this.arrayStringNullable.add(arrayStringNullableItem); return this; } @@ -320,6 +323,9 @@ public class DefaultValue { } public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtensionNullableItem) { + if (this.arrayStringExtensionNullable == null) { + this.arrayStringExtensionNullable = new ArrayList<>(); + } this.arrayStringExtensionNullable.add(arrayStringExtensionNullableItem); return this; } diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java index c3aa75d476b..0dba821dc3b 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -70,7 +70,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -201,6 +201,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index 3ef95c1c7bd..fc6bafdc270 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -52,7 +52,7 @@ import org.openapitools.client.JSON; public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { public static final String SERIALIZED_NAME_VALUES = "values"; @SerializedName(SERIALIZED_NAME_VALUES) - private List values = new ArrayList<>(); + private List values; public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() { } diff --git a/samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Pet.groovy b/samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Pet.groovy index eabab3d7438..c557a4008cb 100644 --- a/samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Pet.groovy +++ b/samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Pet.groovy @@ -19,7 +19,7 @@ class Pet { List photoUrls = new ArrayList<>() - List tags = new ArrayList<>() + List tags /* pet status in the store */ String status } diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 907f4e4be0a..2c283feec16 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -101,3 +101,4 @@ public class AdditionalPropertiesAnyType extends HashMap { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 75d43481bab..20ad4fd7039 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -102,3 +102,4 @@ public class AdditionalPropertiesArray extends HashMap { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 9eee8f95f51..793b63a7dbe 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -101,3 +101,4 @@ public class AdditionalPropertiesBoolean extends HashMap { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 36365c4ff1c..09909a079fc 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -444,3 +444,4 @@ public class AdditionalPropertiesClass { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index cd8ef08023e..3e1bd4582f6 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -101,3 +101,4 @@ public class AdditionalPropertiesInteger extends HashMap { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index c6a441aa064..1c33885b254 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -102,3 +102,4 @@ public class AdditionalPropertiesNumber extends HashMap { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 5b89cda02cf..bba1f9ec9e3 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -101,3 +101,4 @@ public class AdditionalPropertiesObject extends HashMap { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index b7f59b0229d..26ea43071f3 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -101,3 +101,4 @@ public class AdditionalPropertiesString extends HashMap { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java index 5114c4ebd29..0afb6fac1d9 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java @@ -161,3 +161,4 @@ public class Animal { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index fadb79c8c54..d8bcd06844b 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -107,3 +107,4 @@ public class ArrayOfArrayOfNumberOnly { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index d10cbe105bd..3adddc81191 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -107,3 +107,4 @@ public class ArrayOfNumberOnly { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java index f81d676585c..741e1a6ff8d 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java @@ -179,3 +179,4 @@ public class ArrayTest { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java index 369bc324e65..d1fc9f788db 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java @@ -139,3 +139,4 @@ public class BigCat extends Cat { return visitor.visitBigCat(this); } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java index f303a9ebc69..526c109adc1 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -132,3 +132,4 @@ public class BigCatAllOf { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java index 5ffd100f25a..22c68b07adc 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java @@ -236,3 +236,4 @@ public class Capitalization { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java index c45811094b2..b7a4167f879 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java @@ -104,3 +104,4 @@ public class Cat extends Animal { return visitor.visitCat(this); } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java index 87d4c30e74f..85c7c389bb0 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java @@ -97,3 +97,4 @@ public class CatAllOf { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java index 91352eb0d09..fb919fde9b1 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java @@ -124,3 +124,4 @@ public class Category { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java index 4ed9eb6e21c..c2b9c29a362 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java @@ -96,3 +96,4 @@ public class ClassModel { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java index d328e83b9ec..9635972df07 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java @@ -104,3 +104,4 @@ public class Dog extends Animal { return visitor.visitDog(this); } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java index e4af0ea8e8d..56c83ee99a4 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java @@ -97,3 +97,4 @@ public class DogAllOf { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java index 60ea312f8b8..fcaa8a81eca 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java @@ -200,3 +200,4 @@ public class EnumArrays { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java index ec6a2594159..9f9a95ca704 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java @@ -344,3 +344,4 @@ public class EnumTest { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 73a1631da7d..f15ad8e478d 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -136,3 +136,4 @@ public class FileSchemaTestClass { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java index c1f33ed5d02..1929ddf3f6b 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java @@ -492,3 +492,4 @@ public class FormatTest { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 294cfbe27ae..8816857e282 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -103,3 +103,4 @@ public class HasOnlyReadOnly { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java index 9856c0c8ae8..169227ff058 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java @@ -247,3 +247,4 @@ public class MapTest { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 413b142da0d..4b0a89e46ec 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -167,3 +167,4 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java index f5b12136a71..1fc1eac5970 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java @@ -125,3 +125,4 @@ public class Model200Response { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java index 8ad4e9443d0..4d3e3bddbd5 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -153,3 +153,4 @@ public class ModelApiResponse { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java index 79590740b8b..b2822eca530 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java @@ -97,3 +97,4 @@ public class ModelClient { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java index 8e0a521983c..bf2d278e6a9 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java @@ -97,3 +97,4 @@ public class ModelFile { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java index e35a6b61545..ae7f788961d 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java @@ -97,3 +97,4 @@ public class ModelList { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java index 648b21603cf..b7ae844f1ef 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java @@ -97,3 +97,4 @@ public class ModelReturn { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java index 51914b985b7..01a237f2ac7 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java @@ -158,3 +158,4 @@ public class Name { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java index abd009b546d..8559de7a52c 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java @@ -97,3 +97,4 @@ public class NumberOnly { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java index 82be9f4c1e2..4a9d5181db5 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java @@ -273,3 +273,4 @@ public class Order { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java index 5b390f83312..12b7229b3ce 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java @@ -153,3 +153,4 @@ public class OuterComposite { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java index 56e43b48d0d..449e8f5b444 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java @@ -292,3 +292,4 @@ public class Pet { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java index c1ec89b33b2..1cc19c26409 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -113,3 +113,4 @@ public class ReadOnlyFirst { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java index e4bc0ecf874..224b4cc8b9c 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java @@ -97,3 +97,4 @@ public class SpecialModelName { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java index 91bf95a9362..d58523d6894 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java @@ -124,3 +124,4 @@ public class Tag { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java index 37daa7895c8..2923740e488 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -216,3 +216,4 @@ public class TypeHolderDefault { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java index 1756fe9a085..32955fd70e8 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -244,3 +244,4 @@ public class TypeHolderExample { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java index 42bd0258eef..b3549c2f8a9 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java @@ -292,3 +292,4 @@ public class User { } } + diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java index c241ee3adf7..6c905e2bd1b 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java @@ -955,3 +955,4 @@ public class XmlItem { } } + diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index c0e0edadabb..7fbbda84eec 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index d17bdca9103..e3b5ec365c7 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java index 832b2bd3ca8..d281ef77a98 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import java.util.StringJoiner; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java index adc690cf3cc..916e5ed0f59 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index f8b0436c273..741d22675b1 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java index 78694271007..2f5b1018292 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -81,7 +81,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 7abd9fefce3..5be572f27c0 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -51,7 +51,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java index 50617daf217..8c43b823354 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -189,6 +189,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 7a041781ff7..295334322fb 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -36,7 +36,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 7a2edc838d5..8670c8fa596 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -36,7 +36,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java index 98545291c9b..68013f8d487 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -38,13 +38,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java index 9e3ff98d5b1..201a03e390c 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -109,7 +109,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 58712d5d89b..788dcfd5547 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { private File file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java index 0f583a5b30c..0cfd1e2d076 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java @@ -57,7 +57,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -187,6 +187,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index f5876359ec2..088c085099d 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -168,6 +168,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 9215e28b66d..cdac2a8a91c 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -198,6 +198,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java index ff655010f92..bef46ca918a 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java @@ -76,7 +76,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -91,10 +91,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -109,10 +109,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -127,10 +127,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -145,10 +145,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 37fe0aed3eb..4f503dba5d6 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 39e27dda318..698d386a9f2 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java index dbfe323fd6c..86f0262c685 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java index 72549699100..f792d322ee6 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index abb204abd00..2a26f6a490a 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private File file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java index c54aefee932..c5adee1fcba 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java @@ -78,7 +78,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 9fe55b6c03e..1ed78c03935 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -48,7 +48,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java index 403bb06d3e9..f51472ecc70 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 37fe0aed3eb..4f503dba5d6 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 39e27dda318..698d386a9f2 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java index dbfe323fd6c..86f0262c685 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java index 72549699100..f792d322ee6 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index bd970475770..62716f8c9c7 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java index 403bb06d3e9..f51472ecc70 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 7b8352d3c3b..d5332fdb9ca 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -167,6 +167,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java index af0b85f4118..24a66b05662 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -197,6 +197,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java index bc5780cb632..955b3485b90 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 37fe0aed3eb..4f503dba5d6 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 39e27dda318..698d386a9f2 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java index dbfe323fd6c..86f0262c685 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java index 72549699100..f792d322ee6 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index bd970475770..62716f8c9c7 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java index 403bb06d3e9..f51472ecc70 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 7b8352d3c3b..d5332fdb9ca 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -167,6 +167,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java index af0b85f4118..24a66b05662 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -197,6 +197,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java index bc5780cb632..955b3485b90 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index a4940ec1ec6..08081168ee6 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index a2679d903aa..d74f9a70f67 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayTest.java index 337c357f30e..b52510668e4 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumArrays.java index 618d07b460a..db4d50934a8 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index fa760cf7ab3..2535ea9856c 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Pet.java index 5c1d067af62..a98a3cd6bdc 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -185,6 +185,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 67f0407b0f3..78b2a687843 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -165,6 +165,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 4fb1b1e2fb4..b6fbee409df 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -194,6 +194,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/XmlItem.java index 6db436d4841..517e1594c3e 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/XmlItem.java @@ -78,7 +78,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -93,10 +93,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -111,10 +111,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -129,10 +129,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -147,10 +147,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index a4940ec1ec6..08081168ee6 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index a2679d903aa..d74f9a70f67 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java index 337c357f30e..b52510668e4 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java index 618d07b460a..db4d50934a8 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index fa760cf7ab3..2535ea9856c 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java index 5c1d067af62..a98a3cd6bdc 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -185,6 +185,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 67f0407b0f3..78b2a687843 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -165,6 +165,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 4fb1b1e2fb4..b6fbee409df 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -194,6 +194,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java index 6db436d4841..517e1594c3e 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java @@ -78,7 +78,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -93,10 +93,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -111,10 +111,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -129,10 +129,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -147,10 +147,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index e100f429780..b98b8193d9b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index a2043e449ce..58805427f3a 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java index 63418199ab0..8b94c7fed76 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.openapitools.client.JSON; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java index 6b6639d2c98..d9dd5f94e52 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java @@ -61,7 +61,7 @@ public class Drawing { private JsonNullable nullableShape = JsonNullable.undefined(); public static final String JSON_PROPERTY_SHAPES = "shapes"; - private List shapes = new ArrayList<>(); + private List shapes; public Drawing() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java index 8830dd2f510..14c2f345d6d 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 483524bac85..50dbf971010 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java index 4d8ffec5e9a..de951d9cb68 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java @@ -85,7 +85,7 @@ public class NullableClass { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 31b94b0a7b4..1e4fcf041f3 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -51,7 +51,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java index 6339f08e4cc..74a8a036a02 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -182,6 +182,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 06e670c331e..856d6942ae8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 0acb932ad36..6986ea26644 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java index a43acb13b57..6851972d586 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -42,13 +42,13 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java index 3b3908f1932..6b2348140c4 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java @@ -65,7 +65,7 @@ public class Drawing extends HashMap { private JsonNullable nullableShape = JsonNullable.undefined(); public static final String JSON_PROPERTY_SHAPES = "shapes"; - private List shapes = new ArrayList<>(); + private List shapes; public Drawing() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java index ddcc6e0f217..d35a143c9e2 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -113,7 +113,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index fb6ea071580..b51183684d7 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -44,7 +44,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java index 9f20bc8b9c8..f9db358215e 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java @@ -87,7 +87,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index febc37817e3..e0025df0e7a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -53,7 +53,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java index 5d3fbd208ee..762833c0d8e 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -184,6 +184,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java index c003989b341..f0223525613 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -184,6 +184,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 06e670c331e..856d6942ae8 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 0acb932ad36..6986ea26644 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java index a43acb13b57..6851972d586 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -42,13 +42,13 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java index 3b3908f1932..6b2348140c4 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java @@ -65,7 +65,7 @@ public class Drawing extends HashMap { private JsonNullable nullableShape = JsonNullable.undefined(); public static final String JSON_PROPERTY_SHAPES = "shapes"; - private List shapes = new ArrayList<>(); + private List shapes; public Drawing() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java index ddcc6e0f217..d35a143c9e2 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -113,7 +113,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index fb6ea071580..b51183684d7 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -44,7 +44,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java index 9f20bc8b9c8..f9db358215e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java @@ -87,7 +87,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index febc37817e3..e0025df0e7a 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -53,7 +53,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java index 5d3fbd208ee..762833c0d8e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -184,6 +184,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java index 7c1fae69427..e07848f761c 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java @@ -70,7 +70,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -201,6 +201,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index b6cf6e52eb1..0ec0ed0f882 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -53,7 +53,7 @@ import org.openapitools.client.JSON; public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 639eb6c8bf2..68a021de56f 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -53,7 +53,7 @@ import org.openapitools.client.JSON; public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayTest.java index 2fc0d3d7f92..7e5cb650193 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -53,15 +53,15 @@ import org.openapitools.client.JSON; public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java index 566409f6633..1a6532984aa 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -150,7 +150,7 @@ public class EnumArrays { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 3dc6b5924c9..168a8ac2ee2 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -57,7 +57,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java index 58b63bd27f1..204a48b0d39 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java @@ -72,7 +72,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -203,6 +203,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index a23142b665f..33e0fd810c0 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -169,6 +169,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 7b15f553591..77529915276 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -195,6 +195,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/XmlItem.java index 135caa7cf2b..ffe57fb2e8b 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/XmlItem.java @@ -69,7 +69,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -89,11 +89,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -113,11 +113,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -137,11 +137,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -161,11 +161,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java index 7c1fae69427..e07848f761c 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java @@ -70,7 +70,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -201,6 +201,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 680c33333fe..d4e32dfb7dd 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -55,7 +55,7 @@ import org.openapitools.client.JSON; public class ArrayOfArrayOfNumberOnly implements Parcelable { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index dd8784f0c42..72e4d4bff62 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -55,7 +55,7 @@ import org.openapitools.client.JSON; public class ArrayOfNumberOnly implements Parcelable { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java index ee1148a6f40..cb280070303 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -55,15 +55,15 @@ import org.openapitools.client.JSON; public class ArrayTest implements Parcelable { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java index e994ab72859..1704edc41a9 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -152,7 +152,7 @@ public class EnumArrays implements Parcelable { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 438216ebfc3..adfdad46356 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -59,7 +59,7 @@ public class FileSchemaTestClass implements Parcelable { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java index 93057136b3e..060befbc6bc 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java @@ -74,7 +74,7 @@ public class Pet implements Parcelable { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -205,6 +205,9 @@ public class Pet implements Parcelable { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index fd81fad5e7a..5bd0f79200e 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -171,6 +171,9 @@ public class TypeHolderDefault implements Parcelable { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 49f034daf56..0d35a2dab1f 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -197,6 +197,9 @@ public class TypeHolderExample implements Parcelable { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java index 78df14807d7..970412923c2 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java @@ -71,7 +71,7 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -91,11 +91,11 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -115,11 +115,11 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -139,11 +139,11 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -163,11 +163,11 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java index 1deb29bce92..f830ef3541c 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java @@ -73,7 +73,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -207,6 +207,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 0943e3784a8..9dd199b293e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -53,7 +53,7 @@ import org.openapitools.client.JSON; public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java index eac6d0db48c..3b847a940ef 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java @@ -61,7 +61,7 @@ public class ArrayOfInlineAllOf { public static final String SERIALIZED_NAME_ARRAY_ALLOF_DOG_PROPERTY = "array_allof_dog_property"; @SerializedName(SERIALIZED_NAME_ARRAY_ALLOF_DOG_PROPERTY) - private List arrayAllofDogProperty = new ArrayList<>(); + private List arrayAllofDogProperty; public ArrayOfInlineAllOf() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 71e3dc1b732..7db2b938d62 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -53,7 +53,7 @@ import org.openapitools.client.JSON; public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java index 2c5560b7bb0..4b0b8a744c5 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -53,15 +53,15 @@ import org.openapitools.client.JSON; public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Drawing.java index f350beb95ea..957a0e0b912 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Drawing.java @@ -69,7 +69,7 @@ public class Drawing { public static final String SERIALIZED_NAME_SHAPES = "shapes"; @SerializedName(SERIALIZED_NAME_SHAPES) - private List shapes = new ArrayList<>(); + private List shapes; public Drawing() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java index 257fc4ad721..7c768fb0ac4 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -150,7 +150,7 @@ public class EnumArrays { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index b16ea52b210..cbe42cff751 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -57,7 +57,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java index 2bd3ac824c2..bf8499180b6 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java @@ -90,7 +90,7 @@ public class NullableClass { public static final String SERIALIZED_NAME_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; @SerializedName(SERIALIZED_NAME_ARRAY_ITEMS_NULLABLE) - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String SERIALIZED_NAME_OBJECT_NULLABLE_PROP = "object_nullable_prop"; @SerializedName(SERIALIZED_NAME_OBJECT_NULLABLE_PROP) @@ -246,6 +246,9 @@ public class NullableClass { } public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { + if (this.arrayNullableProp == null) { + this.arrayNullableProp = new ArrayList<>(); + } this.arrayNullableProp.add(arrayNullablePropItem); return this; } @@ -273,6 +276,9 @@ public class NullableClass { } public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { + if (this.arrayAndItemsNullableProp == null) { + this.arrayAndItemsNullableProp = new ArrayList<>(); + } this.arrayAndItemsNullableProp.add(arrayAndItemsNullablePropItem); return this; } @@ -330,6 +336,9 @@ public class NullableClass { } public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { + if (this.objectNullableProp == null) { + this.objectNullableProp = new HashMap<>(); + } this.objectNullableProp.put(key, objectNullablePropItem); return this; } @@ -357,6 +366,9 @@ public class NullableClass { } public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { + if (this.objectAndItemsNullableProp == null) { + this.objectAndItemsNullableProp = new HashMap<>(); + } this.objectAndItemsNullableProp.put(key, objectAndItemsNullablePropItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 3d651830fef..c7b55901d67 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -66,7 +66,7 @@ public class ObjectWithDeprecatedFields { public static final String SERIALIZED_NAME_BARS = "bars"; @SerializedName(SERIALIZED_NAME_BARS) - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java index 1d885d0acea..8e25a2f95b4 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -70,7 +70,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -201,6 +201,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java index 6fc90776b81..09e2be5fa02 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java @@ -201,6 +201,9 @@ public class PetWithRequiredTags { } public PetWithRequiredTags addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } @@ -228,6 +231,9 @@ public class PetWithRequiredTags { } public PetWithRequiredTags addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = new ArrayList<>(); + } this.tags.add(tagsItem); return this; } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 233a700bfbf..d81ea40e20a 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.hibernate.validator.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 6b22a4d6f3b..a8d2692ab67 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.hibernate.validator.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java index 2f632875382..d5ef94f3846 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.hibernate.validator.constraints.*; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java index 3c61f8bcbf3..e7a89a07a09 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 9bf2e4dcb0a..0d3144fbcd9 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java index d9d8dcb7c43..631999a4bb9 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -194,6 +194,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index c8312a55d65..f39e40e9666 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -179,6 +179,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 0806642aa5f..f34e64dcef0 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -211,6 +211,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java index bab16003b69..390f93bd247 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java @@ -78,7 +78,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -93,10 +93,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -111,10 +111,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -129,10 +129,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -147,10 +147,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index ac55ea686ea..722ada0466c 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import org.hibernate.validator.constraints.*; public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index ac26ff59b12..8245dddacb4 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import org.hibernate.validator.constraints.*; public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java index ec76a81add0..053fc1a93fc 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -35,15 +35,15 @@ import org.hibernate.validator.constraints.*; public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java index 8ea142ace10..c51ab501286 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -132,7 +132,7 @@ public class EnumArrays { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 886cd9c4053..84d96147bb7 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java index c61b7de72f5..47de9feb983 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java @@ -54,7 +54,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -190,6 +190,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index ceb75925011..5319bf4e0d1 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -160,6 +160,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java index fd76fbc5d64..80521bbc16b 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -188,6 +188,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java index 674a2d09ff8..b9352048f8a 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java @@ -51,7 +51,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -71,11 +71,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -95,11 +95,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -119,11 +119,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -143,11 +143,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 37fe0aed3eb..4f503dba5d6 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 39e27dda318..698d386a9f2 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java index dbfe323fd6c..86f0262c685 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java index 72549699100..f792d322ee6 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index bd970475770..62716f8c9c7 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java index 403bb06d3e9..f51472ecc70 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 7b8352d3c3b..d5332fdb9ca 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -167,6 +167,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java index af0b85f4118..24a66b05662 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -197,6 +197,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java index bc5780cb632..955b3485b90 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java index 5002324b301..e3bc15787ad 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -53,7 +53,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -183,6 +183,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java index 040ddedd0ba..5ea3f6a2ed1 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -189,6 +189,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 960bb779b35..44110955666 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -46,7 +46,7 @@ public class ArrayOfArrayOfNumberOnly { // items.name=arrayArrayNumber items.baseName=arrayArrayNumber items.xmlName= items.xmlNamespace= // items.example= items.type=List<BigDecimal> @XmlElement(name = "arrayArrayNumber") - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 3ff8fa2e779..e055429bcca 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -46,7 +46,7 @@ public class ArrayOfNumberOnly { // items.name=arrayNumber items.baseName=arrayNumber items.xmlName= items.xmlNamespace= // items.example= items.type=BigDecimal @XmlElement(name = "arrayNumber") - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java index b2c1f7ea3d4..15a8ad36bdd 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -48,21 +48,21 @@ public class ArrayTest { // items.name=arrayOfString items.baseName=arrayOfString items.xmlName= items.xmlNamespace= // items.example= items.type=String @XmlElement(name = "arrayOfString") - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; // Is a container wrapped=false // items.name=arrayArrayOfInteger items.baseName=arrayArrayOfInteger items.xmlName= items.xmlNamespace= // items.example= items.type=List<Long> @XmlElement(name = "arrayArrayOfInteger") - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; // Is a container wrapped=false // items.name=arrayArrayOfModel items.baseName=arrayArrayOfModel items.xmlName= items.xmlNamespace= // items.example= items.type=List<ReadOnlyFirst> @XmlElement(name = "arrayArrayOfModel") - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java index 2c94312ead5..3f773e9833f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -128,7 +128,7 @@ public class EnumArrays { // items.name=arrayEnum items.baseName=arrayEnum items.xmlName= items.xmlNamespace= // items.example= items.type=String @XmlElement(name = "arrayEnum") - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 89eaa3f6e88..cfbc024b887 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -51,7 +51,7 @@ public class FileSchemaTestClass { // items.name=files items.baseName=files items.xmlName= items.xmlNamespace= // items.example= items.type=ModelFile @XmlElement(name = "files") - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java index 81128b586c2..9942b88e116 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java @@ -76,7 +76,7 @@ public class Pet { // items.example= items.type=Tag @XmlElement(name = "tags") @XmlElementWrapper(name = "tag") - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -218,6 +218,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 55727d356cc..b5e088e78a0 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -190,6 +190,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java index cd1ba842633..d4527114ae8 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -223,6 +223,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java index 08a9c08c120..f2225f607af 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java @@ -91,7 +91,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(name = "wrappedArray") @XmlElementWrapper(name = "wrapped_array") - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @XmlElement(name = "xml_name_string") @@ -114,7 +114,7 @@ public class XmlItem { // items.name=nameArray items.baseName=nameArray items.xmlName=xml_name_array_item items.xmlNamespace= // items.example= items.type=Integer @XmlElement(name = "xml_name_array_item") - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; // Is a container wrapped=true @@ -122,7 +122,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(name = "xml_name_wrapped_array_item") @XmlElementWrapper(name = "xml_name_wrapped_array") - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @XmlElement(name = "prefix_string") @@ -145,7 +145,7 @@ public class XmlItem { // items.name=prefixArray items.baseName=prefixArray items.xmlName= items.xmlNamespace= // items.example= items.type=Integer @XmlElement(name = "prefixArray") - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; // Is a container wrapped=true @@ -153,7 +153,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(name = "prefixWrappedArray") @XmlElementWrapper(name = "prefix_wrapped_array") - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @XmlElement(namespace="http://a.com/schema", name = "namespace_string") @@ -176,7 +176,7 @@ public class XmlItem { // items.name=namespaceArray items.baseName=namespaceArray items.xmlName= items.xmlNamespace=http://e.com/schema // items.example= items.type=Integer @XmlElement(namespace="http://e.com/schema", name = "namespaceArray") - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; // Is a container wrapped=true @@ -184,7 +184,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(namespace="http://g.com/schema", name = "namespaceWrappedArray") @XmlElementWrapper(namespace="http://f.com/schema", name = "namespace_wrapped_array") - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @XmlElement(namespace="http://a.com/schema", name = "prefix_ns_string") @@ -207,7 +207,7 @@ public class XmlItem { // items.name=prefixNsArray items.baseName=prefixNsArray items.xmlName= items.xmlNamespace=http://e.com/schema // items.example= items.type=Integer @XmlElement(namespace="http://e.com/schema", name = "prefixNsArray") - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; // Is a container wrapped=true @@ -215,7 +215,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(namespace="http://g.com/schema", name = "prefixNsWrappedArray") @XmlElementWrapper(namespace="http://f.com/schema", name = "prefix_ns_wrapped_array") - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 765ed621329..0f7802e7cfe 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -88,6 +88,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { + if (this.mapString == null) { + this.mapString = new HashMap<>(); + } this.mapString.put(key, mapStringItem); return this; } @@ -119,6 +122,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { + if (this.mapNumber == null) { + this.mapNumber = new HashMap<>(); + } this.mapNumber.put(key, mapNumberItem); return this; } @@ -150,6 +156,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { + if (this.mapInteger == null) { + this.mapInteger = new HashMap<>(); + } this.mapInteger.put(key, mapIntegerItem); return this; } @@ -181,6 +190,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { + if (this.mapBoolean == null) { + this.mapBoolean = new HashMap<>(); + } this.mapBoolean.put(key, mapBooleanItem); return this; } @@ -212,6 +224,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { + if (this.mapArrayInteger == null) { + this.mapArrayInteger = new HashMap<>(); + } this.mapArrayInteger.put(key, mapArrayIntegerItem); return this; } @@ -243,6 +258,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { + if (this.mapArrayAnytype == null) { + this.mapArrayAnytype = new HashMap<>(); + } this.mapArrayAnytype.put(key, mapArrayAnytypeItem); return this; } @@ -274,6 +292,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { + if (this.mapMapString == null) { + this.mapMapString = new HashMap<>(); + } this.mapMapString.put(key, mapMapStringItem); return this; } @@ -305,6 +326,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { + if (this.mapMapAnytype == null) { + this.mapMapAnytype = new HashMap<>(); + } this.mapMapAnytype.put(key, mapMapAnytypeItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 458dcd501b7..4f503dba5d6 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -47,6 +47,9 @@ public class ArrayOfArrayOfNumberOnly { } public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { + if (this.arrayArrayNumber == null) { + this.arrayArrayNumber = new ArrayList<>(); + } this.arrayArrayNumber.add(arrayArrayNumberItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 1bf6b6eca33..698d386a9f2 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -47,6 +47,9 @@ public class ArrayOfNumberOnly { } public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { + if (this.arrayNumber == null) { + this.arrayNumber = new ArrayList<>(); + } this.arrayNumber.add(arrayNumberItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java index 6fa67a39efd..86f0262c685 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -55,6 +55,9 @@ public class ArrayTest { } public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { + if (this.arrayOfString == null) { + this.arrayOfString = new ArrayList<>(); + } this.arrayOfString.add(arrayOfStringItem); return this; } @@ -86,6 +89,9 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { + if (this.arrayArrayOfInteger == null) { + this.arrayArrayOfInteger = new ArrayList<>(); + } this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; } @@ -117,6 +123,9 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { + if (this.arrayArrayOfModel == null) { + this.arrayArrayOfModel = new ArrayList<>(); + } this.arrayArrayOfModel.add(arrayArrayOfModelItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java index 4e390827d8a..f792d322ee6 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -146,6 +146,9 @@ public class EnumArrays { } public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { + if (this.arrayEnum == null) { + this.arrayEnum = new ArrayList<>(); + } this.arrayEnum.add(arrayEnumItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index d6a00997d93..62716f8c9c7 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -77,6 +77,9 @@ public class FileSchemaTestClass { } public FileSchemaTestClass addFilesItem(ModelFile filesItem) { + if (this.files == null) { + this.files = new ArrayList<>(); + } this.files.add(filesItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java index dc7486f4194..723509bc90f 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java @@ -93,6 +93,9 @@ public class MapTest { } public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { + if (this.mapMapOfString == null) { + this.mapMapOfString = new HashMap<>(); + } this.mapMapOfString.put(key, mapMapOfStringItem); return this; } @@ -124,6 +127,9 @@ public class MapTest { } public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { + if (this.mapOfEnumString == null) { + this.mapOfEnumString = new HashMap<>(); + } this.mapOfEnumString.put(key, mapOfEnumStringItem); return this; } @@ -155,6 +161,9 @@ public class MapTest { } public MapTest putDirectMapItem(String key, Boolean directMapItem) { + if (this.directMap == null) { + this.directMap = new HashMap<>(); + } this.directMap.put(key, directMapItem); return this; } @@ -186,6 +195,9 @@ public class MapTest { } public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { + if (this.indirectMap == null) { + this.indirectMap = new HashMap<>(); + } this.indirectMap.put(key, indirectMapItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e7f63f4af67..0af2b9c43e3 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -109,6 +109,9 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { + if (this.map == null) { + this.map = new HashMap<>(); + } this.map.put(key, mapItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java index beca2d006a6..1684ba87f3b 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } @@ -218,6 +221,9 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = new ArrayList<>(); + } this.tags.add(tagsItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 0aea34bdbc6..cbbfd841189 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -167,6 +167,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 21904a8fefe..83179bc2fd0 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -197,6 +197,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java index e23a10154fc..955b3485b90 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java @@ -263,6 +263,9 @@ public class XmlItem { } public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { + if (this.wrappedArray == null) { + this.wrappedArray = new ArrayList<>(); + } this.wrappedArray.add(wrappedArrayItem); return this; } @@ -398,6 +401,9 @@ public class XmlItem { } public XmlItem addNameArrayItem(Integer nameArrayItem) { + if (this.nameArray == null) { + this.nameArray = new ArrayList<>(); + } this.nameArray.add(nameArrayItem); return this; } @@ -429,6 +435,9 @@ public class XmlItem { } public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { + if (this.nameWrappedArray == null) { + this.nameWrappedArray = new ArrayList<>(); + } this.nameWrappedArray.add(nameWrappedArrayItem); return this; } @@ -564,6 +573,9 @@ public class XmlItem { } public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { + if (this.prefixArray == null) { + this.prefixArray = new ArrayList<>(); + } this.prefixArray.add(prefixArrayItem); return this; } @@ -595,6 +607,9 @@ public class XmlItem { } public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { + if (this.prefixWrappedArray == null) { + this.prefixWrappedArray = new ArrayList<>(); + } this.prefixWrappedArray.add(prefixWrappedArrayItem); return this; } @@ -730,6 +745,9 @@ public class XmlItem { } public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { + if (this.namespaceArray == null) { + this.namespaceArray = new ArrayList<>(); + } this.namespaceArray.add(namespaceArrayItem); return this; } @@ -761,6 +779,9 @@ public class XmlItem { } public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { + if (this.namespaceWrappedArray == null) { + this.namespaceWrappedArray = new ArrayList<>(); + } this.namespaceWrappedArray.add(namespaceWrappedArrayItem); return this; } @@ -896,6 +917,9 @@ public class XmlItem { } public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { + if (this.prefixNsArray == null) { + this.prefixNsArray = new ArrayList<>(); + } this.prefixNsArray.add(prefixNsArrayItem); return this; } @@ -927,6 +951,9 @@ public class XmlItem { } public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { + if (this.prefixNsWrappedArray == null) { + this.prefixNsWrappedArray = new ArrayList<>(); + } this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); return this; } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index f21e248f733..a8f010e149a 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -37,7 +37,7 @@ import javax.validation.Valid; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 64b6b2ab61c..5f763efe2d4 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -37,7 +37,7 @@ import javax.validation.Valid; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java index 5973087e536..04533e23ef4 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -39,13 +39,13 @@ import javax.validation.Valid; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java index bc7874f42fb..8c852d1bffb 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -110,7 +110,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 50c5aa83d7e..f97392d0a30 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -41,7 +41,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java index 8d284276040..f09487061b8 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -193,6 +193,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 9ca4f41a5f0..a49f5ba7e8b 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -178,6 +178,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 0a72bfddcea..ad80102f079 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -210,6 +210,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java index 8a3c6d554dd..878fd0898c7 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java @@ -77,7 +77,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -92,10 +92,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -110,10 +110,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -128,10 +128,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -146,10 +146,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 7d8ee05bce7..dc988dad259 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -32,7 +32,7 @@ import java.util.List; public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 85e90450532..d21623977b2 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -32,7 +32,7 @@ import java.util.List; public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java index f064c823a7f..ba80c07fec4 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -32,15 +32,15 @@ import org.openapitools.client.model.ReadOnlyFirst; public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java index ed2e619beb9..4e7b0ea1855 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -129,7 +129,7 @@ public class EnumArrays { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 255d299b1dd..7bba754fb40 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -36,7 +36,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java index 619410ccedf..d97fa08e243 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java @@ -51,7 +51,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -182,6 +182,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 365dc6b0bf7..15678a167f3 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -148,6 +148,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 487cc1f5658..61476547fb4 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -174,6 +174,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java index 7f4526ae0ba..7e2f85b448b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java @@ -48,7 +48,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -68,11 +68,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -92,11 +92,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -116,11 +116,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -140,11 +140,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 7d8ee05bce7..dc988dad259 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -32,7 +32,7 @@ import java.util.List; public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 85e90450532..d21623977b2 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -32,7 +32,7 @@ import java.util.List; public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java index f064c823a7f..ba80c07fec4 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -32,15 +32,15 @@ import org.openapitools.client.model.ReadOnlyFirst; public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java index ed2e619beb9..4e7b0ea1855 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -129,7 +129,7 @@ public class EnumArrays { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 255d299b1dd..7bba754fb40 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -36,7 +36,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java index 619410ccedf..d97fa08e243 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java @@ -51,7 +51,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -182,6 +182,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 365dc6b0bf7..15678a167f3 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -148,6 +148,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 487cc1f5658..61476547fb4 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -174,6 +174,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java index 7f4526ae0ba..7e2f85b448b 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java @@ -48,7 +48,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -68,11 +68,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -92,11 +92,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -116,11 +116,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -140,11 +140,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 7d8ee05bce7..dc988dad259 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -32,7 +32,7 @@ import java.util.List; public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 85e90450532..d21623977b2 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -32,7 +32,7 @@ import java.util.List; public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java index f064c823a7f..ba80c07fec4 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -32,15 +32,15 @@ import org.openapitools.client.model.ReadOnlyFirst; public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java index ed2e619beb9..4e7b0ea1855 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -129,7 +129,7 @@ public class EnumArrays { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 255d299b1dd..7bba754fb40 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -36,7 +36,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java index 619410ccedf..d97fa08e243 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java @@ -51,7 +51,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -182,6 +182,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 365dc6b0bf7..15678a167f3 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -148,6 +148,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 487cc1f5658..61476547fb4 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -174,6 +174,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java index 7f4526ae0ba..7e2f85b448b 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java @@ -48,7 +48,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -68,11 +68,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -92,11 +92,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -116,11 +116,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -140,11 +140,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 37fe0aed3eb..4f503dba5d6 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 39e27dda318..698d386a9f2 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java index dbfe323fd6c..86f0262c685 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java index 72549699100..f792d322ee6 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index bd970475770..62716f8c9c7 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java index 403bb06d3e9..f51472ecc70 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 7b8352d3c3b..d5332fdb9ca 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -167,6 +167,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java index af0b85f4118..24a66b05662 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -197,6 +197,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java index bc5780cb632..955b3485b90 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 37fe0aed3eb..4f503dba5d6 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 39e27dda318..698d386a9f2 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java index dbfe323fd6c..86f0262c685 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java index 72549699100..f792d322ee6 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index bd970475770..62716f8c9c7 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java index 403bb06d3e9..f51472ecc70 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 7b8352d3c3b..d5332fdb9ca 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -167,6 +167,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java index af0b85f4118..24a66b05662 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -197,6 +197,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java index bc5780cb632..955b3485b90 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 85cfd25c4aa..04ac6b1aebc 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 1c03075765d..4d1dc79e4db 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java index 4a8f95567c6..10fc0f2c496 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java index 5da8c06a69f..640e3feff16 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 318e5e3acb6..6db83b556b3 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java index 2b46ef97b0a..fa8f3609000 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java @@ -78,7 +78,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 4939749b0b7..ad5c8e6265c 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -48,7 +48,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java index 764c15ca630..4497aebcc15 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index e21555ed0f0..f391ae0e646 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -50,6 +50,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) { + if (this.mapProperty == null) { + this.mapProperty = new HashMap<>(); + } this.mapProperty.put(key, mapPropertyItem); return this; } @@ -81,6 +84,9 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map mapOfMapPropertyItem) { + if (this.mapOfMapProperty == null) { + this.mapOfMapProperty = new HashMap<>(); + } this.mapOfMapProperty.put(key, mapOfMapPropertyItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 458dcd501b7..4f503dba5d6 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -47,6 +47,9 @@ public class ArrayOfArrayOfNumberOnly { } public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { + if (this.arrayArrayNumber == null) { + this.arrayArrayNumber = new ArrayList<>(); + } this.arrayArrayNumber.add(arrayArrayNumberItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 1bf6b6eca33..698d386a9f2 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -47,6 +47,9 @@ public class ArrayOfNumberOnly { } public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { + if (this.arrayNumber == null) { + this.arrayNumber = new ArrayList<>(); + } this.arrayNumber.add(arrayNumberItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java index 6fa67a39efd..86f0262c685 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -55,6 +55,9 @@ public class ArrayTest { } public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { + if (this.arrayOfString == null) { + this.arrayOfString = new ArrayList<>(); + } this.arrayOfString.add(arrayOfStringItem); return this; } @@ -86,6 +89,9 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { + if (this.arrayArrayOfInteger == null) { + this.arrayArrayOfInteger = new ArrayList<>(); + } this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; } @@ -117,6 +123,9 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { + if (this.arrayArrayOfModel == null) { + this.arrayArrayOfModel = new ArrayList<>(); + } this.arrayArrayOfModel.add(arrayArrayOfModelItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java index 4e390827d8a..f792d322ee6 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -146,6 +146,9 @@ public class EnumArrays { } public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { + if (this.arrayEnum == null) { + this.arrayEnum = new ArrayList<>(); + } this.arrayEnum.add(arrayEnumItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index d6a00997d93..62716f8c9c7 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -77,6 +77,9 @@ public class FileSchemaTestClass { } public FileSchemaTestClass addFilesItem(ModelFile filesItem) { + if (this.files == null) { + this.files = new ArrayList<>(); + } this.files.add(filesItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java index dc7486f4194..723509bc90f 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java @@ -93,6 +93,9 @@ public class MapTest { } public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { + if (this.mapMapOfString == null) { + this.mapMapOfString = new HashMap<>(); + } this.mapMapOfString.put(key, mapMapOfStringItem); return this; } @@ -124,6 +127,9 @@ public class MapTest { } public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { + if (this.mapOfEnumString == null) { + this.mapOfEnumString = new HashMap<>(); + } this.mapOfEnumString.put(key, mapOfEnumStringItem); return this; } @@ -155,6 +161,9 @@ public class MapTest { } public MapTest putDirectMapItem(String key, Boolean directMapItem) { + if (this.directMap == null) { + this.directMap = new HashMap<>(); + } this.directMap.put(key, directMapItem); return this; } @@ -186,6 +195,9 @@ public class MapTest { } public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { + if (this.indirectMap == null) { + this.indirectMap = new HashMap<>(); + } this.indirectMap.put(key, indirectMapItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e7f63f4af67..0af2b9c43e3 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -109,6 +109,9 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { + if (this.map == null) { + this.map = new HashMap<>(); + } this.map.put(key, mapItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java index 15eb983d5f2..4d0fd3d25a1 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -396,6 +396,9 @@ public class NullableClass extends HashMap { } public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) { + if (this.arrayItemsNullable == null) { + this.arrayItemsNullable = new ArrayList<>(); + } this.arrayItemsNullable.add(arrayItemsNullableItem); return this; } @@ -519,6 +522,9 @@ public class NullableClass extends HashMap { } public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNullableItem) { + if (this.objectItemsNullable == null) { + this.objectItemsNullable = new HashMap<>(); + } this.objectItemsNullable.put(key, objectItemsNullableItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 07c8d009d4f..1ed78c03935 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -142,6 +142,9 @@ public class ObjectWithDeprecatedFields { } public ObjectWithDeprecatedFields addBarsItem(String barsItem) { + if (this.bars == null) { + this.bars = new ArrayList<>(); + } this.bars.add(barsItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java index beca2d006a6..1684ba87f3b 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java @@ -186,6 +186,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } @@ -218,6 +221,9 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = new ArrayList<>(); + } this.tags.add(tagsItem); return this; } diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index 1f114e8f347..ce02f3c7d4e 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java index 1f114e8f347..ce02f3c7d4e 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 1f114e8f347..ce02f3c7d4e 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index 1f114e8f347..ce02f3c7d4e 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index c5b2fefbaf6..3c67eaef5c5 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 36367225a25..faa58324e8c 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 7d80d25c0ae..976ff46bf45 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,15 @@ public class ArrayTest { @JsonProperty("array_of_string") - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java index 76034eff1ac..373b363378b 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -97,7 +97,7 @@ public class EnumArrays { @JsonProperty("array_enum") - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index b830e931ec5..8baddab3db9 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -27,7 +27,7 @@ public class FileSchemaTestClass { @JsonProperty("files") - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java index c1a92c2d5e9..a9cbcde9787 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java index 0a516da0c77..89ecd47ea2c 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -36,7 +36,7 @@ public class XmlItem { @JsonProperty("wrapped_array") - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -52,11 +52,11 @@ public class XmlItem { @JsonProperty("name_array") - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -72,11 +72,11 @@ public class XmlItem { @JsonProperty("prefix_array") - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -92,11 +92,11 @@ public class XmlItem { @JsonProperty("namespace_array") - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -112,11 +112,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 3ae3538469a..2c2b8329de4 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnlyDto { @JsonProperty("ArrayArrayNumber") - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index b9ac23c6661..c971a0fbb1e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnlyDto { @JsonProperty("ArrayNumber") - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java index cbf7877faf1..d5676cf3302 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -26,15 +26,15 @@ public class ArrayTestDto { @JsonProperty("array_of_string") - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTestDto arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java index 123810c921e..fc87a8026c8 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -99,7 +99,7 @@ public class EnumArraysDto { @JsonProperty("array_enum") - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index a7fb42c1980..1d3e103819a 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -29,7 +29,7 @@ public class FileSchemaTestClassDto { @JsonProperty("files") - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClassDto file(FileDto file) { this.file = file; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java index f2536180600..65c15dde159 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java @@ -44,7 +44,7 @@ public class PetDto { @JsonProperty("tags") - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java index 416ed86b17f..c7c50eb4b4a 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java @@ -38,7 +38,7 @@ public class XmlItemDto { @JsonProperty("wrapped_array") - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItemDto { @JsonProperty("name_array") - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItemDto { @JsonProperty("prefix_array") - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItemDto { @JsonProperty("namespace_array") - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItemDto { @JsonProperty("prefix_ns_array") - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItemDto attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Pet.java index 866bfced4c7..c0a3cc863a9 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -188,6 +188,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index a4940ec1ec6..08081168ee6 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index a2679d903aa..d74f9a70f67 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java index 337c357f30e..b52510668e4 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java index 5f83993ee24..ac0adc5d30f 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java @@ -61,7 +61,7 @@ public class Drawing { private JsonNullable nullableShape = JsonNullable.undefined(); public static final String JSON_PROPERTY_SHAPES = "shapes"; - private List shapes = new ArrayList<>(); + private List shapes; public Drawing() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java index 618d07b460a..db4d50934a8 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index fa760cf7ab3..2535ea9856c 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java index 2c8274ecaca..6b579273ce2 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java @@ -85,7 +85,7 @@ public class NullableClass { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 4b597849b86..89a7b3433d0 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -51,7 +51,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java index b54202ff81f..3a8944d2c0a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -182,6 +182,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java index aa414f42c1e..f18b714d61c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index ce65ccc5025..fdb5e59cd6b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index ead205932fa..5b6c415bd66 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 7ab62ebdb8f..4e84838be3b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java index 4c5a142ddca..f7c9710a1ee 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java index 696d07582b9..a96e0290b0b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9b9f087aaa7..dae9b27f93a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java index 13d4b0b04b9..fbbb929632c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java index 03f777866d6..280941921cd 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index ce65ccc5025..fdb5e59cd6b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index ce65ccc5025..fdb5e59cd6b 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java index ce65ccc5025..fdb5e59cd6b 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index ce65ccc5025..fdb5e59cd6b 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java index ce65ccc5025..fdb5e59cd6b 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java index aa414f42c1e..f18b714d61c 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java new file mode 100644 index 00000000000..dcd0fe59179 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -0,0 +1,94 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ArrayOfArrayOfNumberOnly + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ArrayOfArrayOfNumberOnly { + + @JsonProperty("ArrayArrayNumber") + @Valid + private List> arrayArrayNumber = null; + + public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { + this.arrayArrayNumber = arrayArrayNumber; + return this; + } + + public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { + if (this.arrayArrayNumber == null) { + this.arrayArrayNumber = ; + } + this.arrayArrayNumber.add(arrayArrayNumberItem); + return this; + } + + /** + * Get arrayArrayNumber + * @return arrayArrayNumber + */ + @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List> getArrayArrayNumber() { + return arrayArrayNumber; + } + + public void setArrayArrayNumber(List> arrayArrayNumber) { + this.arrayArrayNumber = arrayArrayNumber; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o; + return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber); + } + + @Override + public int hashCode() { + return Objects.hash(arrayArrayNumber); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ArrayOfArrayOfNumberOnly {\n"); + sb.append(" arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java new file mode 100644 index 00000000000..d38ec8372a3 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -0,0 +1,94 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ArrayOfNumberOnly + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ArrayOfNumberOnly { + + @JsonProperty("ArrayNumber") + @Valid + private List arrayNumber = null; + + public ArrayOfNumberOnly arrayNumber(List arrayNumber) { + this.arrayNumber = arrayNumber; + return this; + } + + public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { + if (this.arrayNumber == null) { + this.arrayNumber = ; + } + this.arrayNumber.add(arrayNumberItem); + return this; + } + + /** + * Get arrayNumber + * @return arrayNumber + */ + @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getArrayNumber() { + return arrayNumber; + } + + public void setArrayNumber(List arrayNumber) { + this.arrayNumber = arrayNumber; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o; + return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber); + } + + @Override + public int hashCode() { + return Objects.hash(arrayNumber); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ArrayOfNumberOnly {\n"); + sb.append(" arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java new file mode 100644 index 00000000000..7bd997fdce4 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -0,0 +1,160 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.model.ReadOnlyFirst; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ArrayTest + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ArrayTest { + + @JsonProperty("array_of_string") + @Valid + private List arrayOfString = null; + + @JsonProperty("array_array_of_integer") + @Valid + private List> arrayArrayOfInteger = null; + + @JsonProperty("array_array_of_model") + @Valid + private List> arrayArrayOfModel = null; + + public ArrayTest arrayOfString(List arrayOfString) { + this.arrayOfString = arrayOfString; + return this; + } + + public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { + if (this.arrayOfString == null) { + this.arrayOfString = ; + } + this.arrayOfString.add(arrayOfStringItem); + return this; + } + + /** + * Get arrayOfString + * @return arrayOfString + */ + + @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getArrayOfString() { + return arrayOfString; + } + + public void setArrayOfString(List arrayOfString) { + this.arrayOfString = arrayOfString; + } + + public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { + this.arrayArrayOfInteger = arrayArrayOfInteger; + return this; + } + + public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { + if (this.arrayArrayOfInteger == null) { + this.arrayArrayOfInteger = ; + } + this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); + return this; + } + + /** + * Get arrayArrayOfInteger + * @return arrayArrayOfInteger + */ + @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List> getArrayArrayOfInteger() { + return arrayArrayOfInteger; + } + + public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { + this.arrayArrayOfInteger = arrayArrayOfInteger; + } + + public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { + this.arrayArrayOfModel = arrayArrayOfModel; + return this; + } + + public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayOfModelItem) { + if (this.arrayArrayOfModel == null) { + this.arrayArrayOfModel = ; + } + this.arrayArrayOfModel.add(arrayArrayOfModelItem); + return this; + } + + /** + * Get arrayArrayOfModel + * @return arrayArrayOfModel + */ + @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List> getArrayArrayOfModel() { + return arrayArrayOfModel; + } + + public void setArrayArrayOfModel(List> arrayArrayOfModel) { + this.arrayArrayOfModel = arrayArrayOfModel; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayTest arrayTest = (ArrayTest) o; + return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) && + Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) && + Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel); + } + + @Override + public int hashCode() { + return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ArrayTest {\n"); + sb.append(" arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n"); + sb.append(" arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n"); + sb.append(" arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java new file mode 100644 index 00000000000..71b077585e2 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -0,0 +1,188 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.List; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * EnumArrays + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class EnumArrays { + + /** + * Gets or Sets justSymbol + */ + public enum JustSymbolEnum { + GREATER_THAN_OR_EQUAL_TO(">="), + + DOLLAR("$"); + + private String value; + + JustSymbolEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static JustSymbolEnum fromValue(String value) { + for (JustSymbolEnum b : JustSymbolEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + @JsonProperty("just_symbol") + private JustSymbolEnum justSymbol; + + /** + * Gets or Sets arrayEnum + */ + public enum ArrayEnumEnum { + FISH("fish"), + + CRAB("crab"); + + private String value; + + ArrayEnumEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static ArrayEnumEnum fromValue(String value) { + for (ArrayEnumEnum b : ArrayEnumEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + @JsonProperty("array_enum") + @Valid + private List arrayEnum = null; + + public EnumArrays justSymbol(JustSymbolEnum justSymbol) { + this.justSymbol = justSymbol; + return this; + } + + /** + * Get justSymbol + * @return justSymbol + */ + + @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public JustSymbolEnum getJustSymbol() { + return justSymbol; + } + + public void setJustSymbol(JustSymbolEnum justSymbol) { + this.justSymbol = justSymbol; + } + + public EnumArrays arrayEnum(List arrayEnum) { + this.arrayEnum = arrayEnum; + return this; + } + + public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { + if (this.arrayEnum == null) { + this.arrayEnum = ; + } + this.arrayEnum.add(arrayEnumItem); + return this; + } + + /** + * Get arrayEnum + * @return arrayEnum + */ + + @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getArrayEnum() { + return arrayEnum; + } + + public void setArrayEnum(List arrayEnum) { + this.arrayEnum = arrayEnum; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + EnumArrays enumArrays = (EnumArrays) o; + return Objects.equals(this.justSymbol, enumArrays.justSymbol) && + Objects.equals(this.arrayEnum, enumArrays.arrayEnum); + } + + @Override + public int hashCode() { + return Objects.hash(justSymbol, arrayEnum); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class EnumArrays {\n"); + sb.append(" justSymbol: ").append(toIndentedString(justSymbol)).append("\n"); + sb.append(" arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java new file mode 100644 index 00000000000..2562c3ab08f --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -0,0 +1,118 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * FileSchemaTestClass + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class FileSchemaTestClass { + + @JsonProperty("file") + private File file; + + @JsonProperty("files") + @Valid + private List<@Valid File> files = null; + + public FileSchemaTestClass file(File file) { + this.file = file; + return this; + } + + /** + * Get file + * @return file + */ + @Valid + @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public File getFile() { + return file; + } + + public void setFile(File file) { + this.file = file; + } + + public FileSchemaTestClass files(List<@Valid File> files) { + this.files = files; + return this; + } + + public FileSchemaTestClass addFilesItem(File filesItem) { + if (this.files == null) { + this.files = ; + } + this.files.add(filesItem); + return this; + } + + /** + * Get files + * @return files + */ + @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List<@Valid File> getFiles() { + return files; + } + + public void setFiles(List<@Valid File> files) { + this.files = files; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o; + return Objects.equals(this.file, fileSchemaTestClass.file) && + Objects.equals(this.files, fileSchemaTestClass.files); + } + + @Override + public int hashCode() { + return Objects.hash(file, files); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FileSchemaTestClass {\n"); + sb.append(" file: ").append(toIndentedString(file)).append("\n"); + sb.append(" files: ").append(toIndentedString(files)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java new file mode 100644 index 00000000000..abae02f7f68 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -0,0 +1,283 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import org.openapitools.model.Category; +import org.openapitools.model.Tag; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * Pet + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class Pet { + + @JsonProperty("id") + private Long id; + + @JsonProperty("category") + private Category category; + + @JsonProperty("name") + private String name; + + @JsonProperty("photoUrls") + @Valid + private Set photoUrls = new LinkedHashSet<>(); + + @JsonProperty("tags") + @Valid + private List<@Valid Tag> tags = null; + + /** + * pet status in the store + */ + public enum StatusEnum { + AVAILABLE("available"), + + PENDING("pending"), + + SOLD("sold"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + @JsonProperty("status") + private StatusEnum status; + + /** + * Default constructor + * @deprecated Use {@link Pet#Pet(String, Set)} + */ + @Deprecated + public Pet() { + super(); + } + + /** + * Constructor with only required parameters + */ + public Pet(String name, Set photoUrls) { + this.name = name; + this.photoUrls = photoUrls; + } + + public Pet id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + */ + + @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Pet category(Category category) { + this.category = category; + return this; + } + + /** + * Get category + * @return category + */ + @Valid + @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Category getCategory() { + return category; + } + + public void setCategory(Category category) { + this.category = category; + } + + public Pet name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @NotNull + @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Pet photoUrls(Set photoUrls) { + this.photoUrls = photoUrls; + return this; + } + + public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } + this.photoUrls.add(photoUrlsItem); + return this; + } + + /** + * Get photoUrls + * @return photoUrls + */ + @NotNull + @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + public Set getPhotoUrls() { + return photoUrls; + } + + @JsonDeserialize(as = LinkedHashSet.class) + public void setPhotoUrls(Set photoUrls) { + this.photoUrls = photoUrls; + } + + public Pet tags(List<@Valid Tag> tags) { + this.tags = tags; + return this; + } + + public Pet addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = ; + } + this.tags.add(tagsItem); + return this; + } + + /** + * Get tags + * @return tags + */ + @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List<@Valid Tag> getTags() { + return tags; + } + + public void setTags(List<@Valid Tag> tags) { + this.tags = tags; + } + + public Pet status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * pet status in the store + * @return status + */ + + @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public StatusEnum getStatus() { + return status; + } + + public void setStatus(StatusEnum status) { + this.status = status; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pet pet = (Pet) o; + return Objects.equals(this.id, pet.id) && + Objects.equals(this.category, pet.category) && + Objects.equals(this.name, pet.name) && + Objects.equals(this.photoUrls, pet.photoUrls) && + Objects.equals(this.tags, pet.tags) && + Objects.equals(this.status, pet.status); + } + + @Override + public int hashCode() { + return Objects.hash(id, category, name, photoUrls, tags, status); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pet {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" category: ").append(toIndentedString(category)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java new file mode 100644 index 00000000000..d84afd1cc53 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -0,0 +1,838 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * XmlItem + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class XmlItem { + + @JsonProperty("attribute_string") + private String attributeString; + + @JsonProperty("attribute_number") + private BigDecimal attributeNumber; + + @JsonProperty("attribute_integer") + private Integer attributeInteger; + + @JsonProperty("attribute_boolean") + private Boolean attributeBoolean; + + @JsonProperty("wrapped_array") + @Valid + private List wrappedArray = null; + + @JsonProperty("name_string") + private String nameString; + + @JsonProperty("name_number") + private BigDecimal nameNumber; + + @JsonProperty("name_integer") + private Integer nameInteger; + + @JsonProperty("name_boolean") + private Boolean nameBoolean; + + @JsonProperty("name_array") + @Valid + private List nameArray = null; + + @JsonProperty("name_wrapped_array") + @Valid + private List nameWrappedArray = null; + + @JsonProperty("prefix_string") + private String prefixString; + + @JsonProperty("prefix_number") + private BigDecimal prefixNumber; + + @JsonProperty("prefix_integer") + private Integer prefixInteger; + + @JsonProperty("prefix_boolean") + private Boolean prefixBoolean; + + @JsonProperty("prefix_array") + @Valid + private List prefixArray = null; + + @JsonProperty("prefix_wrapped_array") + @Valid + private List prefixWrappedArray = null; + + @JsonProperty("namespace_string") + private String namespaceString; + + @JsonProperty("namespace_number") + private BigDecimal namespaceNumber; + + @JsonProperty("namespace_integer") + private Integer namespaceInteger; + + @JsonProperty("namespace_boolean") + private Boolean namespaceBoolean; + + @JsonProperty("namespace_array") + @Valid + private List namespaceArray = null; + + @JsonProperty("namespace_wrapped_array") + @Valid + private List namespaceWrappedArray = null; + + @JsonProperty("prefix_ns_string") + private String prefixNsString; + + @JsonProperty("prefix_ns_number") + private BigDecimal prefixNsNumber; + + @JsonProperty("prefix_ns_integer") + private Integer prefixNsInteger; + + @JsonProperty("prefix_ns_boolean") + private Boolean prefixNsBoolean; + + @JsonProperty("prefix_ns_array") + @Valid + private List prefixNsArray = null; + + @JsonProperty("prefix_ns_wrapped_array") + @Valid + private List prefixNsWrappedArray = null; + + public XmlItem attributeString(String attributeString) { + this.attributeString = attributeString; + return this; + } + + /** + * Get attributeString + * @return attributeString + */ + + @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public String getAttributeString() { + return attributeString; + } + + public void setAttributeString(String attributeString) { + this.attributeString = attributeString; + } + + public XmlItem attributeNumber(BigDecimal attributeNumber) { + this.attributeNumber = attributeNumber; + return this; + } + + /** + * Get attributeNumber + * @return attributeNumber + */ + @Valid + @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public BigDecimal getAttributeNumber() { + return attributeNumber; + } + + public void setAttributeNumber(BigDecimal attributeNumber) { + this.attributeNumber = attributeNumber; + } + + public XmlItem attributeInteger(Integer attributeInteger) { + this.attributeInteger = attributeInteger; + return this; + } + + /** + * Get attributeInteger + * @return attributeInteger + */ + + @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Integer getAttributeInteger() { + return attributeInteger; + } + + public void setAttributeInteger(Integer attributeInteger) { + this.attributeInteger = attributeInteger; + } + + public XmlItem attributeBoolean(Boolean attributeBoolean) { + this.attributeBoolean = attributeBoolean; + return this; + } + + /** + * Get attributeBoolean + * @return attributeBoolean + */ + + @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Boolean getAttributeBoolean() { + return attributeBoolean; + } + + public void setAttributeBoolean(Boolean attributeBoolean) { + this.attributeBoolean = attributeBoolean; + } + + public XmlItem wrappedArray(List wrappedArray) { + this.wrappedArray = wrappedArray; + return this; + } + + public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { + if (this.wrappedArray == null) { + this.wrappedArray = ; + } + this.wrappedArray.add(wrappedArrayItem); + return this; + } + + /** + * Get wrappedArray + * @return wrappedArray + */ + + @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getWrappedArray() { + return wrappedArray; + } + + public void setWrappedArray(List wrappedArray) { + this.wrappedArray = wrappedArray; + } + + public XmlItem nameString(String nameString) { + this.nameString = nameString; + return this; + } + + /** + * Get nameString + * @return nameString + */ + + @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public String getNameString() { + return nameString; + } + + public void setNameString(String nameString) { + this.nameString = nameString; + } + + public XmlItem nameNumber(BigDecimal nameNumber) { + this.nameNumber = nameNumber; + return this; + } + + /** + * Get nameNumber + * @return nameNumber + */ + @Valid + @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public BigDecimal getNameNumber() { + return nameNumber; + } + + public void setNameNumber(BigDecimal nameNumber) { + this.nameNumber = nameNumber; + } + + public XmlItem nameInteger(Integer nameInteger) { + this.nameInteger = nameInteger; + return this; + } + + /** + * Get nameInteger + * @return nameInteger + */ + + @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Integer getNameInteger() { + return nameInteger; + } + + public void setNameInteger(Integer nameInteger) { + this.nameInteger = nameInteger; + } + + public XmlItem nameBoolean(Boolean nameBoolean) { + this.nameBoolean = nameBoolean; + return this; + } + + /** + * Get nameBoolean + * @return nameBoolean + */ + + @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Boolean getNameBoolean() { + return nameBoolean; + } + + public void setNameBoolean(Boolean nameBoolean) { + this.nameBoolean = nameBoolean; + } + + public XmlItem nameArray(List nameArray) { + this.nameArray = nameArray; + return this; + } + + public XmlItem addNameArrayItem(Integer nameArrayItem) { + if (this.nameArray == null) { + this.nameArray = ; + } + this.nameArray.add(nameArrayItem); + return this; + } + + /** + * Get nameArray + * @return nameArray + */ + + @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getNameArray() { + return nameArray; + } + + public void setNameArray(List nameArray) { + this.nameArray = nameArray; + } + + public XmlItem nameWrappedArray(List nameWrappedArray) { + this.nameWrappedArray = nameWrappedArray; + return this; + } + + public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { + if (this.nameWrappedArray == null) { + this.nameWrappedArray = ; + } + this.nameWrappedArray.add(nameWrappedArrayItem); + return this; + } + + /** + * Get nameWrappedArray + * @return nameWrappedArray + */ + + @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getNameWrappedArray() { + return nameWrappedArray; + } + + public void setNameWrappedArray(List nameWrappedArray) { + this.nameWrappedArray = nameWrappedArray; + } + + public XmlItem prefixString(String prefixString) { + this.prefixString = prefixString; + return this; + } + + /** + * Get prefixString + * @return prefixString + */ + + @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public String getPrefixString() { + return prefixString; + } + + public void setPrefixString(String prefixString) { + this.prefixString = prefixString; + } + + public XmlItem prefixNumber(BigDecimal prefixNumber) { + this.prefixNumber = prefixNumber; + return this; + } + + /** + * Get prefixNumber + * @return prefixNumber + */ + @Valid + @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public BigDecimal getPrefixNumber() { + return prefixNumber; + } + + public void setPrefixNumber(BigDecimal prefixNumber) { + this.prefixNumber = prefixNumber; + } + + public XmlItem prefixInteger(Integer prefixInteger) { + this.prefixInteger = prefixInteger; + return this; + } + + /** + * Get prefixInteger + * @return prefixInteger + */ + + @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Integer getPrefixInteger() { + return prefixInteger; + } + + public void setPrefixInteger(Integer prefixInteger) { + this.prefixInteger = prefixInteger; + } + + public XmlItem prefixBoolean(Boolean prefixBoolean) { + this.prefixBoolean = prefixBoolean; + return this; + } + + /** + * Get prefixBoolean + * @return prefixBoolean + */ + + @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Boolean getPrefixBoolean() { + return prefixBoolean; + } + + public void setPrefixBoolean(Boolean prefixBoolean) { + this.prefixBoolean = prefixBoolean; + } + + public XmlItem prefixArray(List prefixArray) { + this.prefixArray = prefixArray; + return this; + } + + public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { + if (this.prefixArray == null) { + this.prefixArray = ; + } + this.prefixArray.add(prefixArrayItem); + return this; + } + + /** + * Get prefixArray + * @return prefixArray + */ + + @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getPrefixArray() { + return prefixArray; + } + + public void setPrefixArray(List prefixArray) { + this.prefixArray = prefixArray; + } + + public XmlItem prefixWrappedArray(List prefixWrappedArray) { + this.prefixWrappedArray = prefixWrappedArray; + return this; + } + + public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { + if (this.prefixWrappedArray == null) { + this.prefixWrappedArray = ; + } + this.prefixWrappedArray.add(prefixWrappedArrayItem); + return this; + } + + /** + * Get prefixWrappedArray + * @return prefixWrappedArray + */ + + @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getPrefixWrappedArray() { + return prefixWrappedArray; + } + + public void setPrefixWrappedArray(List prefixWrappedArray) { + this.prefixWrappedArray = prefixWrappedArray; + } + + public XmlItem namespaceString(String namespaceString) { + this.namespaceString = namespaceString; + return this; + } + + /** + * Get namespaceString + * @return namespaceString + */ + + @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public String getNamespaceString() { + return namespaceString; + } + + public void setNamespaceString(String namespaceString) { + this.namespaceString = namespaceString; + } + + public XmlItem namespaceNumber(BigDecimal namespaceNumber) { + this.namespaceNumber = namespaceNumber; + return this; + } + + /** + * Get namespaceNumber + * @return namespaceNumber + */ + @Valid + @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public BigDecimal getNamespaceNumber() { + return namespaceNumber; + } + + public void setNamespaceNumber(BigDecimal namespaceNumber) { + this.namespaceNumber = namespaceNumber; + } + + public XmlItem namespaceInteger(Integer namespaceInteger) { + this.namespaceInteger = namespaceInteger; + return this; + } + + /** + * Get namespaceInteger + * @return namespaceInteger + */ + + @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Integer getNamespaceInteger() { + return namespaceInteger; + } + + public void setNamespaceInteger(Integer namespaceInteger) { + this.namespaceInteger = namespaceInteger; + } + + public XmlItem namespaceBoolean(Boolean namespaceBoolean) { + this.namespaceBoolean = namespaceBoolean; + return this; + } + + /** + * Get namespaceBoolean + * @return namespaceBoolean + */ + + @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Boolean getNamespaceBoolean() { + return namespaceBoolean; + } + + public void setNamespaceBoolean(Boolean namespaceBoolean) { + this.namespaceBoolean = namespaceBoolean; + } + + public XmlItem namespaceArray(List namespaceArray) { + this.namespaceArray = namespaceArray; + return this; + } + + public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { + if (this.namespaceArray == null) { + this.namespaceArray = ; + } + this.namespaceArray.add(namespaceArrayItem); + return this; + } + + /** + * Get namespaceArray + * @return namespaceArray + */ + + @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getNamespaceArray() { + return namespaceArray; + } + + public void setNamespaceArray(List namespaceArray) { + this.namespaceArray = namespaceArray; + } + + public XmlItem namespaceWrappedArray(List namespaceWrappedArray) { + this.namespaceWrappedArray = namespaceWrappedArray; + return this; + } + + public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { + if (this.namespaceWrappedArray == null) { + this.namespaceWrappedArray = ; + } + this.namespaceWrappedArray.add(namespaceWrappedArrayItem); + return this; + } + + /** + * Get namespaceWrappedArray + * @return namespaceWrappedArray + */ + + @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getNamespaceWrappedArray() { + return namespaceWrappedArray; + } + + public void setNamespaceWrappedArray(List namespaceWrappedArray) { + this.namespaceWrappedArray = namespaceWrappedArray; + } + + public XmlItem prefixNsString(String prefixNsString) { + this.prefixNsString = prefixNsString; + return this; + } + + /** + * Get prefixNsString + * @return prefixNsString + */ + + @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public String getPrefixNsString() { + return prefixNsString; + } + + public void setPrefixNsString(String prefixNsString) { + this.prefixNsString = prefixNsString; + } + + public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { + this.prefixNsNumber = prefixNsNumber; + return this; + } + + /** + * Get prefixNsNumber + * @return prefixNsNumber + */ + @Valid + @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public BigDecimal getPrefixNsNumber() { + return prefixNsNumber; + } + + public void setPrefixNsNumber(BigDecimal prefixNsNumber) { + this.prefixNsNumber = prefixNsNumber; + } + + public XmlItem prefixNsInteger(Integer prefixNsInteger) { + this.prefixNsInteger = prefixNsInteger; + return this; + } + + /** + * Get prefixNsInteger + * @return prefixNsInteger + */ + + @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Integer getPrefixNsInteger() { + return prefixNsInteger; + } + + public void setPrefixNsInteger(Integer prefixNsInteger) { + this.prefixNsInteger = prefixNsInteger; + } + + public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { + this.prefixNsBoolean = prefixNsBoolean; + return this; + } + + /** + * Get prefixNsBoolean + * @return prefixNsBoolean + */ + + @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public Boolean getPrefixNsBoolean() { + return prefixNsBoolean; + } + + public void setPrefixNsBoolean(Boolean prefixNsBoolean) { + this.prefixNsBoolean = prefixNsBoolean; + } + + public XmlItem prefixNsArray(List prefixNsArray) { + this.prefixNsArray = prefixNsArray; + return this; + } + + public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { + if (this.prefixNsArray == null) { + this.prefixNsArray = ; + } + this.prefixNsArray.add(prefixNsArrayItem); + return this; + } + + /** + * Get prefixNsArray + * @return prefixNsArray + */ + + @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getPrefixNsArray() { + return prefixNsArray; + } + + public void setPrefixNsArray(List prefixNsArray) { + this.prefixNsArray = prefixNsArray; + } + + public XmlItem prefixNsWrappedArray(List prefixNsWrappedArray) { + this.prefixNsWrappedArray = prefixNsWrappedArray; + return this; + } + + public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { + if (this.prefixNsWrappedArray == null) { + this.prefixNsWrappedArray = ; + } + this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); + return this; + } + + /** + * Get prefixNsWrappedArray + * @return prefixNsWrappedArray + */ + + @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + public List getPrefixNsWrappedArray() { + return prefixNsWrappedArray; + } + + public void setPrefixNsWrappedArray(List prefixNsWrappedArray) { + this.prefixNsWrappedArray = prefixNsWrappedArray; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + XmlItem xmlItem = (XmlItem) o; + return Objects.equals(this.attributeString, xmlItem.attributeString) && + Objects.equals(this.attributeNumber, xmlItem.attributeNumber) && + Objects.equals(this.attributeInteger, xmlItem.attributeInteger) && + Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) && + Objects.equals(this.wrappedArray, xmlItem.wrappedArray) && + Objects.equals(this.nameString, xmlItem.nameString) && + Objects.equals(this.nameNumber, xmlItem.nameNumber) && + Objects.equals(this.nameInteger, xmlItem.nameInteger) && + Objects.equals(this.nameBoolean, xmlItem.nameBoolean) && + Objects.equals(this.nameArray, xmlItem.nameArray) && + Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) && + Objects.equals(this.prefixString, xmlItem.prefixString) && + Objects.equals(this.prefixNumber, xmlItem.prefixNumber) && + Objects.equals(this.prefixInteger, xmlItem.prefixInteger) && + Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) && + Objects.equals(this.prefixArray, xmlItem.prefixArray) && + Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) && + Objects.equals(this.namespaceString, xmlItem.namespaceString) && + Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) && + Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) && + Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) && + Objects.equals(this.namespaceArray, xmlItem.namespaceArray) && + Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) && + Objects.equals(this.prefixNsString, xmlItem.prefixNsString) && + Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) && + Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) && + Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) && + Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) && + Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray); + } + + @Override + public int hashCode() { + return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class XmlItem {\n"); + sb.append(" attributeString: ").append(toIndentedString(attributeString)).append("\n"); + sb.append(" attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n"); + sb.append(" attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n"); + sb.append(" attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n"); + sb.append(" wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n"); + sb.append(" nameString: ").append(toIndentedString(nameString)).append("\n"); + sb.append(" nameNumber: ").append(toIndentedString(nameNumber)).append("\n"); + sb.append(" nameInteger: ").append(toIndentedString(nameInteger)).append("\n"); + sb.append(" nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n"); + sb.append(" nameArray: ").append(toIndentedString(nameArray)).append("\n"); + sb.append(" nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n"); + sb.append(" prefixString: ").append(toIndentedString(prefixString)).append("\n"); + sb.append(" prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n"); + sb.append(" prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n"); + sb.append(" prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n"); + sb.append(" prefixArray: ").append(toIndentedString(prefixArray)).append("\n"); + sb.append(" prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n"); + sb.append(" namespaceString: ").append(toIndentedString(namespaceString)).append("\n"); + sb.append(" namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n"); + sb.append(" namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n"); + sb.append(" namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n"); + sb.append(" namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n"); + sb.append(" namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n"); + sb.append(" prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n"); + sb.append(" prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n"); + sb.append(" prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n"); + sb.append(" prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n"); + sb.append(" prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n"); + sb.append(" prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index ead205932fa..5b6c415bd66 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 7ab62ebdb8f..4e84838be3b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 4c5a142ddca..f7c9710a1ee 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index 696d07582b9..a96e0290b0b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9b9f087aaa7..dae9b27f93a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index 3f4cf6872f2..ba99ad03027 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 03f777866d6..280941921cd 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index ead205932fa..5b6c415bd66 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 7ab62ebdb8f..4e84838be3b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 4c5a142ddca..f7c9710a1ee 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index 696d07582b9..a96e0290b0b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9b9f087aaa7..dae9b27f93a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index 3f4cf6872f2..ba99ad03027 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 03f777866d6..280941921cd 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java index 081e4813a03..05bed382e38 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java @@ -40,7 +40,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index ce65ccc5025..fdb5e59cd6b 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java index 204aebc64be..6fa31a30601 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java @@ -55,7 +55,7 @@ public class Pet { @JsonProperty("tags") @JacksonXmlProperty(localName = "tag") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayOfArrayOfNumberOnly.java index 5ba378a4203..5a69a913b27 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayOfArrayOfNumberOnly.java @@ -8,7 +8,7 @@ import java.util.List; public class ArrayOfArrayOfNumberOnly { - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; /** * Default constructor. diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayOfNumberOnly.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayOfNumberOnly.java index 05e4cfc0700..40e72b6f2d8 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayOfNumberOnly.java @@ -8,7 +8,7 @@ import java.util.List; public class ArrayOfNumberOnly { - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; /** * Default constructor. diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayTest.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayTest.java index f7eeaade3fa..b2d045b68b2 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayTest.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ArrayTest.java @@ -8,9 +8,9 @@ import org.openapitools.server.model.ReadOnlyFirst; public class ArrayTest { - private List arrayOfString = new ArrayList<>(); - private List> arrayArrayOfInteger = new ArrayList<>(); - private List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString; + private List> arrayArrayOfInteger; + private List> arrayArrayOfModel; /** * Default constructor. diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/EnumArrays.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/EnumArrays.java index d7f30e7d963..e9e4daaecc8 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/EnumArrays.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/EnumArrays.java @@ -84,7 +84,7 @@ public class EnumArrays { } - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; /** * Default constructor. diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FileSchemaTestClass.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FileSchemaTestClass.java index 1730307fb6d..5093257b24c 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FileSchemaTestClass.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FileSchemaTestClass.java @@ -9,7 +9,7 @@ import org.openapitools.server.model.ModelFile; public class FileSchemaTestClass { private ModelFile _file; - private List files = new ArrayList<>(); + private List files; /** * Default constructor. diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java index 59ce4a39d4f..735e3b307ca 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java @@ -21,7 +21,7 @@ public class NullableClass extends HashMap { private OffsetDateTime datetimeProp; private List arrayNullableProp; private List arrayAndItemsNullableProp; - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; private Map objectNullableProp; private Map objectAndItemsNullableProp; private Map objectItemsNullable = new HashMap<>(); diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java index 57ee9e374e2..4dfe7668003 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java @@ -12,7 +12,7 @@ public class ObjectWithDeprecatedFields { private String uuid; private BigDecimal id; private DeprecatedObject deprecatedRef; - private List bars = new ArrayList<>(); + private List bars; /** * Default constructor. diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/Pet.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/Pet.java index a040a9d288b..912a250f075 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/Pet.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/Pet.java @@ -18,7 +18,7 @@ public class Pet { private Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Category.java index 1de389611a7..9576dcd6e26 100644 --- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Category.java @@ -130,3 +130,4 @@ public class Category { } } + diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/ModelApiResponse.java index 91ecfafb30e..44d45d6d275 100644 --- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -159,3 +159,4 @@ public class ModelApiResponse { } } + diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Order.java index f759446ae7c..8cb7e05b1a2 100644 --- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Order.java @@ -282,3 +282,4 @@ public class Order { } } + diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Pet.java index 1ce739e5bec..11da25fbd87 100644 --- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Pet.java @@ -299,3 +299,4 @@ public class Pet { } } + diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Tag.java index fe4dd0f4676..7f1a13a0d93 100644 --- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Tag.java @@ -129,3 +129,4 @@ public class Tag { } } + diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/User.java index e1e76dd010f..1f63c57007d 100644 --- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/User.java @@ -303,3 +303,4 @@ public class User { } } + diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 97fe7e6c187..bc9d242b3d8 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,7 @@ public class ArrayOfArrayOfNumberOnly { public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { if (this.arrayArrayNumber == null) { - this.arrayArrayNumber = new ArrayList<>(); + this.arrayArrayNumber = ; } this.arrayArrayNumber.add(arrayArrayNumberItem); return this; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index ae571a3d226..e4a25016b00 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,7 @@ public class ArrayOfNumberOnly { public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { if (this.arrayNumber == null) { - this.arrayNumber = new ArrayList<>(); + this.arrayNumber = ; } this.arrayNumber.add(arrayNumberItem); return this; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayTest.java index d16008230a2..ab30aa4a984 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/ArrayTest.java @@ -30,7 +30,7 @@ public class ArrayTest { public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { if (this.arrayOfString == null) { - this.arrayOfString = new ArrayList<>(); + this.arrayOfString = ; } this.arrayOfString.add(arrayOfStringItem); return this; @@ -56,7 +56,7 @@ public class ArrayTest { public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { if (this.arrayArrayOfInteger == null) { - this.arrayArrayOfInteger = new ArrayList<>(); + this.arrayArrayOfInteger = ; } this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; @@ -82,7 +82,7 @@ public class ArrayTest { public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { if (this.arrayArrayOfModel == null) { - this.arrayArrayOfModel = new ArrayList<>(); + this.arrayArrayOfModel = ; } this.arrayArrayOfModel.add(arrayArrayOfModelItem); return this; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java index 0fa1c622d1a..db979d44f73 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java @@ -107,7 +107,7 @@ public class EnumArrays { public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { if (this.arrayEnum == null) { - this.arrayEnum = new ArrayList<>(); + this.arrayEnum = ; } this.arrayEnum.add(arrayEnumItem); return this; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index cd8b2ebb7a7..5ddf74ec036 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -45,7 +45,7 @@ public class FileSchemaTestClass { public FileSchemaTestClass addFilesItem(ModelFile filesItem) { if (this.files == null) { - this.files = new ArrayList<>(); + this.files = ; } this.files.add(filesItem); return this; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java index 865097fcdab..a398e2eae4d 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java @@ -155,7 +155,7 @@ public class Pet { public Pet addTagsItem(Tag tagsItem) { if (this.tags == null) { - this.tags = new ArrayList<>(); + this.tags = ; } this.tags.add(tagsItem); return this; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/XmlItem.java index bd878a2a8bc..c2fe7aea473 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/XmlItem.java @@ -180,7 +180,7 @@ public class XmlItem { public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { if (this.wrappedArray == null) { - this.wrappedArray = new ArrayList<>(); + this.wrappedArray = ; } this.wrappedArray.add(wrappedArrayItem); return this; @@ -278,7 +278,7 @@ public class XmlItem { public XmlItem addNameArrayItem(Integer nameArrayItem) { if (this.nameArray == null) { - this.nameArray = new ArrayList<>(); + this.nameArray = ; } this.nameArray.add(nameArrayItem); return this; @@ -304,7 +304,7 @@ public class XmlItem { public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { if (this.nameWrappedArray == null) { - this.nameWrappedArray = new ArrayList<>(); + this.nameWrappedArray = ; } this.nameWrappedArray.add(nameWrappedArrayItem); return this; @@ -402,7 +402,7 @@ public class XmlItem { public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { if (this.prefixArray == null) { - this.prefixArray = new ArrayList<>(); + this.prefixArray = ; } this.prefixArray.add(prefixArrayItem); return this; @@ -428,7 +428,7 @@ public class XmlItem { public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { if (this.prefixWrappedArray == null) { - this.prefixWrappedArray = new ArrayList<>(); + this.prefixWrappedArray = ; } this.prefixWrappedArray.add(prefixWrappedArrayItem); return this; @@ -526,7 +526,7 @@ public class XmlItem { public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { if (this.namespaceArray == null) { - this.namespaceArray = new ArrayList<>(); + this.namespaceArray = ; } this.namespaceArray.add(namespaceArrayItem); return this; @@ -552,7 +552,7 @@ public class XmlItem { public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { if (this.namespaceWrappedArray == null) { - this.namespaceWrappedArray = new ArrayList<>(); + this.namespaceWrappedArray = ; } this.namespaceWrappedArray.add(namespaceWrappedArrayItem); return this; @@ -650,7 +650,7 @@ public class XmlItem { public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { if (this.prefixNsArray == null) { - this.prefixNsArray = new ArrayList<>(); + this.prefixNsArray = ; } this.prefixNsArray.add(prefixNsArrayItem); return this; @@ -676,7 +676,7 @@ public class XmlItem { public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { if (this.prefixNsWrappedArray == null) { - this.prefixNsWrappedArray = new ArrayList<>(); + this.prefixNsWrappedArray = ; } this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); return this; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java index ba9e0d9bf44..d8c0d60adc3 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfArrayOfNumberOnly.java @@ -25,10 +25,10 @@ public class ArrayOfArrayOfNumberOnly { } public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { - if (arrayArrayNumber == null) { - arrayArrayNumber = new ArrayList<>(); + if (this.arrayArrayNumber == null) { + this.arrayArrayNumber = new ArrayList<>(); } - arrayArrayNumber.add(arrayArrayNumberItem); + this.arrayArrayNumber.add(arrayArrayNumberItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java index bca0376c0e5..82edd75916c 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayOfNumberOnly.java @@ -25,10 +25,10 @@ public class ArrayOfNumberOnly { } public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { - if (arrayNumber == null) { - arrayNumber = new ArrayList<>(); + if (this.arrayNumber == null) { + this.arrayNumber = new ArrayList<>(); } - arrayNumber.add(arrayNumberItem); + this.arrayNumber.add(arrayNumberItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java index d9701181453..dd656c8b417 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/ArrayTest.java @@ -34,10 +34,10 @@ public class ArrayTest { } public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { - if (arrayOfString == null) { - arrayOfString = new ArrayList<>(); + if (this.arrayOfString == null) { + this.arrayOfString = new ArrayList<>(); } - arrayOfString.add(arrayOfStringItem); + this.arrayOfString.add(arrayOfStringItem); return this; } @@ -59,10 +59,10 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { - if (arrayArrayOfInteger == null) { - arrayArrayOfInteger = new ArrayList<>(); + if (this.arrayArrayOfInteger == null) { + this.arrayArrayOfInteger = new ArrayList<>(); } - arrayArrayOfInteger.add(arrayArrayOfIntegerItem); + this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; } @@ -84,10 +84,10 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { - if (arrayArrayOfModel == null) { - arrayArrayOfModel = new ArrayList<>(); + if (this.arrayArrayOfModel == null) { + this.arrayArrayOfModel = new ArrayList<>(); } - arrayArrayOfModel.add(arrayArrayOfModelItem); + this.arrayArrayOfModel.add(arrayArrayOfModelItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java index 149ca53994d..08d51636d53 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/EnumArrays.java @@ -106,10 +106,10 @@ public class EnumArrays { } public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { - if (arrayEnum == null) { - arrayEnum = new ArrayList<>(); + if (this.arrayEnum == null) { + this.arrayEnum = new ArrayList<>(); } - arrayEnum.add(arrayEnumItem); + this.arrayEnum.add(arrayEnumItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FileSchemaTestClass.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FileSchemaTestClass.java index 4d3fd25cbed..ba2929116d4 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FileSchemaTestClass.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FileSchemaTestClass.java @@ -47,10 +47,10 @@ public class FileSchemaTestClass { } public FileSchemaTestClass addFilesItem(ModelFile filesItem) { - if (files == null) { - files = new ArrayList<>(); + if (this.files == null) { + this.files = new ArrayList<>(); } - files.add(filesItem); + this.files.add(filesItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java index 6f748228b87..2ad90fc26fa 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java @@ -136,7 +136,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -159,10 +162,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderDefault.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderDefault.java index a8e52c7bfe5..f810a7b3bf7 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderDefault.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderDefault.java @@ -114,7 +114,10 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { - arrayItem.add(arrayItemItem); + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } + this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java index 7295c42a7b3..d00bd542652 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/TypeHolderExample.java @@ -136,7 +136,10 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { - arrayItem.add(arrayItemItem); + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } + this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/XmlItem.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/XmlItem.java index 114918e3cf9..83a4227b611 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/XmlItem.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/XmlItem.java @@ -209,10 +209,10 @@ public class XmlItem { } public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { - if (wrappedArray == null) { - wrappedArray = new ArrayList<>(); + if (this.wrappedArray == null) { + this.wrappedArray = new ArrayList<>(); } - wrappedArray.add(wrappedArrayItem); + this.wrappedArray.add(wrappedArrayItem); return this; } @@ -302,10 +302,10 @@ public class XmlItem { } public XmlItem addNameArrayItem(Integer nameArrayItem) { - if (nameArray == null) { - nameArray = new ArrayList<>(); + if (this.nameArray == null) { + this.nameArray = new ArrayList<>(); } - nameArray.add(nameArrayItem); + this.nameArray.add(nameArrayItem); return this; } @@ -327,10 +327,10 @@ public class XmlItem { } public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { - if (nameWrappedArray == null) { - nameWrappedArray = new ArrayList<>(); + if (this.nameWrappedArray == null) { + this.nameWrappedArray = new ArrayList<>(); } - nameWrappedArray.add(nameWrappedArrayItem); + this.nameWrappedArray.add(nameWrappedArrayItem); return this; } @@ -420,10 +420,10 @@ public class XmlItem { } public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { - if (prefixArray == null) { - prefixArray = new ArrayList<>(); + if (this.prefixArray == null) { + this.prefixArray = new ArrayList<>(); } - prefixArray.add(prefixArrayItem); + this.prefixArray.add(prefixArrayItem); return this; } @@ -445,10 +445,10 @@ public class XmlItem { } public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { - if (prefixWrappedArray == null) { - prefixWrappedArray = new ArrayList<>(); + if (this.prefixWrappedArray == null) { + this.prefixWrappedArray = new ArrayList<>(); } - prefixWrappedArray.add(prefixWrappedArrayItem); + this.prefixWrappedArray.add(prefixWrappedArrayItem); return this; } @@ -538,10 +538,10 @@ public class XmlItem { } public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { - if (namespaceArray == null) { - namespaceArray = new ArrayList<>(); + if (this.namespaceArray == null) { + this.namespaceArray = new ArrayList<>(); } - namespaceArray.add(namespaceArrayItem); + this.namespaceArray.add(namespaceArrayItem); return this; } @@ -563,10 +563,10 @@ public class XmlItem { } public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { - if (namespaceWrappedArray == null) { - namespaceWrappedArray = new ArrayList<>(); + if (this.namespaceWrappedArray == null) { + this.namespaceWrappedArray = new ArrayList<>(); } - namespaceWrappedArray.add(namespaceWrappedArrayItem); + this.namespaceWrappedArray.add(namespaceWrappedArrayItem); return this; } @@ -656,10 +656,10 @@ public class XmlItem { } public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { - if (prefixNsArray == null) { - prefixNsArray = new ArrayList<>(); + if (this.prefixNsArray == null) { + this.prefixNsArray = new ArrayList<>(); } - prefixNsArray.add(prefixNsArrayItem); + this.prefixNsArray.add(prefixNsArrayItem); return this; } @@ -681,10 +681,10 @@ public class XmlItem { } public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { - if (prefixNsWrappedArray == null) { - prefixNsWrappedArray = new ArrayList<>(); + if (this.prefixNsWrappedArray == null) { + this.prefixNsWrappedArray = new ArrayList<>(); } - prefixNsWrappedArray.add(prefixNsWrappedArrayItem); + this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); return this; } diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java index d9c93499fb7..a518e2cf03a 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java @@ -122,7 +122,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -144,10 +147,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-nullable/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-play-framework/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework/app/apimodels/Pet.java index 4699f7235ed..acf85977ade 100644 --- a/samples/server/petstore/java-play-framework/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework/app/apimodels/Pet.java @@ -133,7 +133,10 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { - photoUrls.add(photoUrlsItem); + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); return this; } @@ -155,10 +158,10 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (tags == null) { - tags = new ArrayList<>(); + if (this.tags == null) { + this.tags = new ArrayList<>(); } - tags.add(tagsItem); + this.tags.add(tagsItem); return this; } diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java index d23ea9785fd..8d2ad25b0d8 100644 --- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java @@ -35,7 +35,7 @@ public class Pet { private Category category; private String name; private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; public enum StatusEnum { diff --git a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/model/Pet.java b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/model/Pet.java index f53e6d08e82..59541f0cfb9 100644 --- a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/model/Pet.java +++ b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/model/Pet.java @@ -19,7 +19,7 @@ public class Pet { private Category category; private String name; private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java index 17d06d2f2bf..19ae5e46ed9 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java @@ -36,7 +36,7 @@ public class Pet { @ApiModelProperty(value = "") @Valid - private List tags = new ArrayList<>(); + private List tags; public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java index f67832b43e2..6dd16d028da 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java @@ -29,7 +29,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; public enum StatusEnum { @@ -138,6 +138,9 @@ public enum StatusEnum { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java index 17d06d2f2bf..19ae5e46ed9 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java @@ -36,7 +36,7 @@ public class Pet { @ApiModelProperty(value = "") @Valid - private List tags = new ArrayList<>(); + private List tags; public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 669dec7ae65..4c27256f345 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -15,7 +15,7 @@ public class ArrayOfArrayOfNumberOnly { @ApiModelProperty(value = "") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; /** * Get arrayArrayNumber * @return arrayArrayNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 3697fdb4a11..77d96a2f8ec 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -15,7 +15,7 @@ public class ArrayOfNumberOnly { @ApiModelProperty(value = "") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; /** * Get arrayNumber * @return arrayNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java index 65894570595..649ef413aa9 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java @@ -14,15 +14,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayTest { @ApiModelProperty(value = "") - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @ApiModelProperty(value = "") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @ApiModelProperty(value = "") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; /** * Get arrayOfString * @return arrayOfString diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java index 995ce277af4..e284d5e80c4 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java @@ -82,7 +82,7 @@ FISH(String.valueOf("fish")), CRAB(String.valueOf("crab")); } @ApiModelProperty(value = "") - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; /** * Get justSymbol * @return justSymbol diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 8c2212241a5..a9a0a88a9ee 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -19,7 +19,7 @@ public class FileSchemaTestClass { @ApiModelProperty(value = "") @Valid - private List files = new ArrayList<>(); + private List files; /** * Get _file * @return _file diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java index 6ad22f12e0a..3464ea47337 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java @@ -34,7 +34,7 @@ public class Pet { @ApiModelProperty(value = "") @Valid - private List tags = new ArrayList<>(); + private List tags; public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java index 25d74468143..718e9a0e9cc 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java @@ -27,7 +27,7 @@ public class XmlItem { private Boolean attributeBoolean; @ApiModelProperty(value = "") - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @ApiModelProperty(example = "string", value = "") private String nameString; @@ -43,10 +43,10 @@ public class XmlItem { private Boolean nameBoolean; @ApiModelProperty(value = "") - private List nameArray = new ArrayList<>(); + private List nameArray; @ApiModelProperty(value = "") - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @ApiModelProperty(example = "string", value = "") private String prefixString; @@ -62,10 +62,10 @@ public class XmlItem { private Boolean prefixBoolean; @ApiModelProperty(value = "") - private List prefixArray = new ArrayList<>(); + private List prefixArray; @ApiModelProperty(value = "") - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @ApiModelProperty(example = "string", value = "") private String namespaceString; @@ -81,10 +81,10 @@ public class XmlItem { private Boolean namespaceBoolean; @ApiModelProperty(value = "") - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @ApiModelProperty(value = "") - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @ApiModelProperty(example = "string", value = "") private String prefixNsString; @@ -100,10 +100,10 @@ public class XmlItem { private Boolean prefixNsBoolean; @ApiModelProperty(value = "") - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @ApiModelProperty(value = "") - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; /** * Get attributeString * @return attributeString diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index a4dfad876ea..97a679423ce 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -36,7 +36,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly implements Serializable { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 0f00999bd0f..44c5ef7970c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -36,7 +36,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly implements Serializable { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java index 63100732223..26cf12e9966 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java @@ -38,15 +38,15 @@ import javax.validation.Valid; public class ArrayTest implements Serializable { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java index 0b6abc5653c..45cb342d372 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java @@ -103,7 +103,7 @@ public class EnumArrays implements Serializable { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 198d7fcd555..e693b505ea8 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -41,7 +41,7 @@ public class FileSchemaTestClass implements Serializable { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java index 21b03a8da57..e0b56aa4ff3 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java @@ -62,7 +62,7 @@ public class Pet implements Serializable { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -167,6 +167,9 @@ public class Pet implements Serializable { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 720e0a27c9d..2ae30990bf7 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -144,6 +144,9 @@ public class TypeHolderDefault implements Serializable { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java index 57cf91bccba..95a2809de67 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -169,6 +169,9 @@ public class TypeHolderExample implements Serializable { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java index c8e846fa69c..93a3b09037b 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java @@ -80,7 +80,7 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -100,11 +100,11 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -124,11 +124,11 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -148,11 +148,11 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -172,11 +172,11 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 982c0e87703..534c0f707fe 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index c33312433c5..bd8b3b164a1 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java index 3381f49a5c5..03921a0b1a9 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java index 5238609546f..b1efc16e9b8 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 5a3eec069e8..d4f56663eb1 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java index bc77e28037b..18d86f5d66d 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java @@ -81,7 +81,7 @@ public class NullableClass extends HashMap { public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE) - private List arrayItemsNullable = new ArrayList<>(); + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; @JsonProperty(JSON_PROPERTY_OBJECT_NULLABLE_PROP) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 001ace864cc..23057859ff5 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -51,7 +51,7 @@ public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_BARS = "bars"; @JsonProperty(JSON_PROPERTY_BARS) - private List bars = new ArrayList<>(); + private List bars; public ObjectWithDeprecatedFields uuid(String uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java index 70f15b649a2..7965fd1a1c7 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java index 73788837d0f..8d78c7a0702 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java @@ -21,7 +21,7 @@ public class Pet { private Category category; private String name; private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java index c9630f0c3c6..21d5fc9c445 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/model/Pet.java @@ -21,7 +21,7 @@ public class Pet { private Category category; private String name; private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java index c9630f0c3c6..21d5fc9c445 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/model/Pet.java @@ -21,7 +21,7 @@ public class Pet { private Category category; private String name; private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java index c9630f0c3c6..21d5fc9c445 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/model/Pet.java @@ -21,7 +21,7 @@ public class Pet { private Category category; private String name; private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java index 73788837d0f..8d78c7a0702 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java @@ -21,7 +21,7 @@ public class Pet { private Category category; private String name; private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java index 73788837d0f..8d78c7a0702 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java @@ -21,7 +21,7 @@ public class Pet { private Category category; private String name; private List photoUrls = new ArrayList<>(); - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index dd5644f5d6f..f959768e493 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private @Valid List> arrayArrayNumber; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index fe540ffc356..61cecebd9b1 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private @Valid List arrayNumber; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java index af4c73dc1fe..c3f4ac36c5e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private @Valid List arrayOfString; + private @Valid List> arrayArrayOfInteger; + private @Valid List> arrayArrayOfModel; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java index dd5505d4346..e41f8e12e89 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java @@ -115,7 +115,7 @@ public class EnumArrays implements Serializable { } } - private @Valid List arrayEnum = new ArrayList<>(); + private @Valid List arrayEnum; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 9f798356573..58811705828 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FileSchemaTestClass implements Serializable { private @Valid ModelFile _file; - private @Valid List files = new ArrayList<>(); + private @Valid List files; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java index 9b3d5c1f46e..aae498ed146 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java @@ -29,7 +29,7 @@ public class Pet implements Serializable { private @Valid Category category; private @Valid String name; private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List tags = new ArrayList<>(); + private @Valid List tags; public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java index f7b76bfe002..68de54e0e95 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java @@ -25,31 +25,31 @@ public class XmlItem implements Serializable { private @Valid BigDecimal attributeNumber; private @Valid Integer attributeInteger; private @Valid Boolean attributeBoolean; - private @Valid List wrappedArray = new ArrayList<>(); + private @Valid List wrappedArray; private @Valid String nameString; private @Valid BigDecimal nameNumber; private @Valid Integer nameInteger; private @Valid Boolean nameBoolean; - private @Valid List nameArray = new ArrayList<>(); - private @Valid List nameWrappedArray = new ArrayList<>(); + private @Valid List nameArray; + private @Valid List nameWrappedArray; private @Valid String prefixString; private @Valid BigDecimal prefixNumber; private @Valid Integer prefixInteger; private @Valid Boolean prefixBoolean; - private @Valid List prefixArray = new ArrayList<>(); - private @Valid List prefixWrappedArray = new ArrayList<>(); + private @Valid List prefixArray; + private @Valid List prefixWrappedArray; private @Valid String namespaceString; private @Valid BigDecimal namespaceNumber; private @Valid Integer namespaceInteger; private @Valid Boolean namespaceBoolean; - private @Valid List namespaceArray = new ArrayList<>(); - private @Valid List namespaceWrappedArray = new ArrayList<>(); + private @Valid List namespaceArray; + private @Valid List namespaceWrappedArray; private @Valid String prefixNsString; private @Valid BigDecimal prefixNsNumber; private @Valid Integer prefixNsInteger; private @Valid Boolean prefixNsBoolean; - private @Valid List prefixNsArray = new ArrayList<>(); - private @Valid List prefixNsWrappedArray = new ArrayList<>(); + private @Valid List prefixNsArray; + private @Valid List prefixNsWrappedArray; /** **/ diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d3f4815dfd4..cf67e92deba 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfArrayOfNumberOnly") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private @Valid List> arrayArrayNumber; protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -123,7 +123,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable { } public static abstract class ArrayOfArrayOfNumberOnlyBuilder> { - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 5d1799d12cb..68e19d1a1c7 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfNumberOnly") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private @Valid List arrayNumber; protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -123,7 +123,7 @@ public class ArrayOfNumberOnly implements Serializable { } public static abstract class ArrayOfNumberOnlyBuilder> { - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java index a40e73fdd5e..5d87292bcfa 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayTest") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private @Valid List arrayOfString; + private @Valid List> arrayArrayOfInteger; + private @Valid List> arrayArrayOfModel; protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -201,9 +201,9 @@ public class ArrayTest implements Serializable { } public static abstract class ArrayTestBuilder> { - private List arrayOfString = new ArrayList<>(); - private List> arrayArrayOfInteger = new ArrayList<>(); - private List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString; + private List> arrayArrayOfInteger; + private List> arrayArrayOfModel; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java index 4bc6f6c1b8d..d187571a55a 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java @@ -115,7 +115,7 @@ public class EnumArrays implements Serializable { } } - private @Valid List arrayEnum = new ArrayList<>(); + private @Valid List arrayEnum; protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; @@ -240,7 +240,7 @@ public class EnumArrays implements Serializable { public static abstract class EnumArraysBuilder> { private JustSymbolEnum justSymbol; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 60a19b11f1b..c973c0e39ca 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FileSchemaTestClass implements Serializable { private @Valid ModelFile _file; - private @Valid List files = new ArrayList<>(); + private @Valid List files; protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -147,7 +147,7 @@ public class FileSchemaTestClass implements Serializable { public static abstract class FileSchemaTestClassBuilder> { private ModelFile _file; - private List files = new ArrayList<>(); + private List files; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java index 724992ffb63..6fbff0a69c9 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java @@ -29,7 +29,7 @@ public class Pet implements Serializable { private @Valid Category category; private @Valid String name; private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List tags = new ArrayList<>(); + private @Valid List tags; public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -313,7 +313,7 @@ public class Pet implements Serializable { private Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); - private List tags = new ArrayList<>(); + private List tags; private StatusEnum status; protected abstract B self(); diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java index cfc0fd1baba..b9a77cd161f 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java @@ -25,31 +25,31 @@ public class XmlItem implements Serializable { private @Valid BigDecimal attributeNumber; private @Valid Integer attributeInteger; private @Valid Boolean attributeBoolean; - private @Valid List wrappedArray = new ArrayList<>(); + private @Valid List wrappedArray; private @Valid String nameString; private @Valid BigDecimal nameNumber; private @Valid Integer nameInteger; private @Valid Boolean nameBoolean; - private @Valid List nameArray = new ArrayList<>(); - private @Valid List nameWrappedArray = new ArrayList<>(); + private @Valid List nameArray; + private @Valid List nameWrappedArray; private @Valid String prefixString; private @Valid BigDecimal prefixNumber; private @Valid Integer prefixInteger; private @Valid Boolean prefixBoolean; - private @Valid List prefixArray = new ArrayList<>(); - private @Valid List prefixWrappedArray = new ArrayList<>(); + private @Valid List prefixArray; + private @Valid List prefixWrappedArray; private @Valid String namespaceString; private @Valid BigDecimal namespaceNumber; private @Valid Integer namespaceInteger; private @Valid Boolean namespaceBoolean; - private @Valid List namespaceArray = new ArrayList<>(); - private @Valid List namespaceWrappedArray = new ArrayList<>(); + private @Valid List namespaceArray; + private @Valid List namespaceWrappedArray; private @Valid String prefixNsString; private @Valid BigDecimal prefixNsNumber; private @Valid Integer prefixNsInteger; private @Valid Boolean prefixNsBoolean; - private @Valid List prefixNsArray = new ArrayList<>(); - private @Valid List prefixNsWrappedArray = new ArrayList<>(); + private @Valid List prefixNsArray; + private @Valid List prefixNsWrappedArray; protected XmlItem(XmlItemBuilder b) { this.attributeString = b.attributeString; @@ -899,31 +899,31 @@ public class XmlItem implements Serializable { private BigDecimal attributeNumber; private Integer attributeInteger; private Boolean attributeBoolean; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; private String nameString; private BigDecimal nameNumber; private Integer nameInteger; private Boolean nameBoolean; - private List nameArray = new ArrayList<>(); - private List nameWrappedArray = new ArrayList<>(); + private List nameArray; + private List nameWrappedArray; private String prefixString; private BigDecimal prefixNumber; private Integer prefixInteger; private Boolean prefixBoolean; - private List prefixArray = new ArrayList<>(); - private List prefixWrappedArray = new ArrayList<>(); + private List prefixArray; + private List prefixWrappedArray; private String namespaceString; private BigDecimal namespaceNumber; private Integer namespaceInteger; private Boolean namespaceBoolean; - private List namespaceArray = new ArrayList<>(); - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceArray; + private List namespaceWrappedArray; private String prefixNsString; private BigDecimal prefixNsNumber; private Integer prefixNsInteger; private Boolean prefixNsBoolean; - private List prefixNsArray = new ArrayList<>(); - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsArray; + private List prefixNsWrappedArray; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1ebd9ba958..febc6fa617a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private @Valid List> arrayArrayNumber; protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -123,7 +123,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable { } public static abstract class ArrayOfArrayOfNumberOnlyBuilder> { - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 07ada528789..f7df847e747 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private @Valid List arrayNumber; protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -123,7 +123,7 @@ public class ArrayOfNumberOnly implements Serializable { } public static abstract class ArrayOfNumberOnlyBuilder> { - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java index fb914088e17..d00e7b20ac5 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private @Valid List arrayOfString; + private @Valid List> arrayArrayOfInteger; + private @Valid List> arrayArrayOfModel; protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -201,9 +201,9 @@ public class ArrayTest implements Serializable { } public static abstract class ArrayTestBuilder> { - private List arrayOfString = new ArrayList<>(); - private List> arrayArrayOfInteger = new ArrayList<>(); - private List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString; + private List> arrayArrayOfInteger; + private List> arrayArrayOfModel; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java index efbb6a6ec55..efd8cb093a5 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java @@ -115,7 +115,7 @@ public class EnumArrays implements Serializable { } } - private @Valid List arrayEnum = new ArrayList<>(); + private @Valid List arrayEnum; protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; @@ -240,7 +240,7 @@ public class EnumArrays implements Serializable { public static abstract class EnumArraysBuilder> { private JustSymbolEnum justSymbol; - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 369e7f90999..1a3d6d6cc5a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FileSchemaTestClass implements Serializable { private @Valid ModelFile _file; - private @Valid List files = new ArrayList<>(); + private @Valid List files; protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -147,7 +147,7 @@ public class FileSchemaTestClass implements Serializable { public static abstract class FileSchemaTestClassBuilder> { private ModelFile _file; - private List files = new ArrayList<>(); + private List files; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java index f9284740e0e..48b5c362f0d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java @@ -29,7 +29,7 @@ public class Pet implements Serializable { private @Valid Category category; private @Valid String name; private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List tags = new ArrayList<>(); + private @Valid List tags; public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -313,7 +313,7 @@ public class Pet implements Serializable { private Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); - private List tags = new ArrayList<>(); + private List tags; private StatusEnum status; protected abstract B self(); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java index 9f4eb028354..86ca4856ed6 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java @@ -25,31 +25,31 @@ public class XmlItem implements Serializable { private @Valid BigDecimal attributeNumber; private @Valid Integer attributeInteger; private @Valid Boolean attributeBoolean; - private @Valid List wrappedArray = new ArrayList<>(); + private @Valid List wrappedArray; private @Valid String nameString; private @Valid BigDecimal nameNumber; private @Valid Integer nameInteger; private @Valid Boolean nameBoolean; - private @Valid List nameArray = new ArrayList<>(); - private @Valid List nameWrappedArray = new ArrayList<>(); + private @Valid List nameArray; + private @Valid List nameWrappedArray; private @Valid String prefixString; private @Valid BigDecimal prefixNumber; private @Valid Integer prefixInteger; private @Valid Boolean prefixBoolean; - private @Valid List prefixArray = new ArrayList<>(); - private @Valid List prefixWrappedArray = new ArrayList<>(); + private @Valid List prefixArray; + private @Valid List prefixWrappedArray; private @Valid String namespaceString; private @Valid BigDecimal namespaceNumber; private @Valid Integer namespaceInteger; private @Valid Boolean namespaceBoolean; - private @Valid List namespaceArray = new ArrayList<>(); - private @Valid List namespaceWrappedArray = new ArrayList<>(); + private @Valid List namespaceArray; + private @Valid List namespaceWrappedArray; private @Valid String prefixNsString; private @Valid BigDecimal prefixNsNumber; private @Valid Integer prefixNsInteger; private @Valid Boolean prefixNsBoolean; - private @Valid List prefixNsArray = new ArrayList<>(); - private @Valid List prefixNsWrappedArray = new ArrayList<>(); + private @Valid List prefixNsArray; + private @Valid List prefixNsWrappedArray; protected XmlItem(XmlItemBuilder b) { this.attributeString = b.attributeString; @@ -899,31 +899,31 @@ public class XmlItem implements Serializable { private BigDecimal attributeNumber; private Integer attributeInteger; private Boolean attributeBoolean; - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; private String nameString; private BigDecimal nameNumber; private Integer nameInteger; private Boolean nameBoolean; - private List nameArray = new ArrayList<>(); - private List nameWrappedArray = new ArrayList<>(); + private List nameArray; + private List nameWrappedArray; private String prefixString; private BigDecimal prefixNumber; private Integer prefixInteger; private Boolean prefixBoolean; - private List prefixArray = new ArrayList<>(); - private List prefixWrappedArray = new ArrayList<>(); + private List prefixArray; + private List prefixWrappedArray; private String namespaceString; private BigDecimal namespaceNumber; private Integer namespaceInteger; private Boolean namespaceBoolean; - private List namespaceArray = new ArrayList<>(); - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceArray; + private List namespaceWrappedArray; private String prefixNsString; private BigDecimal prefixNsNumber; private Integer prefixNsInteger; private Boolean prefixNsBoolean; - private List prefixNsArray = new ArrayList<>(); - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsArray; + private List prefixNsWrappedArray; protected abstract B self(); public abstract C build(); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 982c0e87703..534c0f707fe 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index c33312433c5..bd8b3b164a1 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java index 229eaec7c02..212759b984a 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java index 5238609546f..b1efc16e9b8 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 5a3eec069e8..d4f56663eb1 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java index 70f15b649a2..7965fd1a1c7 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 42df80d492a..48683fa3544 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java index 02e2798441a..c3d0478ada7 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -168,6 +168,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java index 5bee8225535..9a945e6e1b2 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java @@ -79,7 +79,7 @@ public class XmlItem { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -99,11 +99,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -123,11 +123,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -147,11 +147,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -171,11 +171,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 982c0e87703..534c0f707fe 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index c33312433c5..bd8b3b164a1 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java index 229eaec7c02..212759b984a 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java index 5238609546f..b1efc16e9b8 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 5a3eec069e8..d4f56663eb1 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java index 70f15b649a2..7965fd1a1c7 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 42df80d492a..48683fa3544 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java index 02e2798441a..c3d0478ada7 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -168,6 +168,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java index 5bee8225535..9a945e6e1b2 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java @@ -79,7 +79,7 @@ public class XmlItem { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -99,11 +99,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -123,11 +123,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -147,11 +147,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -171,11 +171,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 982c0e87703..534c0f707fe 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index c33312433c5..bd8b3b164a1 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java index 229eaec7c02..212759b984a 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java index 5238609546f..b1efc16e9b8 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 5a3eec069e8..d4f56663eb1 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java index 70f15b649a2..7965fd1a1c7 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 42df80d492a..48683fa3544 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java index 02e2798441a..c3d0478ada7 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -168,6 +168,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java index 5bee8225535..9a945e6e1b2 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java @@ -79,7 +79,7 @@ public class XmlItem { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -99,11 +99,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -123,11 +123,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -147,11 +147,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -171,11 +171,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 982c0e87703..534c0f707fe 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index c33312433c5..bd8b3b164a1 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java index 229eaec7c02..212759b984a 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java index 5238609546f..b1efc16e9b8 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 5a3eec069e8..d4f56663eb1 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = new ArrayList<>(); + private List files; public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java index 70f15b649a2..7965fd1a1c7 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = new ArrayList<>(); + private List tags; /** * pet status in the store @@ -166,6 +166,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new LinkedHashSet<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 42df80d492a..48683fa3544 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -143,6 +143,9 @@ public class TypeHolderDefault { } public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java index 02e2798441a..c3d0478ada7 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -168,6 +168,9 @@ public class TypeHolderExample { } public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { + if (this.arrayItem == null) { + this.arrayItem = new ArrayList<>(); + } this.arrayItem.add(arrayItemItem); return this; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java index 5bee8225535..9a945e6e1b2 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java @@ -79,7 +79,7 @@ public class XmlItem { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -99,11 +99,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = new ArrayList<>(); + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -123,11 +123,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = new ArrayList<>(); + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -147,11 +147,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -171,11 +171,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index ead205932fa..5b6c415bd66 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 7ab62ebdb8f..4e84838be3b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java index 4c5a142ddca..f7c9710a1ee 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java index 696d07582b9..a96e0290b0b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9b9f087aaa7..dae9b27f93a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java index 3f4cf6872f2..ba99ad03027 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java index 03f777866d6..280941921cd 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java index 71992dae886..6f461bfe628 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java @@ -37,7 +37,7 @@ public class ObjectWithUniqueItems { @JsonProperty("notNullSet") @Valid - private Set notNullSet = new LinkedHashSet<>(); + private Set notNullSet; @JsonProperty("nullList") @Valid @@ -45,7 +45,7 @@ public class ObjectWithUniqueItems { @JsonProperty("notNullList") @Valid - private List notNullList = new ArrayList<>(); + private List notNullList; @JsonProperty("notNullDateField") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index 1f114e8f347..ce02f3c7d4e 100644 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 29f12485a49..b125422b213 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 62ec18eb583..c596865402f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index e2d2fd53a51..c2e98872c52 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index 8a9c025c755..ea20037b4f2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9c38fb6815f..67bf9c73d2f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index 67bb307f244..84968c2299d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index 560aad3e41f..9e98a7214bb 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index 1beb64aba34..da6c47fcc8b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index 1beb64aba34..da6c47fcc8b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java index 60af3a5b92a..ce02f3c7d4e 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java @@ -43,7 +43,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = null; + private List<@Valid Tag> tags; /** * pet status in the store @@ -165,6 +165,9 @@ public class Pet { } public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } this.photoUrls.add(photoUrlsItem); return this; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index 1beb64aba34..da6c47fcc8b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java index 081e4813a03..05bed382e38 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java @@ -40,7 +40,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index 1beb64aba34..da6c47fcc8b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index 1beb64aba34..da6c47fcc8b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java index 5830ee0680d..0e55c9b7873 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java index 5830ee0680d..0e55c9b7873 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java index 5830ee0680d..0e55c9b7873 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 5830ee0680d..0e55c9b7873 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -42,7 +42,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index e9a28b539c6..450e9b21edf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 06758b17e90..f2b7f74a6b8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -27,7 +27,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index 5da3fd898c3..7d560306b65 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -27,15 +27,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index 9708f0507b4..f73ffa31529 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -100,7 +100,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0798c027c7c..5bac01151ba 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -30,7 +30,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index 1beb64aba34..da6c47fcc8b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -45,7 +45,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index 05a4379fd6c..475d6fe9ec1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -39,7 +39,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -55,11 +55,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -75,11 +75,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -95,11 +95,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -115,11 +115,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java index 89ff34c4339..e7ecfb0b7cd 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfArrayOfNumberOnly { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java index 56d3db08b40..a75a6fd0f92 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java @@ -26,7 +26,7 @@ public class ArrayOfNumberOnly { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java index 43632d35716..8f2b06deddb 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java @@ -26,15 +26,15 @@ public class ArrayTest { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java index ae1f9f62fe5..f12f8bd0528 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java @@ -99,7 +99,7 @@ public class EnumArrays { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java index 88200ea9640..37db6d702e0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java @@ -29,7 +29,7 @@ public class FileSchemaTestClass { @JsonProperty("files") @Valid - private List<@Valid File> files = new ArrayList<>(); + private List<@Valid File> files; public FileSchemaTestClass file(File file) { this.file = file; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index d185ee9bf9b..a6e1d1a9573 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -44,7 +44,7 @@ public class Pet { @JsonProperty("tags") @Valid - private List<@Valid Tag> tags = new ArrayList<>(); + private List<@Valid Tag> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java index a28e7c54671..84f991273fe 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java @@ -38,7 +38,7 @@ public class XmlItem { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -54,11 +54,11 @@ public class XmlItem { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -74,11 +74,11 @@ public class XmlItem { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -94,11 +94,11 @@ public class XmlItem { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -114,11 +114,11 @@ public class XmlItem { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 7a49dba2337..da4445a1ba9 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -29,7 +29,7 @@ public class ArrayOfArrayOfNumberOnlyDto { @JsonProperty("ArrayArrayNumber") @Valid - private List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index e40c3d19ce3..1c885b7ebd8 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -29,7 +29,7 @@ public class ArrayOfNumberOnlyDto { @JsonProperty("ArrayNumber") @Valid - private List arrayNumber = new ArrayList<>(); + private List arrayNumber; public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java index f57a7567219..3c2137595f2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -29,15 +29,15 @@ public class ArrayTestDto { @JsonProperty("array_of_string") @Valid - private List arrayOfString = new ArrayList<>(); + private List arrayOfString; @JsonProperty("array_array_of_integer") @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfInteger; @JsonProperty("array_array_of_model") @Valid - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel; public ArrayTestDto arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java index 9d6f6c243cb..c7c37c6c34e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -102,7 +102,7 @@ public class EnumArraysDto { @JsonProperty("array_enum") @Valid - private List arrayEnum = new ArrayList<>(); + private List arrayEnum; public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 9da0395f194..347e615ed99 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -32,7 +32,7 @@ public class FileSchemaTestClassDto { @JsonProperty("files") @Valid - private List<@Valid FileDto> files = new ArrayList<>(); + private List<@Valid FileDto> files; public FileSchemaTestClassDto file(FileDto file) { this.file = file; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java index ea524893059..bbd680e89fa 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java @@ -47,7 +47,7 @@ public class PetDto { @JsonProperty("tags") @Valid - private List<@Valid TagDto> tags = new ArrayList<>(); + private List<@Valid TagDto> tags; /** * pet status in the store diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java index f93e04f2759..a100cd91283 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java @@ -41,7 +41,7 @@ public class XmlItemDto { @JsonProperty("wrapped_array") @Valid - private List wrappedArray = new ArrayList<>(); + private List wrappedArray; @JsonProperty("name_string") private String nameString; @@ -57,11 +57,11 @@ public class XmlItemDto { @JsonProperty("name_array") @Valid - private List nameArray = new ArrayList<>(); + private List nameArray; @JsonProperty("name_wrapped_array") @Valid - private List nameWrappedArray = new ArrayList<>(); + private List nameWrappedArray; @JsonProperty("prefix_string") private String prefixString; @@ -77,11 +77,11 @@ public class XmlItemDto { @JsonProperty("prefix_array") @Valid - private List prefixArray = new ArrayList<>(); + private List prefixArray; @JsonProperty("prefix_wrapped_array") @Valid - private List prefixWrappedArray = new ArrayList<>(); + private List prefixWrappedArray; @JsonProperty("namespace_string") private String namespaceString; @@ -97,11 +97,11 @@ public class XmlItemDto { @JsonProperty("namespace_array") @Valid - private List namespaceArray = new ArrayList<>(); + private List namespaceArray; @JsonProperty("namespace_wrapped_array") @Valid - private List namespaceWrappedArray = new ArrayList<>(); + private List namespaceWrappedArray; @JsonProperty("prefix_ns_string") private String prefixNsString; @@ -117,11 +117,11 @@ public class XmlItemDto { @JsonProperty("prefix_ns_array") @Valid - private List prefixNsArray = new ArrayList<>(); + private List prefixNsArray; @JsonProperty("prefix_ns_wrapped_array") @Valid - private List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsWrappedArray; public XmlItemDto attributeString(String attributeString) { this.attributeString = attributeString; From 02b624851058dfc4af976f718a53cda75badc4bd Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Fri, 17 Mar 2023 03:12:27 -0400 Subject: [PATCH 059/131] moved null checks (#14980) --- .../generichost/JsonConverter.mustache | 15 +++ .../generichost/modelGeneric.mustache | 30 ----- .../src/Org.OpenAPITools/Model/Activity.cs | 18 +-- .../ActivityOutputElementRepresentation.cs | 24 ++-- .../Model/AdditionalPropertiesClass.cs | 54 ++++---- .../src/Org.OpenAPITools/Model/Animal.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Apple.cs | 24 ++-- .../src/Org.OpenAPITools/Model/AppleReq.cs | 24 ++-- .../Model/ArrayOfArrayOfNumberOnly.cs | 18 +-- .../Model/ArrayOfNumberOnly.cs | 18 +-- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Banana.cs | 18 +-- .../src/Org.OpenAPITools/Model/BananaReq.cs | 24 ++-- .../src/Org.OpenAPITools/Model/BasquePig.cs | 18 +-- .../Org.OpenAPITools/Model/Capitalization.cs | 48 +++---- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 18 +-- .../src/Org.OpenAPITools/Model/Category.cs | 24 ++-- .../Org.OpenAPITools/Model/ChildCatAllOf.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ClassModel.cs | 18 +-- .../src/Org.OpenAPITools/Model/DanishPig.cs | 18 +-- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 18 +-- .../Model/DeprecatedObject.cs | 18 +-- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 18 +-- .../src/Org.OpenAPITools/Model/Drawing.cs | 30 ++--- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 24 ++-- .../src/Org.OpenAPITools/Model/EnumTest.cs | 60 ++++----- .../src/Org.OpenAPITools/Model/File.cs | 18 +-- .../Model/FileSchemaTestClass.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Foo.cs | 18 +-- .../Model/FooGetDefaultResponse.cs | 18 +-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 120 +++++++++--------- .../src/Org.OpenAPITools/Model/Fruit.cs | 27 ++-- .../src/Org.OpenAPITools/Model/GmFruit.cs | 18 +-- .../Model/GrandparentAnimal.cs | 18 +-- .../Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 24 ++-- .../src/Org.OpenAPITools/Model/List.cs | 18 +-- .../src/Org.OpenAPITools/Model/MapTest.cs | 36 +++--- ...dPropertiesAndAdditionalPropertiesClass.cs | 36 +++--- .../Model/Model200Response.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ModelClient.cs | 18 +-- .../src/Org.OpenAPITools/Model/Name.cs | 36 +++--- .../Org.OpenAPITools/Model/NullableClass.cs | 24 ++-- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 18 +-- .../Model/ObjectWithDeprecatedFields.cs | 36 +++--- .../src/Org.OpenAPITools/Model/Order.cs | 48 +++---- .../Org.OpenAPITools/Model/OuterComposite.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Pet.cs | 48 +++---- .../Model/QuadrilateralInterface.cs | 18 +-- .../Org.OpenAPITools/Model/ReadOnlyFirst.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Return.cs | 18 +-- .../src/Org.OpenAPITools/Model/Shape.cs | 27 ++-- .../Org.OpenAPITools/Model/ShapeInterface.cs | 18 +-- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 27 ++-- .../Model/SpecialModelName.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Tag.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Triangle.cs | 48 ++----- .../Model/TriangleInterface.cs | 18 +-- .../src/Org.OpenAPITools/Model/User.cs | 66 +++++----- .../src/Org.OpenAPITools/Model/Whale.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Zebra.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Activity.cs | 18 +-- .../ActivityOutputElementRepresentation.cs | 24 ++-- .../Model/AdditionalPropertiesClass.cs | 54 ++++---- .../src/Org.OpenAPITools/Model/Animal.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Apple.cs | 24 ++-- .../src/Org.OpenAPITools/Model/AppleReq.cs | 24 ++-- .../Model/ArrayOfArrayOfNumberOnly.cs | 18 +-- .../Model/ArrayOfNumberOnly.cs | 18 +-- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Banana.cs | 18 +-- .../src/Org.OpenAPITools/Model/BananaReq.cs | 24 ++-- .../src/Org.OpenAPITools/Model/BasquePig.cs | 18 +-- .../Org.OpenAPITools/Model/Capitalization.cs | 48 +++---- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 18 +-- .../src/Org.OpenAPITools/Model/Category.cs | 24 ++-- .../Org.OpenAPITools/Model/ChildCatAllOf.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ClassModel.cs | 18 +-- .../src/Org.OpenAPITools/Model/DanishPig.cs | 18 +-- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 18 +-- .../Model/DeprecatedObject.cs | 18 +-- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 18 +-- .../src/Org.OpenAPITools/Model/Drawing.cs | 30 ++--- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 24 ++-- .../src/Org.OpenAPITools/Model/EnumTest.cs | 60 ++++----- .../src/Org.OpenAPITools/Model/File.cs | 18 +-- .../Model/FileSchemaTestClass.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Foo.cs | 18 +-- .../Model/FooGetDefaultResponse.cs | 18 +-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 120 +++++++++--------- .../src/Org.OpenAPITools/Model/Fruit.cs | 27 ++-- .../src/Org.OpenAPITools/Model/GmFruit.cs | 18 +-- .../Model/GrandparentAnimal.cs | 18 +-- .../Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 24 ++-- .../src/Org.OpenAPITools/Model/List.cs | 18 +-- .../src/Org.OpenAPITools/Model/MapTest.cs | 36 +++--- ...dPropertiesAndAdditionalPropertiesClass.cs | 36 +++--- .../Model/Model200Response.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ModelClient.cs | 18 +-- .../src/Org.OpenAPITools/Model/Name.cs | 36 +++--- .../Org.OpenAPITools/Model/NullableClass.cs | 24 ++-- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 18 +-- .../Model/ObjectWithDeprecatedFields.cs | 36 +++--- .../src/Org.OpenAPITools/Model/Order.cs | 48 +++---- .../Org.OpenAPITools/Model/OuterComposite.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Pet.cs | 48 +++---- .../Model/QuadrilateralInterface.cs | 18 +-- .../Org.OpenAPITools/Model/ReadOnlyFirst.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Return.cs | 18 +-- .../src/Org.OpenAPITools/Model/Shape.cs | 27 ++-- .../Org.OpenAPITools/Model/ShapeInterface.cs | 18 +-- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 27 ++-- .../Model/SpecialModelName.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Tag.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Triangle.cs | 48 ++----- .../Model/TriangleInterface.cs | 18 +-- .../src/Org.OpenAPITools/Model/User.cs | 66 +++++----- .../src/Org.OpenAPITools/Model/Whale.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Zebra.cs | 24 ++-- .../src/Org.OpenAPITools/Model/AdultAllOf.cs | 18 +-- .../src/Org.OpenAPITools/Model/Child.cs | 18 +-- .../src/Org.OpenAPITools/Model/ChildAllOf.cs | 18 +-- .../src/Org.OpenAPITools/Model/Person.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Apple.cs | 18 +-- .../src/Org.OpenAPITools/Model/Banana.cs | 18 +-- .../src/Org.OpenAPITools/Model/Fruit.cs | 18 +-- .../src/Org.OpenAPITools/Model/Apple.cs | 18 +-- .../src/Org.OpenAPITools/Model/Banana.cs | 18 +-- .../src/Org.OpenAPITools/Model/Fruit.cs | 27 ++-- .../src/Org.OpenAPITools/Model/Activity.cs | 18 +-- .../ActivityOutputElementRepresentation.cs | 24 ++-- .../Model/AdditionalPropertiesClass.cs | 54 ++++---- .../src/Org.OpenAPITools/Model/Animal.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Apple.cs | 24 ++-- .../src/Org.OpenAPITools/Model/AppleReq.cs | 24 ++-- .../Model/ArrayOfArrayOfNumberOnly.cs | 18 +-- .../Model/ArrayOfNumberOnly.cs | 18 +-- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Banana.cs | 18 +-- .../src/Org.OpenAPITools/Model/BananaReq.cs | 24 ++-- .../src/Org.OpenAPITools/Model/BasquePig.cs | 18 +-- .../Org.OpenAPITools/Model/Capitalization.cs | 48 +++---- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 18 +-- .../src/Org.OpenAPITools/Model/Category.cs | 24 ++-- .../Org.OpenAPITools/Model/ChildCatAllOf.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ClassModel.cs | 18 +-- .../src/Org.OpenAPITools/Model/DanishPig.cs | 18 +-- .../Org.OpenAPITools/Model/DateOnlyClass.cs | 18 +-- .../Model/DeprecatedObject.cs | 18 +-- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 18 +-- .../src/Org.OpenAPITools/Model/Drawing.cs | 30 ++--- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 24 ++-- .../src/Org.OpenAPITools/Model/EnumTest.cs | 60 ++++----- .../src/Org.OpenAPITools/Model/File.cs | 18 +-- .../Model/FileSchemaTestClass.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Foo.cs | 18 +-- .../Model/FooGetDefaultResponse.cs | 18 +-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 120 +++++++++--------- .../src/Org.OpenAPITools/Model/Fruit.cs | 27 ++-- .../src/Org.OpenAPITools/Model/GmFruit.cs | 18 +-- .../Model/GrandparentAnimal.cs | 18 +-- .../Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 24 ++-- .../src/Org.OpenAPITools/Model/List.cs | 18 +-- .../src/Org.OpenAPITools/Model/MapTest.cs | 36 +++--- ...dPropertiesAndAdditionalPropertiesClass.cs | 36 +++--- .../Model/Model200Response.cs | 24 ++-- .../src/Org.OpenAPITools/Model/ModelClient.cs | 18 +-- .../src/Org.OpenAPITools/Model/Name.cs | 36 +++--- .../Org.OpenAPITools/Model/NullableClass.cs | 24 ++-- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 18 +-- .../Model/ObjectWithDeprecatedFields.cs | 36 +++--- .../src/Org.OpenAPITools/Model/Order.cs | 48 +++---- .../Org.OpenAPITools/Model/OuterComposite.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Pet.cs | 48 +++---- .../Model/QuadrilateralInterface.cs | 18 +-- .../Org.OpenAPITools/Model/ReadOnlyFirst.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Return.cs | 18 +-- .../src/Org.OpenAPITools/Model/Shape.cs | 27 ++-- .../Org.OpenAPITools/Model/ShapeInterface.cs | 18 +-- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 27 ++-- .../Model/SpecialModelName.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Tag.cs | 24 ++-- .../src/Org.OpenAPITools/Model/Triangle.cs | 48 ++----- .../Model/TriangleInterface.cs | 18 +-- .../src/Org.OpenAPITools/Model/User.cs | 66 +++++----- .../src/Org.OpenAPITools/Model/Whale.cs | 30 ++--- .../src/Org.OpenAPITools/Model/Zebra.cs | 24 ++-- 189 files changed, 2532 insertions(+), 2709 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache index e4a06de33c4..915d943f8fb 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache @@ -170,6 +170,21 @@ } } + {{#nonNullableVars}} + {{#-first}} +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + {{/-first}} + if ({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} == null) + throw new ArgumentNullException(nameof({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}), "Property is required for class {{classname}}."); + + {{#-last}} +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + {{/-last}} + {{/nonNullableVars}} {{#composedSchemas.oneOf}} if ({{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}Deserialized) return new {{classname}}({{#lambda.joinWithComma}}{{#lambda.camelcase_param}}{{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}{{/lambda.camelcase_param}} {{#model.composedSchemas.allOf}}{{^isInherited}}{{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}{{/isInherited}}{{/model.composedSchemas.allOf}}{{#model.composedSchemas.anyOf}}{{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} {{/allVars}}{{/lambda.joinWithComma}}); diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache index c4e7b03b31e..bf8ddee6d65 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache @@ -22,21 +22,6 @@ [JsonConstructor] {{#readWriteVars}}{{#-first}}public{{/-first}}{{/readWriteVars}}{{^readWriteVars}}internal{{/readWriteVars}} {{classname}}({{#lambda.joinWithComma}}{{{dataType}}}{{#isNullable}}{{nrt?}}{{/isNullable}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{#model.composedSchemas.allOf}}{{^isInherited}}{{{dataType}}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/isInherited}}{{/model.composedSchemas.allOf}}{{#model.composedSchemas.anyOf}}{{{dataType}}}{{#isNullable}}{{nrt?}}{{/isNullable}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/model.composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{#parentModel.composedSchemas.oneOf}}{{#lambda.camelcase_param}}{{parent}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.oneOf}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { - {{#nonNullableVars}} - {{#-first}} - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - {{/-first}} - if ({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} == null) - throw new ArgumentNullException(nameof({{name}})); - - {{#-last}} - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - {{/-last}} - {{/nonNullableVars}} {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}; {{#composedSchemas.allOf}} {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}; @@ -70,21 +55,6 @@ [JsonConstructor] {{#readWriteVars}}{{#-first}}public{{/-first}}{{/readWriteVars}}{{^readWriteVars}}internal{{/readWriteVars}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.allOf}}{{^isInherited}}{{{dataType}}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/isInherited}}{{/composedSchemas.allOf}}{{#composedSchemas.anyOf}}{{{dataType}}}{{#isNullable}}{{nrt?}}{{/isNullable}} {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { - {{#nonNullableVars}} - {{#-first}} -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - {{/-first}} - if ({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} == null) - throw new ArgumentNullException("{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} is a required property for {{classname}} and cannot be null."); - - {{#-last}} -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - {{/-last}} - {{/nonNullableVars}} {{#composedSchemas.allOf}} {{^isInherited}} {{#lambda.titlecase}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{#isArray}}{{{dataFormat}}}{{/isArray}}{{/lambda.camelcase_param}}; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs index dda45f9146c..4ccbf78f2f2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Activity(Dictionary> activityOutputs) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (activityOutputs == null) - throw new ArgumentNullException("activityOutputs is a required property for Activity and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ActivityOutputs = activityOutputs; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (activityOutputs == null) + throw new ArgumentNullException(nameof(activityOutputs), "Property is required for class Activity."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Activity(activityOutputs); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 242dedc5ea9..3a0ef7b95db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ActivityOutputElementRepresentation(string prop1, Object prop2) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (prop1 == null) - throw new ArgumentNullException("prop1 is a required property for ActivityOutputElementRepresentation and cannot be null."); - - if (prop2 == null) - throw new ArgumentNullException("prop2 is a required property for ActivityOutputElementRepresentation and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Prop1 = prop1; Prop2 = prop2; } @@ -150,6 +138,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (prop1 == null) + throw new ArgumentNullException(nameof(prop1), "Property is required for class ActivityOutputElementRepresentation."); + + if (prop2 == null) + throw new ArgumentNullException(nameof(prop2), "Property is required for class ActivityOutputElementRepresentation."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ActivityOutputElementRepresentation(prop1, prop2); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 50309f75441..1b449ebd461 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -44,33 +44,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public AdditionalPropertiesClass(Object emptyMap, Dictionary> mapOfMapProperty, Dictionary mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary mapWithUndeclaredPropertiesAnytype3, Dictionary mapWithUndeclaredPropertiesString, Object? anytype1 = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mapProperty == null) - throw new ArgumentNullException("mapProperty is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapOfMapProperty == null) - throw new ArgumentNullException("mapOfMapProperty is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype1 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype1 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype2 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype2 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype3 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype3 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (emptyMap == null) - throw new ArgumentNullException("emptyMap is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesString == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesString is a required property for AdditionalPropertiesClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EmptyMap = emptyMap; MapOfMapProperty = mapOfMapProperty; MapProperty = mapProperty; @@ -251,6 +224,33 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mapProperty == null) + throw new ArgumentNullException(nameof(mapProperty), "Property is required for class AdditionalPropertiesClass."); + + if (mapOfMapProperty == null) + throw new ArgumentNullException(nameof(mapOfMapProperty), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype1 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype1), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype2 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype2), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype3 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype3), "Property is required for class AdditionalPropertiesClass."); + + if (emptyMap == null) + throw new ArgumentNullException(nameof(emptyMap), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesString == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesString), "Property is required for class AdditionalPropertiesClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs index 3070edb4001..2aa4113882f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Animal(string className, string color = "red") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for Animal and cannot be null."); - - if (color == null) - throw new ArgumentNullException("color is a required property for Animal and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; Color = color; } @@ -159,6 +147,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Animal."); + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class Animal."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Animal(className, color); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs index 08e878e68f3..a5db00f6532 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -39,21 +39,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ApiResponse(int code, string message, string type) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (code == null) - throw new ArgumentNullException("code is a required property for ApiResponse and cannot be null."); - - if (type == null) - throw new ArgumentNullException("type is a required property for ApiResponse and cannot be null."); - - if (message == null) - throw new ArgumentNullException("message is a required property for ApiResponse and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Code = code; Message = message; Type = type; @@ -166,6 +151,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (code == null) + throw new ArgumentNullException(nameof(code), "Property is required for class ApiResponse."); + + if (type == null) + throw new ArgumentNullException(nameof(type), "Property is required for class ApiResponse."); + + if (message == null) + throw new ArgumentNullException(nameof(message), "Property is required for class ApiResponse."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ApiResponse(code, message, type); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs index b71acea3d36..3159d60abc0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Apple(string cultivar, string origin) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (cultivar == null) - throw new ArgumentNullException("cultivar is a required property for Apple and cannot be null."); - - if (origin == null) - throw new ArgumentNullException("origin is a required property for Apple and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Cultivar = cultivar; Origin = origin; } @@ -163,6 +151,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (cultivar == null) + throw new ArgumentNullException(nameof(cultivar), "Property is required for class Apple."); + + if (origin == null) + throw new ArgumentNullException(nameof(origin), "Property is required for class Apple."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Apple(cultivar, origin); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs index d1df77d776d..6da56e2d8be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public AppleReq(string cultivar, bool mealy) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (cultivar == null) - throw new ArgumentNullException("cultivar is a required property for AppleReq and cannot be null."); - - if (mealy == null) - throw new ArgumentNullException("mealy is a required property for AppleReq and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Cultivar = cultivar; Mealy = mealy; } @@ -143,6 +131,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (cultivar == null) + throw new ArgumentNullException(nameof(cultivar), "Property is required for class AppleReq."); + + if (mealy == null) + throw new ArgumentNullException(nameof(mealy), "Property is required for class AppleReq."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new AppleReq(cultivar, mealy); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index cbae88b5dc6..83007a0f90c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayOfArrayOfNumberOnly(List> arrayArrayNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayArrayNumber == null) - throw new ArgumentNullException("arrayArrayNumber is a required property for ArrayOfArrayOfNumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayArrayNumber = arrayArrayNumber; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayArrayNumber == null) + throw new ArgumentNullException(nameof(arrayArrayNumber), "Property is required for class ArrayOfArrayOfNumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayOfArrayOfNumberOnly(arrayArrayNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 703cdfac70a..275b951171f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayOfNumberOnly(List arrayNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayNumber == null) - throw new ArgumentNullException("arrayNumber is a required property for ArrayOfNumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayNumber = arrayNumber; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayNumber == null) + throw new ArgumentNullException(nameof(arrayNumber), "Property is required for class ArrayOfNumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayOfNumberOnly(arrayNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs index b8bbf687904..ff835c24a7f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -39,21 +39,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayTest(List> arrayArrayOfInteger, List> arrayArrayOfModel, List arrayOfString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayOfString == null) - throw new ArgumentNullException("arrayOfString is a required property for ArrayTest and cannot be null."); - - if (arrayArrayOfInteger == null) - throw new ArgumentNullException("arrayArrayOfInteger is a required property for ArrayTest and cannot be null."); - - if (arrayArrayOfModel == null) - throw new ArgumentNullException("arrayArrayOfModel is a required property for ArrayTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayArrayOfInteger = arrayArrayOfInteger; ArrayArrayOfModel = arrayArrayOfModel; ArrayOfString = arrayOfString; @@ -168,6 +153,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayOfString == null) + throw new ArgumentNullException(nameof(arrayOfString), "Property is required for class ArrayTest."); + + if (arrayArrayOfInteger == null) + throw new ArgumentNullException(nameof(arrayArrayOfInteger), "Property is required for class ArrayTest."); + + if (arrayArrayOfModel == null) + throw new ArgumentNullException(nameof(arrayArrayOfModel), "Property is required for class ArrayTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs index 87157888a6c..41c562b5e49 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Banana(decimal lengthCm) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (lengthCm == null) - throw new ArgumentNullException("lengthCm is a required property for Banana and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - LengthCm = lengthCm; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (lengthCm == null) + throw new ArgumentNullException(nameof(lengthCm), "Property is required for class Banana."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Banana(lengthCm); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs index f34c6cf7a59..179c0d2b914 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public BananaReq(decimal lengthCm, bool sweet) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (lengthCm == null) - throw new ArgumentNullException("lengthCm is a required property for BananaReq and cannot be null."); - - if (sweet == null) - throw new ArgumentNullException("sweet is a required property for BananaReq and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - LengthCm = lengthCm; Sweet = sweet; } @@ -144,6 +132,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (lengthCm == null) + throw new ArgumentNullException(nameof(lengthCm), "Property is required for class BananaReq."); + + if (sweet == null) + throw new ArgumentNullException(nameof(sweet), "Property is required for class BananaReq."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new BananaReq(lengthCm, sweet); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs index acf6515437b..ec0eb684ac8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public BasquePig(string className) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for BasquePig and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class BasquePig."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new BasquePig(className); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs index 7ce8d8ff649..b251591842f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs @@ -42,30 +42,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (smallCamel == null) - throw new ArgumentNullException("smallCamel is a required property for Capitalization and cannot be null."); - - if (capitalCamel == null) - throw new ArgumentNullException("capitalCamel is a required property for Capitalization and cannot be null."); - - if (smallSnake == null) - throw new ArgumentNullException("smallSnake is a required property for Capitalization and cannot be null."); - - if (capitalSnake == null) - throw new ArgumentNullException("capitalSnake is a required property for Capitalization and cannot be null."); - - if (sCAETHFlowPoints == null) - throw new ArgumentNullException("sCAETHFlowPoints is a required property for Capitalization and cannot be null."); - - if (aTTNAME == null) - throw new ArgumentNullException("aTTNAME is a required property for Capitalization and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ATT_NAME = aTTNAME; CapitalCamel = capitalCamel; CapitalSnake = capitalSnake; @@ -214,6 +190,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (smallCamel == null) + throw new ArgumentNullException(nameof(smallCamel), "Property is required for class Capitalization."); + + if (capitalCamel == null) + throw new ArgumentNullException(nameof(capitalCamel), "Property is required for class Capitalization."); + + if (smallSnake == null) + throw new ArgumentNullException(nameof(smallSnake), "Property is required for class Capitalization."); + + if (capitalSnake == null) + throw new ArgumentNullException(nameof(capitalSnake), "Property is required for class Capitalization."); + + if (sCAETHFlowPoints == null) + throw new ArgumentNullException(nameof(sCAETHFlowPoints), "Property is required for class Capitalization."); + + if (aTTNAME == null) + throw new ArgumentNullException(nameof(aTTNAME), "Property is required for class Capitalization."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs index 45f9fec45a7..6126f92444b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public CatAllOf(bool declawed) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (declawed == null) - throw new ArgumentNullException("declawed is a required property for CatAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Declawed = declawed; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (declawed == null) + throw new ArgumentNullException(nameof(declawed), "Property is required for class CatAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new CatAllOf(declawed); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs index dee6148673d..bf40829d283 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Category(long id, string name = "default-name") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Category and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Category and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; Name = name; } @@ -150,6 +138,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Category."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Category."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Category(id, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index 32aedbbc9c5..79130f0abb6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ChildCatAllOf(string name, PetTypeEnum petType = PetTypeEnum.ChildCat) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for ChildCatAllOf and cannot be null."); - - if (petType == null) - throw new ArgumentNullException("petType is a required property for ChildCatAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Name = name; PetType = petType; } @@ -189,6 +177,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class ChildCatAllOf."); + + if (petType == null) + throw new ArgumentNullException(nameof(petType), "Property is required for class ChildCatAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ChildCatAllOf(name, petType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs index da7dc6abac1..56408a7c672 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ClassModel(string classProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (classProperty == null) - throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassProperty = classProperty; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (classProperty == null) + throw new ArgumentNullException(nameof(classProperty), "Property is required for class ClassModel."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ClassModel(classProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs index 85fe617e5cd..63b6ed469bc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DanishPig(string className) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for DanishPig and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class DanishPig."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DanishPig(className); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 1ebc2f27b17..c4fa59e6ba0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DateOnlyClass(DateTime dateOnlyProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (dateOnlyProperty == null) - throw new ArgumentNullException("dateOnlyProperty is a required property for DateOnlyClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DateOnlyProperty = dateOnlyProperty; } @@ -140,6 +131,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (dateOnlyProperty == null) + throw new ArgumentNullException(nameof(dateOnlyProperty), "Property is required for class DateOnlyClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DateOnlyClass(dateOnlyProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs index d45666b9644..9d1cfaaf735 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DeprecatedObject(string name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for DeprecatedObject and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Name = name; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class DeprecatedObject."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DeprecatedObject(name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs index ed252b23eaa..155413dde4d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DogAllOf(string breed) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (breed == null) - throw new ArgumentNullException("breed is a required property for DogAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Breed = breed; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (breed == null) + throw new ArgumentNullException(nameof(breed), "Property is required for class DogAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DogAllOf(breed); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs index 1f024faf986..95f7f9b8ac1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs @@ -40,21 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List shapes, NullableShape? nullableShape = default) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mainShape == null) - throw new ArgumentNullException("mainShape is a required property for Drawing and cannot be null."); - - if (shapeOrNull == null) - throw new ArgumentNullException("shapeOrNull is a required property for Drawing and cannot be null."); - - if (shapes == null) - throw new ArgumentNullException("shapes is a required property for Drawing and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - MainShape = mainShape; ShapeOrNull = shapeOrNull; Shapes = shapes; @@ -176,6 +161,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mainShape == null) + throw new ArgumentNullException(nameof(mainShape), "Property is required for class Drawing."); + + if (shapeOrNull == null) + throw new ArgumentNullException(nameof(shapeOrNull), "Property is required for class Drawing."); + + if (shapes == null) + throw new ArgumentNullException(nameof(shapes), "Property is required for class Drawing."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Drawing(mainShape, shapeOrNull, shapes, nullableShape); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs index aae49437300..65e7ca0efcc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public EnumArrays(List arrayEnum, JustSymbolEnum justSymbol) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (justSymbol == null) - throw new ArgumentNullException("justSymbol is a required property for EnumArrays and cannot be null."); - - if (arrayEnum == null) - throw new ArgumentNullException("arrayEnum is a required property for EnumArrays and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayEnum = arrayEnum; JustSymbol = justSymbol; } @@ -251,6 +239,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (justSymbol == null) + throw new ArgumentNullException(nameof(justSymbol), "Property is required for class EnumArrays."); + + if (arrayEnum == null) + throw new ArgumentNullException(nameof(arrayEnum), "Property is required for class EnumArrays."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new EnumArrays(arrayEnum, justSymbol); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs index 075193452a2..8c69fead57a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs @@ -45,36 +45,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (enumString == null) - throw new ArgumentNullException("enumString is a required property for EnumTest and cannot be null."); - - if (enumStringRequired == null) - throw new ArgumentNullException("enumStringRequired is a required property for EnumTest and cannot be null."); - - if (enumInteger == null) - throw new ArgumentNullException("enumInteger is a required property for EnumTest and cannot be null."); - - if (enumIntegerOnly == null) - throw new ArgumentNullException("enumIntegerOnly is a required property for EnumTest and cannot be null."); - - if (enumNumber == null) - throw new ArgumentNullException("enumNumber is a required property for EnumTest and cannot be null."); - - if (outerEnumInteger == null) - throw new ArgumentNullException("outerEnumInteger is a required property for EnumTest and cannot be null."); - - if (outerEnumDefaultValue == null) - throw new ArgumentNullException("outerEnumDefaultValue is a required property for EnumTest and cannot be null."); - - if (outerEnumIntegerDefaultValue == null) - throw new ArgumentNullException("outerEnumIntegerDefaultValue is a required property for EnumTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EnumInteger = enumInteger; EnumIntegerOnly = enumIntegerOnly; EnumNumber = enumNumber; @@ -527,6 +497,36 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (enumString == null) + throw new ArgumentNullException(nameof(enumString), "Property is required for class EnumTest."); + + if (enumStringRequired == null) + throw new ArgumentNullException(nameof(enumStringRequired), "Property is required for class EnumTest."); + + if (enumInteger == null) + throw new ArgumentNullException(nameof(enumInteger), "Property is required for class EnumTest."); + + if (enumIntegerOnly == null) + throw new ArgumentNullException(nameof(enumIntegerOnly), "Property is required for class EnumTest."); + + if (enumNumber == null) + throw new ArgumentNullException(nameof(enumNumber), "Property is required for class EnumTest."); + + if (outerEnumInteger == null) + throw new ArgumentNullException(nameof(outerEnumInteger), "Property is required for class EnumTest."); + + if (outerEnumDefaultValue == null) + throw new ArgumentNullException(nameof(outerEnumDefaultValue), "Property is required for class EnumTest."); + + if (outerEnumIntegerDefaultValue == null) + throw new ArgumentNullException(nameof(outerEnumIntegerDefaultValue), "Property is required for class EnumTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs index 6b69a19c48a..3b548b37ee2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public File(string sourceURI) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (sourceURI == null) - throw new ArgumentNullException("sourceURI is a required property for File and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - SourceURI = sourceURI; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (sourceURI == null) + throw new ArgumentNullException(nameof(sourceURI), "Property is required for class File."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new File(sourceURI); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index a23a340595c..2badda85d70 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FileSchemaTestClass(File file, List files) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (file == null) - throw new ArgumentNullException("file is a required property for FileSchemaTestClass and cannot be null."); - - if (files == null) - throw new ArgumentNullException("files is a required property for FileSchemaTestClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - File = file; Files = files; } @@ -151,6 +139,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (file == null) + throw new ArgumentNullException(nameof(file), "Property is required for class FileSchemaTestClass."); + + if (files == null) + throw new ArgumentNullException(nameof(files), "Property is required for class FileSchemaTestClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FileSchemaTestClass(file, files); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs index 2de7d254da5..ee4aaf4bbdc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Foo(string bar = "bar") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for Foo and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class Foo."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Foo(bar); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 89584fbdd35..b8721365867 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FooGetDefaultResponse(Foo stringProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (stringProperty == null) - throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - StringProperty = stringProperty; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (stringProperty == null) + throw new ArgumentNullException(nameof(stringProperty), "Property is required for class FooGetDefaultResponse."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FooGetDefaultResponse(stringProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index c592f4563aa..947ae38ad22 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -54,66 +54,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, uint unsignedInteger, ulong unsignedLong, Guid uuid) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (integer == null) - throw new ArgumentNullException("integer is a required property for FormatTest and cannot be null."); - - if (int32 == null) - throw new ArgumentNullException("int32 is a required property for FormatTest and cannot be null."); - - if (unsignedInteger == null) - throw new ArgumentNullException("unsignedInteger is a required property for FormatTest and cannot be null."); - - if (int64 == null) - throw new ArgumentNullException("int64 is a required property for FormatTest and cannot be null."); - - if (unsignedLong == null) - throw new ArgumentNullException("unsignedLong is a required property for FormatTest and cannot be null."); - - if (number == null) - throw new ArgumentNullException("number is a required property for FormatTest and cannot be null."); - - if (floatProperty == null) - throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null."); - - if (doubleProperty == null) - throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null."); - - if (decimalProperty == null) - throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null."); - - if (stringProperty == null) - throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null."); - - if (byteProperty == null) - throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null."); - - if (binary == null) - throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null."); - - if (date == null) - throw new ArgumentNullException("date is a required property for FormatTest and cannot be null."); - - if (dateTime == null) - throw new ArgumentNullException("dateTime is a required property for FormatTest and cannot be null."); - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for FormatTest and cannot be null."); - - if (password == null) - throw new ArgumentNullException("password is a required property for FormatTest and cannot be null."); - - if (patternWithDigits == null) - throw new ArgumentNullException("patternWithDigits is a required property for FormatTest and cannot be null."); - - if (patternWithDigitsAndDelimiter == null) - throw new ArgumentNullException("patternWithDigitsAndDelimiter is a required property for FormatTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Binary = binary; ByteProperty = byteProperty; Date = date; @@ -539,6 +479,66 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (integer == null) + throw new ArgumentNullException(nameof(integer), "Property is required for class FormatTest."); + + if (int32 == null) + throw new ArgumentNullException(nameof(int32), "Property is required for class FormatTest."); + + if (unsignedInteger == null) + throw new ArgumentNullException(nameof(unsignedInteger), "Property is required for class FormatTest."); + + if (int64 == null) + throw new ArgumentNullException(nameof(int64), "Property is required for class FormatTest."); + + if (unsignedLong == null) + throw new ArgumentNullException(nameof(unsignedLong), "Property is required for class FormatTest."); + + if (number == null) + throw new ArgumentNullException(nameof(number), "Property is required for class FormatTest."); + + if (floatProperty == null) + throw new ArgumentNullException(nameof(floatProperty), "Property is required for class FormatTest."); + + if (doubleProperty == null) + throw new ArgumentNullException(nameof(doubleProperty), "Property is required for class FormatTest."); + + if (decimalProperty == null) + throw new ArgumentNullException(nameof(decimalProperty), "Property is required for class FormatTest."); + + if (stringProperty == null) + throw new ArgumentNullException(nameof(stringProperty), "Property is required for class FormatTest."); + + if (byteProperty == null) + throw new ArgumentNullException(nameof(byteProperty), "Property is required for class FormatTest."); + + if (binary == null) + throw new ArgumentNullException(nameof(binary), "Property is required for class FormatTest."); + + if (date == null) + throw new ArgumentNullException(nameof(date), "Property is required for class FormatTest."); + + if (dateTime == null) + throw new ArgumentNullException(nameof(dateTime), "Property is required for class FormatTest."); + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class FormatTest."); + + if (password == null) + throw new ArgumentNullException(nameof(password), "Property is required for class FormatTest."); + + if (patternWithDigits == null) + throw new ArgumentNullException(nameof(patternWithDigits), "Property is required for class FormatTest."); + + if (patternWithDigitsAndDelimiter == null) + throw new ArgumentNullException(nameof(patternWithDigitsAndDelimiter), "Property is required for class FormatTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, unsignedInteger, unsignedLong, uuid); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs index ca28985fddc..a9c0d304226 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs @@ -38,15 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Apple? apple, string color) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException(nameof(Color)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Apple = apple; Color = color; } @@ -59,15 +50,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Banana banana, string color) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException(nameof(Color)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Banana = banana; Color = color; } @@ -165,6 +147,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (appleDeserialized) return new Fruit(apple, color); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs index 1d92a6e1d55..a13a2e0adb2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs @@ -39,15 +39,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public GmFruit(Apple? apple, Banana banana, string color) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException("color is a required property for GmFruit and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Apple = Apple; Banana = Banana; Color = color; @@ -146,6 +137,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class GmFruit."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new GmFruit(apple, banana, color); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index efb0be266ac..2cac3db230e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public GrandparentAnimal(string petType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (petType == null) - throw new ArgumentNullException("petType is a required property for GrandparentAnimal and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - PetType = petType; } @@ -143,6 +134,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (petType == null) + throw new ArgumentNullException(nameof(petType), "Property is required for class GrandparentAnimal."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new GrandparentAnimal(petType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 684dde7563b..3670afacd1c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal HasOnlyReadOnly(string bar, string foo) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for HasOnlyReadOnly and cannot be null."); - - if (foo == null) - throw new ArgumentNullException("foo is a required property for HasOnlyReadOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; Foo = foo; } @@ -186,6 +174,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class HasOnlyReadOnly."); + + if (foo == null) + throw new ArgumentNullException(nameof(foo), "Property is required for class HasOnlyReadOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new HasOnlyReadOnly(bar, foo); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs index d87c1371cd8..a63c52384ab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public List(string _123list) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (_123list == null) - throw new ArgumentNullException("_123list is a required property for List and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - _123List = _123list; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (_123list == null) + throw new ArgumentNullException(nameof(_123list), "Property is required for class List."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new List(_123list); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs index 0341d1338b9..fe8046b10af 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs @@ -40,24 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public MapTest(Dictionary directMap, Dictionary indirectMap, Dictionary> mapMapOfString, Dictionary mapOfEnumString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mapMapOfString == null) - throw new ArgumentNullException("mapMapOfString is a required property for MapTest and cannot be null."); - - if (mapOfEnumString == null) - throw new ArgumentNullException("mapOfEnumString is a required property for MapTest and cannot be null."); - - if (directMap == null) - throw new ArgumentNullException("directMap is a required property for MapTest and cannot be null."); - - if (indirectMap == null) - throw new ArgumentNullException("indirectMap is a required property for MapTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DirectMap = directMap; IndirectMap = indirectMap; MapMapOfString = mapMapOfString; @@ -235,6 +217,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mapMapOfString == null) + throw new ArgumentNullException(nameof(mapMapOfString), "Property is required for class MapTest."); + + if (mapOfEnumString == null) + throw new ArgumentNullException(nameof(mapOfEnumString), "Property is required for class MapTest."); + + if (directMap == null) + throw new ArgumentNullException(nameof(directMap), "Property is required for class MapTest."); + + if (indirectMap == null) + throw new ArgumentNullException(nameof(indirectMap), "Property is required for class MapTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index d2a2492aa80..a2c51715075 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -40,24 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary map, Guid uuid, Guid uuidWithPattern) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (uuidWithPattern == null) - throw new ArgumentNullException("uuidWithPattern is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (dateTime == null) - throw new ArgumentNullException("dateTime is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (map == null) - throw new ArgumentNullException("map is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DateTime = dateTime; Map = map; Uuid = uuid; @@ -197,6 +179,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (uuidWithPattern == null) + throw new ArgumentNullException(nameof(uuidWithPattern), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (dateTime == null) + throw new ArgumentNullException(nameof(dateTime), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (map == null) + throw new ArgumentNullException(nameof(map), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid, uuidWithPattern); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs index e1db9db321c..ef10cdff222 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Model200Response(string classProperty, int name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for Model200Response and cannot be null."); - - if (classProperty == null) - throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassProperty = classProperty; Name = name; } @@ -150,6 +138,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Model200Response."); + + if (classProperty == null) + throw new ArgumentNullException(nameof(classProperty), "Property is required for class Model200Response."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Model200Response(classProperty, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs index 1096022a282..244a3231efd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ModelClient(string clientProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (clientProperty == null) - throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - _ClientProperty = clientProperty; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (clientProperty == null) + throw new ArgumentNullException(nameof(clientProperty), "Property is required for class ModelClient."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ModelClient(clientProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs index bec58518dac..02d1207dee2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs @@ -40,24 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Name(int nameProperty, string property, int snakeCase, int _123number) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (nameProperty == null) - throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null."); - - if (snakeCase == null) - throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null."); - - if (property == null) - throw new ArgumentNullException("property is a required property for Name and cannot be null."); - - if (_123number == null) - throw new ArgumentNullException("_123number is a required property for Name and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - NameProperty = nameProperty; Property = property; SnakeCase = snakeCase; @@ -221,6 +203,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (nameProperty == null) + throw new ArgumentNullException(nameof(nameProperty), "Property is required for class Name."); + + if (snakeCase == null) + throw new ArgumentNullException(nameof(snakeCase), "Property is required for class Name."); + + if (property == null) + throw new ArgumentNullException(nameof(property), "Property is required for class Name."); + + if (_123number == null) + throw new ArgumentNullException(nameof(_123number), "Property is required for class Name."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Name(nameProperty, property, snakeCase, _123number); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs index b5946392c46..db356cc9f89 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs @@ -48,18 +48,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public NullableClass(List arrayItemsNullable, Dictionary objectItemsNullable, List? arrayAndItemsNullableProp = default, List? arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary? objectAndItemsNullableProp = default, Dictionary? objectNullableProp = default, string? stringProp = default) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayItemsNullable == null) - throw new ArgumentNullException("arrayItemsNullable is a required property for NullableClass and cannot be null."); - - if (objectItemsNullable == null) - throw new ArgumentNullException("objectItemsNullable is a required property for NullableClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayItemsNullable = arrayItemsNullable; ObjectItemsNullable = objectItemsNullable; ArrayAndItemsNullableProp = arrayAndItemsNullableProp; @@ -294,6 +282,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayItemsNullable == null) + throw new ArgumentNullException(nameof(arrayItemsNullable), "Property is required for class NullableClass."); + + if (objectItemsNullable == null) + throw new ArgumentNullException(nameof(objectItemsNullable), "Property is required for class NullableClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs index 65623db5719..10261ecbdce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public NumberOnly(decimal justNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (justNumber == null) - throw new ArgumentNullException("justNumber is a required property for NumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - JustNumber = justNumber; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (justNumber == null) + throw new ArgumentNullException(nameof(justNumber), "Property is required for class NumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new NumberOnly(justNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index b599e8925be..6c03acde0ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -40,24 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ObjectWithDeprecatedFields(List bars, DeprecatedObject deprecatedRef, decimal id, string uuid) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (id == null) - throw new ArgumentNullException("id is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (deprecatedRef == null) - throw new ArgumentNullException("deprecatedRef is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (bars == null) - throw new ArgumentNullException("bars is a required property for ObjectWithDeprecatedFields and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bars = bars; DeprecatedRef = deprecatedRef; Id = id; @@ -187,6 +169,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class ObjectWithDeprecatedFields."); + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class ObjectWithDeprecatedFields."); + + if (deprecatedRef == null) + throw new ArgumentNullException(nameof(deprecatedRef), "Property is required for class ObjectWithDeprecatedFields."); + + if (bars == null) + throw new ArgumentNullException(nameof(bars), "Property is required for class ObjectWithDeprecatedFields."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs index d46303f9d65..6e4cd12bd12 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs @@ -42,30 +42,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Order(long id, long petId, int quantity, DateTime shipDate, StatusEnum status, bool complete = false) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Order and cannot be null."); - - if (petId == null) - throw new ArgumentNullException("petId is a required property for Order and cannot be null."); - - if (quantity == null) - throw new ArgumentNullException("quantity is a required property for Order and cannot be null."); - - if (shipDate == null) - throw new ArgumentNullException("shipDate is a required property for Order and cannot be null."); - - if (status == null) - throw new ArgumentNullException("status is a required property for Order and cannot be null."); - - if (complete == null) - throw new ArgumentNullException("complete is a required property for Order and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; PetId = petId; Quantity = quantity; @@ -288,6 +264,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Order."); + + if (petId == null) + throw new ArgumentNullException(nameof(petId), "Property is required for class Order."); + + if (quantity == null) + throw new ArgumentNullException(nameof(quantity), "Property is required for class Order."); + + if (shipDate == null) + throw new ArgumentNullException(nameof(shipDate), "Property is required for class Order."); + + if (status == null) + throw new ArgumentNullException(nameof(status), "Property is required for class Order."); + + if (complete == null) + throw new ArgumentNullException(nameof(complete), "Property is required for class Order."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Order(id, petId, quantity, shipDate, status, complete); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs index f76d08227bf..b3233c21a79 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -39,21 +39,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public OuterComposite(bool myBoolean, decimal myNumber, string myString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (myNumber == null) - throw new ArgumentNullException("myNumber is a required property for OuterComposite and cannot be null."); - - if (myString == null) - throw new ArgumentNullException("myString is a required property for OuterComposite and cannot be null."); - - if (myBoolean == null) - throw new ArgumentNullException("myBoolean is a required property for OuterComposite and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - MyBoolean = myBoolean; MyNumber = myNumber; MyString = myString; @@ -167,6 +152,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (myNumber == null) + throw new ArgumentNullException(nameof(myNumber), "Property is required for class OuterComposite."); + + if (myString == null) + throw new ArgumentNullException(nameof(myString), "Property is required for class OuterComposite."); + + if (myBoolean == null) + throw new ArgumentNullException(nameof(myBoolean), "Property is required for class OuterComposite."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new OuterComposite(myBoolean, myNumber, myString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs index 69bca429015..a91d16705b9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs @@ -42,30 +42,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Pet(Category category, long id, string name, List photoUrls, StatusEnum status, List tags) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Pet and cannot be null."); - - if (category == null) - throw new ArgumentNullException("category is a required property for Pet and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Pet and cannot be null."); - - if (photoUrls == null) - throw new ArgumentNullException("photoUrls is a required property for Pet and cannot be null."); - - if (tags == null) - throw new ArgumentNullException("tags is a required property for Pet and cannot be null."); - - if (status == null) - throw new ArgumentNullException("status is a required property for Pet and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Category = category; Id = id; Name = name; @@ -282,6 +258,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Pet."); + + if (category == null) + throw new ArgumentNullException(nameof(category), "Property is required for class Pet."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Pet."); + + if (photoUrls == null) + throw new ArgumentNullException(nameof(photoUrls), "Property is required for class Pet."); + + if (tags == null) + throw new ArgumentNullException(nameof(tags), "Property is required for class Pet."); + + if (status == null) + throw new ArgumentNullException(nameof(status), "Property is required for class Pet."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Pet(category, id, name, photoUrls, status, tags); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index 592975da6f4..e9d705d584f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public QuadrilateralInterface(string quadrilateralType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException("quadrilateralType is a required property for QuadrilateralInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - QuadrilateralType = quadrilateralType; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class QuadrilateralInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new QuadrilateralInterface(quadrilateralType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index 915715c96e4..e4e41e2caee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ReadOnlyFirst(string bar, string baz) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for ReadOnlyFirst and cannot be null."); - - if (baz == null) - throw new ArgumentNullException("baz is a required property for ReadOnlyFirst and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; Baz = baz; } @@ -185,6 +173,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class ReadOnlyFirst."); + + if (baz == null) + throw new ArgumentNullException(nameof(baz), "Property is required for class ReadOnlyFirst."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ReadOnlyFirst(bar, baz); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs index 02a2b05fea7..39152c59e57 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Return(int returnProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (returnProperty == null) - throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ReturnProperty = returnProperty; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (returnProperty == null) + throw new ArgumentNullException(nameof(returnProperty), "Property is required for class Return."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Return(returnProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs index ef640d6ecdd..27eef9ebccd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs @@ -38,15 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Shape(Triangle triangle, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Triangle = triangle; QuadrilateralType = quadrilateralType; } @@ -59,15 +50,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Shape(Quadrilateral quadrilateral, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; } @@ -182,6 +164,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Shape."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (triangleDeserialized) return new Shape(triangle, quadrilateralType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs index f40a7dc078f..899ba8fa5de 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeInterface(string shapeType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException("shapeType is a required property for ShapeInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ShapeType = shapeType; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ShapeInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ShapeInterface(shapeType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs index 5db8f307642..4e0151c6c6b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -38,15 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeOrNull(Triangle triangle, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Triangle = triangle; QuadrilateralType = quadrilateralType; } @@ -59,15 +50,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; } @@ -182,6 +164,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ShapeOrNull."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (triangleDeserialized) return new ShapeOrNull(triangle, quadrilateralType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs index 8e4a3fb6c95..b52b9d5f1ff 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public SpecialModelName(string specialModelNameProperty, long specialPropertyName) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (specialPropertyName == null) - throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null."); - - if (specialModelNameProperty == null) - throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - SpecialModelNameProperty = specialModelNameProperty; SpecialPropertyName = specialPropertyName; } @@ -150,6 +138,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (specialPropertyName == null) + throw new ArgumentNullException(nameof(specialPropertyName), "Property is required for class SpecialModelName."); + + if (specialModelNameProperty == null) + throw new ArgumentNullException(nameof(specialModelNameProperty), "Property is required for class SpecialModelName."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new SpecialModelName(specialModelNameProperty, specialPropertyName); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs index f12966b8e86..de8d3635790 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Tag(long id, string name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Tag and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Tag and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; Name = name; } @@ -150,6 +138,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Tag."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Tag."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Tag(id, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs index 0500dfb8bd1..e2403790908 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs @@ -39,18 +39,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(EquilateralTriangle equilateralTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EquilateralTriangle = equilateralTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -65,18 +53,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(IsoscelesTriangle isoscelesTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - IsoscelesTriangle = isoscelesTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -91,18 +67,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(ScaleneTriangle scaleneTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ScaleneTriangle = scaleneTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -237,6 +201,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class Triangle."); + + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class Triangle."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (equilateralTriangleDeserialized) return new Triangle(equilateralTriangle, shapeType, triangleType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs index b4c68790e2d..d58c53ec372 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public TriangleInterface(string triangleType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (triangleType == null) - throw new ArgumentNullException("triangleType is a required property for TriangleInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - TriangleType = triangleType; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class TriangleInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new TriangleInterface(triangleType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs index 622d5efd4f5..68c1bb6ea9b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs @@ -48,39 +48,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object? anyTypeProp = default, Object? anyTypePropNullable = default, Object? objectWithNoDeclaredPropsNullable = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for User and cannot be null."); - - if (username == null) - throw new ArgumentNullException("username is a required property for User and cannot be null."); - - if (firstName == null) - throw new ArgumentNullException("firstName is a required property for User and cannot be null."); - - if (lastName == null) - throw new ArgumentNullException("lastName is a required property for User and cannot be null."); - - if (email == null) - throw new ArgumentNullException("email is a required property for User and cannot be null."); - - if (password == null) - throw new ArgumentNullException("password is a required property for User and cannot be null."); - - if (phone == null) - throw new ArgumentNullException("phone is a required property for User and cannot be null."); - - if (userStatus == null) - throw new ArgumentNullException("userStatus is a required property for User and cannot be null."); - - if (objectWithNoDeclaredProps == null) - throw new ArgumentNullException("objectWithNoDeclaredProps is a required property for User and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Email = email; FirstName = firstName; Id = id; @@ -311,6 +278,39 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class User."); + + if (username == null) + throw new ArgumentNullException(nameof(username), "Property is required for class User."); + + if (firstName == null) + throw new ArgumentNullException(nameof(firstName), "Property is required for class User."); + + if (lastName == null) + throw new ArgumentNullException(nameof(lastName), "Property is required for class User."); + + if (email == null) + throw new ArgumentNullException(nameof(email), "Property is required for class User."); + + if (password == null) + throw new ArgumentNullException(nameof(password), "Property is required for class User."); + + if (phone == null) + throw new ArgumentNullException(nameof(phone), "Property is required for class User."); + + if (userStatus == null) + throw new ArgumentNullException(nameof(userStatus), "Property is required for class User."); + + if (objectWithNoDeclaredProps == null) + throw new ArgumentNullException(nameof(objectWithNoDeclaredProps), "Property is required for class User."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs index ce96f67fe2b..00aa2f3c594 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs @@ -39,21 +39,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Whale(string className, bool hasBaleen, bool hasTeeth) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (hasBaleen == null) - throw new ArgumentNullException("hasBaleen is a required property for Whale and cannot be null."); - - if (hasTeeth == null) - throw new ArgumentNullException("hasTeeth is a required property for Whale and cannot be null."); - - if (className == null) - throw new ArgumentNullException("className is a required property for Whale and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; HasBaleen = hasBaleen; HasTeeth = hasTeeth; @@ -167,6 +152,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (hasBaleen == null) + throw new ArgumentNullException(nameof(hasBaleen), "Property is required for class Whale."); + + if (hasTeeth == null) + throw new ArgumentNullException(nameof(hasTeeth), "Property is required for class Whale."); + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Whale."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Whale(className, hasBaleen, hasTeeth); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs index 7693d9c9094..75fae4222b7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs @@ -38,18 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Zebra(string className, TypeEnum type) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (type == null) - throw new ArgumentNullException("type is a required property for Zebra and cannot be null."); - - if (className == null) - throw new ArgumentNullException("className is a required property for Zebra and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; Type = type; } @@ -212,6 +200,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (type == null) + throw new ArgumentNullException(nameof(type), "Property is required for class Zebra."); + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Zebra."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Zebra(className, type); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs index 2ee79b7ba3b..f1c04211b9d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Activity(Dictionary> activityOutputs) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (activityOutputs == null) - throw new ArgumentNullException("activityOutputs is a required property for Activity and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ActivityOutputs = activityOutputs; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (activityOutputs == null) + throw new ArgumentNullException(nameof(activityOutputs), "Property is required for class Activity."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Activity(activityOutputs); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 46998f231ec..961f370130f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ActivityOutputElementRepresentation(string prop1, Object prop2) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (prop1 == null) - throw new ArgumentNullException("prop1 is a required property for ActivityOutputElementRepresentation and cannot be null."); - - if (prop2 == null) - throw new ArgumentNullException("prop2 is a required property for ActivityOutputElementRepresentation and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Prop1 = prop1; Prop2 = prop2; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (prop1 == null) + throw new ArgumentNullException(nameof(prop1), "Property is required for class ActivityOutputElementRepresentation."); + + if (prop2 == null) + throw new ArgumentNullException(nameof(prop2), "Property is required for class ActivityOutputElementRepresentation."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ActivityOutputElementRepresentation(prop1, prop2); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 141b010799e..41ebb7e8a39 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -42,33 +42,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public AdditionalPropertiesClass(Object emptyMap, Dictionary> mapOfMapProperty, Dictionary mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary mapWithUndeclaredPropertiesAnytype3, Dictionary mapWithUndeclaredPropertiesString, Object anytype1 = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mapProperty == null) - throw new ArgumentNullException("mapProperty is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapOfMapProperty == null) - throw new ArgumentNullException("mapOfMapProperty is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype1 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype1 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype2 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype2 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype3 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype3 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (emptyMap == null) - throw new ArgumentNullException("emptyMap is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesString == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesString is a required property for AdditionalPropertiesClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EmptyMap = emptyMap; MapOfMapProperty = mapOfMapProperty; MapProperty = mapProperty; @@ -249,6 +222,33 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mapProperty == null) + throw new ArgumentNullException(nameof(mapProperty), "Property is required for class AdditionalPropertiesClass."); + + if (mapOfMapProperty == null) + throw new ArgumentNullException(nameof(mapOfMapProperty), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype1 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype1), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype2 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype2), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype3 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype3), "Property is required for class AdditionalPropertiesClass."); + + if (emptyMap == null) + throw new ArgumentNullException(nameof(emptyMap), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesString == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesString), "Property is required for class AdditionalPropertiesClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs index a8e6d39ce5f..830bec45669 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Animal(string className, string color = "red") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for Animal and cannot be null."); - - if (color == null) - throw new ArgumentNullException("color is a required property for Animal and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; Color = color; } @@ -157,6 +145,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Animal."); + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class Animal."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Animal(className, color); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs index efd488d07b9..12c5484c2ff 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -37,21 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ApiResponse(int code, string message, string type) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (code == null) - throw new ArgumentNullException("code is a required property for ApiResponse and cannot be null."); - - if (type == null) - throw new ArgumentNullException("type is a required property for ApiResponse and cannot be null."); - - if (message == null) - throw new ArgumentNullException("message is a required property for ApiResponse and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Code = code; Message = message; Type = type; @@ -164,6 +149,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (code == null) + throw new ArgumentNullException(nameof(code), "Property is required for class ApiResponse."); + + if (type == null) + throw new ArgumentNullException(nameof(type), "Property is required for class ApiResponse."); + + if (message == null) + throw new ArgumentNullException(nameof(message), "Property is required for class ApiResponse."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ApiResponse(code, message, type); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs index a792416f2ae..7282462348f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Apple(string cultivar, string origin) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (cultivar == null) - throw new ArgumentNullException("cultivar is a required property for Apple and cannot be null."); - - if (origin == null) - throw new ArgumentNullException("origin is a required property for Apple and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Cultivar = cultivar; Origin = origin; } @@ -161,6 +149,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (cultivar == null) + throw new ArgumentNullException(nameof(cultivar), "Property is required for class Apple."); + + if (origin == null) + throw new ArgumentNullException(nameof(origin), "Property is required for class Apple."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Apple(cultivar, origin); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs index eec8d8b0cfe..fbfcd9efaf1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public AppleReq(string cultivar, bool mealy) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (cultivar == null) - throw new ArgumentNullException("cultivar is a required property for AppleReq and cannot be null."); - - if (mealy == null) - throw new ArgumentNullException("mealy is a required property for AppleReq and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Cultivar = cultivar; Mealy = mealy; } @@ -141,6 +129,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (cultivar == null) + throw new ArgumentNullException(nameof(cultivar), "Property is required for class AppleReq."); + + if (mealy == null) + throw new ArgumentNullException(nameof(mealy), "Property is required for class AppleReq."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new AppleReq(cultivar, mealy); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 47f7b46aa5f..a6e92aaf78e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayOfArrayOfNumberOnly(List> arrayArrayNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayArrayNumber == null) - throw new ArgumentNullException("arrayArrayNumber is a required property for ArrayOfArrayOfNumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayArrayNumber = arrayArrayNumber; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayArrayNumber == null) + throw new ArgumentNullException(nameof(arrayArrayNumber), "Property is required for class ArrayOfArrayOfNumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayOfArrayOfNumberOnly(arrayArrayNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 08732c44004..1f8c17cac78 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayOfNumberOnly(List arrayNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayNumber == null) - throw new ArgumentNullException("arrayNumber is a required property for ArrayOfNumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayNumber = arrayNumber; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayNumber == null) + throw new ArgumentNullException(nameof(arrayNumber), "Property is required for class ArrayOfNumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayOfNumberOnly(arrayNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs index eaaa692fd01..85e928be6d1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -37,21 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayTest(List> arrayArrayOfInteger, List> arrayArrayOfModel, List arrayOfString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayOfString == null) - throw new ArgumentNullException("arrayOfString is a required property for ArrayTest and cannot be null."); - - if (arrayArrayOfInteger == null) - throw new ArgumentNullException("arrayArrayOfInteger is a required property for ArrayTest and cannot be null."); - - if (arrayArrayOfModel == null) - throw new ArgumentNullException("arrayArrayOfModel is a required property for ArrayTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayArrayOfInteger = arrayArrayOfInteger; ArrayArrayOfModel = arrayArrayOfModel; ArrayOfString = arrayOfString; @@ -166,6 +151,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayOfString == null) + throw new ArgumentNullException(nameof(arrayOfString), "Property is required for class ArrayTest."); + + if (arrayArrayOfInteger == null) + throw new ArgumentNullException(nameof(arrayArrayOfInteger), "Property is required for class ArrayTest."); + + if (arrayArrayOfModel == null) + throw new ArgumentNullException(nameof(arrayArrayOfModel), "Property is required for class ArrayTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs index 1c8f4a7a912..a60328badff 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Banana(decimal lengthCm) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (lengthCm == null) - throw new ArgumentNullException("lengthCm is a required property for Banana and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - LengthCm = lengthCm; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (lengthCm == null) + throw new ArgumentNullException(nameof(lengthCm), "Property is required for class Banana."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Banana(lengthCm); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs index 014f8534eca..aa109bf1e8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public BananaReq(decimal lengthCm, bool sweet) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (lengthCm == null) - throw new ArgumentNullException("lengthCm is a required property for BananaReq and cannot be null."); - - if (sweet == null) - throw new ArgumentNullException("sweet is a required property for BananaReq and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - LengthCm = lengthCm; Sweet = sweet; } @@ -142,6 +130,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (lengthCm == null) + throw new ArgumentNullException(nameof(lengthCm), "Property is required for class BananaReq."); + + if (sweet == null) + throw new ArgumentNullException(nameof(sweet), "Property is required for class BananaReq."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new BananaReq(lengthCm, sweet); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs index f74cda1d968..08f9a36fe77 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public BasquePig(string className) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for BasquePig and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class BasquePig."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new BasquePig(className); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs index 89cb785431b..ef305b42a8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs @@ -40,30 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (smallCamel == null) - throw new ArgumentNullException("smallCamel is a required property for Capitalization and cannot be null."); - - if (capitalCamel == null) - throw new ArgumentNullException("capitalCamel is a required property for Capitalization and cannot be null."); - - if (smallSnake == null) - throw new ArgumentNullException("smallSnake is a required property for Capitalization and cannot be null."); - - if (capitalSnake == null) - throw new ArgumentNullException("capitalSnake is a required property for Capitalization and cannot be null."); - - if (sCAETHFlowPoints == null) - throw new ArgumentNullException("sCAETHFlowPoints is a required property for Capitalization and cannot be null."); - - if (aTTNAME == null) - throw new ArgumentNullException("aTTNAME is a required property for Capitalization and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ATT_NAME = aTTNAME; CapitalCamel = capitalCamel; CapitalSnake = capitalSnake; @@ -212,6 +188,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (smallCamel == null) + throw new ArgumentNullException(nameof(smallCamel), "Property is required for class Capitalization."); + + if (capitalCamel == null) + throw new ArgumentNullException(nameof(capitalCamel), "Property is required for class Capitalization."); + + if (smallSnake == null) + throw new ArgumentNullException(nameof(smallSnake), "Property is required for class Capitalization."); + + if (capitalSnake == null) + throw new ArgumentNullException(nameof(capitalSnake), "Property is required for class Capitalization."); + + if (sCAETHFlowPoints == null) + throw new ArgumentNullException(nameof(sCAETHFlowPoints), "Property is required for class Capitalization."); + + if (aTTNAME == null) + throw new ArgumentNullException(nameof(aTTNAME), "Property is required for class Capitalization."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs index 30b468956aa..09e87f9513d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public CatAllOf(bool declawed) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (declawed == null) - throw new ArgumentNullException("declawed is a required property for CatAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Declawed = declawed; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (declawed == null) + throw new ArgumentNullException(nameof(declawed), "Property is required for class CatAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new CatAllOf(declawed); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs index bbb05a49ad4..b8e0407d843 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Category(long id, string name = "default-name") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Category and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Category and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; Name = name; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Category."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Category."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Category(id, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index a56a226acfa..6f3308eb346 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ChildCatAllOf(string name, PetTypeEnum petType = PetTypeEnum.ChildCat) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for ChildCatAllOf and cannot be null."); - - if (petType == null) - throw new ArgumentNullException("petType is a required property for ChildCatAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Name = name; PetType = petType; } @@ -187,6 +175,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class ChildCatAllOf."); + + if (petType == null) + throw new ArgumentNullException(nameof(petType), "Property is required for class ChildCatAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ChildCatAllOf(name, petType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs index 932a529ec61..8b8b59299ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ClassModel(string classProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (classProperty == null) - throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassProperty = classProperty; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (classProperty == null) + throw new ArgumentNullException(nameof(classProperty), "Property is required for class ClassModel."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ClassModel(classProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs index 4dad6503d21..34d5e4a5688 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DanishPig(string className) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for DanishPig and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class DanishPig."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DanishPig(className); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 0b71684d282..9564eba0df5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DateOnlyClass(DateTime dateOnlyProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (dateOnlyProperty == null) - throw new ArgumentNullException("dateOnlyProperty is a required property for DateOnlyClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DateOnlyProperty = dateOnlyProperty; } @@ -138,6 +129,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (dateOnlyProperty == null) + throw new ArgumentNullException(nameof(dateOnlyProperty), "Property is required for class DateOnlyClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DateOnlyClass(dateOnlyProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 908406d3bf6..b6ed51029a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DeprecatedObject(string name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for DeprecatedObject and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Name = name; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class DeprecatedObject."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DeprecatedObject(name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs index 171b69d1e1c..c31bd1d9d68 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DogAllOf(string breed) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (breed == null) - throw new ArgumentNullException("breed is a required property for DogAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Breed = breed; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (breed == null) + throw new ArgumentNullException(nameof(breed), "Property is required for class DogAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DogAllOf(breed); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs index 372a5816a6d..5767c9f5e53 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs @@ -38,21 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List shapes, NullableShape nullableShape = default) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mainShape == null) - throw new ArgumentNullException("mainShape is a required property for Drawing and cannot be null."); - - if (shapeOrNull == null) - throw new ArgumentNullException("shapeOrNull is a required property for Drawing and cannot be null."); - - if (shapes == null) - throw new ArgumentNullException("shapes is a required property for Drawing and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - MainShape = mainShape; ShapeOrNull = shapeOrNull; Shapes = shapes; @@ -174,6 +159,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mainShape == null) + throw new ArgumentNullException(nameof(mainShape), "Property is required for class Drawing."); + + if (shapeOrNull == null) + throw new ArgumentNullException(nameof(shapeOrNull), "Property is required for class Drawing."); + + if (shapes == null) + throw new ArgumentNullException(nameof(shapes), "Property is required for class Drawing."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Drawing(mainShape, shapeOrNull, shapes, nullableShape); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 29be901e753..3372d66ab2a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public EnumArrays(List arrayEnum, JustSymbolEnum justSymbol) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (justSymbol == null) - throw new ArgumentNullException("justSymbol is a required property for EnumArrays and cannot be null."); - - if (arrayEnum == null) - throw new ArgumentNullException("arrayEnum is a required property for EnumArrays and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayEnum = arrayEnum; JustSymbol = justSymbol; } @@ -249,6 +237,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (justSymbol == null) + throw new ArgumentNullException(nameof(justSymbol), "Property is required for class EnumArrays."); + + if (arrayEnum == null) + throw new ArgumentNullException(nameof(arrayEnum), "Property is required for class EnumArrays."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new EnumArrays(arrayEnum, justSymbol); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs index 2cf78a5fb13..ccc7a9a7a2f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -43,36 +43,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (enumString == null) - throw new ArgumentNullException("enumString is a required property for EnumTest and cannot be null."); - - if (enumStringRequired == null) - throw new ArgumentNullException("enumStringRequired is a required property for EnumTest and cannot be null."); - - if (enumInteger == null) - throw new ArgumentNullException("enumInteger is a required property for EnumTest and cannot be null."); - - if (enumIntegerOnly == null) - throw new ArgumentNullException("enumIntegerOnly is a required property for EnumTest and cannot be null."); - - if (enumNumber == null) - throw new ArgumentNullException("enumNumber is a required property for EnumTest and cannot be null."); - - if (outerEnumInteger == null) - throw new ArgumentNullException("outerEnumInteger is a required property for EnumTest and cannot be null."); - - if (outerEnumDefaultValue == null) - throw new ArgumentNullException("outerEnumDefaultValue is a required property for EnumTest and cannot be null."); - - if (outerEnumIntegerDefaultValue == null) - throw new ArgumentNullException("outerEnumIntegerDefaultValue is a required property for EnumTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EnumInteger = enumInteger; EnumIntegerOnly = enumIntegerOnly; EnumNumber = enumNumber; @@ -525,6 +495,36 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (enumString == null) + throw new ArgumentNullException(nameof(enumString), "Property is required for class EnumTest."); + + if (enumStringRequired == null) + throw new ArgumentNullException(nameof(enumStringRequired), "Property is required for class EnumTest."); + + if (enumInteger == null) + throw new ArgumentNullException(nameof(enumInteger), "Property is required for class EnumTest."); + + if (enumIntegerOnly == null) + throw new ArgumentNullException(nameof(enumIntegerOnly), "Property is required for class EnumTest."); + + if (enumNumber == null) + throw new ArgumentNullException(nameof(enumNumber), "Property is required for class EnumTest."); + + if (outerEnumInteger == null) + throw new ArgumentNullException(nameof(outerEnumInteger), "Property is required for class EnumTest."); + + if (outerEnumDefaultValue == null) + throw new ArgumentNullException(nameof(outerEnumDefaultValue), "Property is required for class EnumTest."); + + if (outerEnumIntegerDefaultValue == null) + throw new ArgumentNullException(nameof(outerEnumIntegerDefaultValue), "Property is required for class EnumTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs index 7997aa35771..5192d0685c9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public File(string sourceURI) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (sourceURI == null) - throw new ArgumentNullException("sourceURI is a required property for File and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - SourceURI = sourceURI; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (sourceURI == null) + throw new ArgumentNullException(nameof(sourceURI), "Property is required for class File."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new File(sourceURI); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 4b3824ae2b5..8c19ca974b7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FileSchemaTestClass(File file, List files) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (file == null) - throw new ArgumentNullException("file is a required property for FileSchemaTestClass and cannot be null."); - - if (files == null) - throw new ArgumentNullException("files is a required property for FileSchemaTestClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - File = file; Files = files; } @@ -149,6 +137,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (file == null) + throw new ArgumentNullException(nameof(file), "Property is required for class FileSchemaTestClass."); + + if (files == null) + throw new ArgumentNullException(nameof(files), "Property is required for class FileSchemaTestClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FileSchemaTestClass(file, files); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs index f6efe68bce5..84c8b8ea016 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Foo(string bar = "bar") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for Foo and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class Foo."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Foo(bar); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 39a182f0530..1924a97861d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FooGetDefaultResponse(Foo stringProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (stringProperty == null) - throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - StringProperty = stringProperty; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (stringProperty == null) + throw new ArgumentNullException(nameof(stringProperty), "Property is required for class FooGetDefaultResponse."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FooGetDefaultResponse(stringProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index 75c1a8e531b..5c0a53ed71a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -52,66 +52,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, uint unsignedInteger, ulong unsignedLong, Guid uuid) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (integer == null) - throw new ArgumentNullException("integer is a required property for FormatTest and cannot be null."); - - if (int32 == null) - throw new ArgumentNullException("int32 is a required property for FormatTest and cannot be null."); - - if (unsignedInteger == null) - throw new ArgumentNullException("unsignedInteger is a required property for FormatTest and cannot be null."); - - if (int64 == null) - throw new ArgumentNullException("int64 is a required property for FormatTest and cannot be null."); - - if (unsignedLong == null) - throw new ArgumentNullException("unsignedLong is a required property for FormatTest and cannot be null."); - - if (number == null) - throw new ArgumentNullException("number is a required property for FormatTest and cannot be null."); - - if (floatProperty == null) - throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null."); - - if (doubleProperty == null) - throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null."); - - if (decimalProperty == null) - throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null."); - - if (stringProperty == null) - throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null."); - - if (byteProperty == null) - throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null."); - - if (binary == null) - throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null."); - - if (date == null) - throw new ArgumentNullException("date is a required property for FormatTest and cannot be null."); - - if (dateTime == null) - throw new ArgumentNullException("dateTime is a required property for FormatTest and cannot be null."); - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for FormatTest and cannot be null."); - - if (password == null) - throw new ArgumentNullException("password is a required property for FormatTest and cannot be null."); - - if (patternWithDigits == null) - throw new ArgumentNullException("patternWithDigits is a required property for FormatTest and cannot be null."); - - if (patternWithDigitsAndDelimiter == null) - throw new ArgumentNullException("patternWithDigitsAndDelimiter is a required property for FormatTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Binary = binary; ByteProperty = byteProperty; Date = date; @@ -537,6 +477,66 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (integer == null) + throw new ArgumentNullException(nameof(integer), "Property is required for class FormatTest."); + + if (int32 == null) + throw new ArgumentNullException(nameof(int32), "Property is required for class FormatTest."); + + if (unsignedInteger == null) + throw new ArgumentNullException(nameof(unsignedInteger), "Property is required for class FormatTest."); + + if (int64 == null) + throw new ArgumentNullException(nameof(int64), "Property is required for class FormatTest."); + + if (unsignedLong == null) + throw new ArgumentNullException(nameof(unsignedLong), "Property is required for class FormatTest."); + + if (number == null) + throw new ArgumentNullException(nameof(number), "Property is required for class FormatTest."); + + if (floatProperty == null) + throw new ArgumentNullException(nameof(floatProperty), "Property is required for class FormatTest."); + + if (doubleProperty == null) + throw new ArgumentNullException(nameof(doubleProperty), "Property is required for class FormatTest."); + + if (decimalProperty == null) + throw new ArgumentNullException(nameof(decimalProperty), "Property is required for class FormatTest."); + + if (stringProperty == null) + throw new ArgumentNullException(nameof(stringProperty), "Property is required for class FormatTest."); + + if (byteProperty == null) + throw new ArgumentNullException(nameof(byteProperty), "Property is required for class FormatTest."); + + if (binary == null) + throw new ArgumentNullException(nameof(binary), "Property is required for class FormatTest."); + + if (date == null) + throw new ArgumentNullException(nameof(date), "Property is required for class FormatTest."); + + if (dateTime == null) + throw new ArgumentNullException(nameof(dateTime), "Property is required for class FormatTest."); + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class FormatTest."); + + if (password == null) + throw new ArgumentNullException(nameof(password), "Property is required for class FormatTest."); + + if (patternWithDigits == null) + throw new ArgumentNullException(nameof(patternWithDigits), "Property is required for class FormatTest."); + + if (patternWithDigitsAndDelimiter == null) + throw new ArgumentNullException(nameof(patternWithDigitsAndDelimiter), "Property is required for class FormatTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, unsignedInteger, unsignedLong, uuid); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs index 6d793581a27..98d483b16b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -36,15 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Apple apple, string color) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException(nameof(Color)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Apple = apple; Color = color; } @@ -57,15 +48,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Banana banana, string color) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException(nameof(Color)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Banana = banana; Color = color; } @@ -163,6 +145,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (appleDeserialized) return new Fruit(apple, color); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs index d1630926033..c3786405daa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public GmFruit(Apple apple, Banana banana, string color) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException("color is a required property for GmFruit and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Apple = Apple; Banana = Banana; Color = color; @@ -144,6 +135,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class GmFruit."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new GmFruit(apple, banana, color); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index d0ebffcd70c..090466a47a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public GrandparentAnimal(string petType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (petType == null) - throw new ArgumentNullException("petType is a required property for GrandparentAnimal and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - PetType = petType; } @@ -141,6 +132,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (petType == null) + throw new ArgumentNullException(nameof(petType), "Property is required for class GrandparentAnimal."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new GrandparentAnimal(petType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index ba5b4e850a0..71fe06569db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal HasOnlyReadOnly(string bar, string foo) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for HasOnlyReadOnly and cannot be null."); - - if (foo == null) - throw new ArgumentNullException("foo is a required property for HasOnlyReadOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; Foo = foo; } @@ -184,6 +172,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class HasOnlyReadOnly."); + + if (foo == null) + throw new ArgumentNullException(nameof(foo), "Property is required for class HasOnlyReadOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new HasOnlyReadOnly(bar, foo); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs index 0c52844f3df..7026233cc1d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public List(string _123list) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (_123list == null) - throw new ArgumentNullException("_123list is a required property for List and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - _123List = _123list; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (_123list == null) + throw new ArgumentNullException(nameof(_123list), "Property is required for class List."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new List(_123list); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs index 3982af38911..b19072ebd10 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs @@ -38,24 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public MapTest(Dictionary directMap, Dictionary indirectMap, Dictionary> mapMapOfString, Dictionary mapOfEnumString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mapMapOfString == null) - throw new ArgumentNullException("mapMapOfString is a required property for MapTest and cannot be null."); - - if (mapOfEnumString == null) - throw new ArgumentNullException("mapOfEnumString is a required property for MapTest and cannot be null."); - - if (directMap == null) - throw new ArgumentNullException("directMap is a required property for MapTest and cannot be null."); - - if (indirectMap == null) - throw new ArgumentNullException("indirectMap is a required property for MapTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DirectMap = directMap; IndirectMap = indirectMap; MapMapOfString = mapMapOfString; @@ -233,6 +215,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mapMapOfString == null) + throw new ArgumentNullException(nameof(mapMapOfString), "Property is required for class MapTest."); + + if (mapOfEnumString == null) + throw new ArgumentNullException(nameof(mapOfEnumString), "Property is required for class MapTest."); + + if (directMap == null) + throw new ArgumentNullException(nameof(directMap), "Property is required for class MapTest."); + + if (indirectMap == null) + throw new ArgumentNullException(nameof(indirectMap), "Property is required for class MapTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 86c4a36a075..090600eafa4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -38,24 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary map, Guid uuid, Guid uuidWithPattern) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (uuidWithPattern == null) - throw new ArgumentNullException("uuidWithPattern is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (dateTime == null) - throw new ArgumentNullException("dateTime is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (map == null) - throw new ArgumentNullException("map is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DateTime = dateTime; Map = map; Uuid = uuid; @@ -195,6 +177,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (uuidWithPattern == null) + throw new ArgumentNullException(nameof(uuidWithPattern), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (dateTime == null) + throw new ArgumentNullException(nameof(dateTime), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (map == null) + throw new ArgumentNullException(nameof(map), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid, uuidWithPattern); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs index 10458d40a8a..a868300ace6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Model200Response(string classProperty, int name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for Model200Response and cannot be null."); - - if (classProperty == null) - throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassProperty = classProperty; Name = name; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Model200Response."); + + if (classProperty == null) + throw new ArgumentNullException(nameof(classProperty), "Property is required for class Model200Response."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Model200Response(classProperty, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs index ba8b6196a1a..9f00e8ebd0f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ModelClient(string clientProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (clientProperty == null) - throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - _ClientProperty = clientProperty; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (clientProperty == null) + throw new ArgumentNullException(nameof(clientProperty), "Property is required for class ModelClient."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ModelClient(clientProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs index cbf6dc94808..73bae313bcd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs @@ -38,24 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Name(int nameProperty, string property, int snakeCase, int _123number) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (nameProperty == null) - throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null."); - - if (snakeCase == null) - throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null."); - - if (property == null) - throw new ArgumentNullException("property is a required property for Name and cannot be null."); - - if (_123number == null) - throw new ArgumentNullException("_123number is a required property for Name and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - NameProperty = nameProperty; Property = property; SnakeCase = snakeCase; @@ -219,6 +201,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (nameProperty == null) + throw new ArgumentNullException(nameof(nameProperty), "Property is required for class Name."); + + if (snakeCase == null) + throw new ArgumentNullException(nameof(snakeCase), "Property is required for class Name."); + + if (property == null) + throw new ArgumentNullException(nameof(property), "Property is required for class Name."); + + if (_123number == null) + throw new ArgumentNullException(nameof(_123number), "Property is required for class Name."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Name(nameProperty, property, snakeCase, _123number); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs index 4c5b50e7766..b8901c35e81 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -46,18 +46,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public NullableClass(List arrayItemsNullable, Dictionary objectItemsNullable, List arrayAndItemsNullableProp = default, List arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary objectAndItemsNullableProp = default, Dictionary objectNullableProp = default, string stringProp = default) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayItemsNullable == null) - throw new ArgumentNullException("arrayItemsNullable is a required property for NullableClass and cannot be null."); - - if (objectItemsNullable == null) - throw new ArgumentNullException("objectItemsNullable is a required property for NullableClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayItemsNullable = arrayItemsNullable; ObjectItemsNullable = objectItemsNullable; ArrayAndItemsNullableProp = arrayAndItemsNullableProp; @@ -292,6 +280,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayItemsNullable == null) + throw new ArgumentNullException(nameof(arrayItemsNullable), "Property is required for class NullableClass."); + + if (objectItemsNullable == null) + throw new ArgumentNullException(nameof(objectItemsNullable), "Property is required for class NullableClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs index f207e60d900..271cdaa329e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public NumberOnly(decimal justNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (justNumber == null) - throw new ArgumentNullException("justNumber is a required property for NumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - JustNumber = justNumber; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (justNumber == null) + throw new ArgumentNullException(nameof(justNumber), "Property is required for class NumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new NumberOnly(justNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 8fc287460d8..8213572e4d9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -38,24 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ObjectWithDeprecatedFields(List bars, DeprecatedObject deprecatedRef, decimal id, string uuid) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (id == null) - throw new ArgumentNullException("id is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (deprecatedRef == null) - throw new ArgumentNullException("deprecatedRef is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (bars == null) - throw new ArgumentNullException("bars is a required property for ObjectWithDeprecatedFields and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bars = bars; DeprecatedRef = deprecatedRef; Id = id; @@ -185,6 +167,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class ObjectWithDeprecatedFields."); + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class ObjectWithDeprecatedFields."); + + if (deprecatedRef == null) + throw new ArgumentNullException(nameof(deprecatedRef), "Property is required for class ObjectWithDeprecatedFields."); + + if (bars == null) + throw new ArgumentNullException(nameof(bars), "Property is required for class ObjectWithDeprecatedFields."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs index 8f05a735834..3947538474d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs @@ -40,30 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Order(long id, long petId, int quantity, DateTime shipDate, StatusEnum status, bool complete = false) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Order and cannot be null."); - - if (petId == null) - throw new ArgumentNullException("petId is a required property for Order and cannot be null."); - - if (quantity == null) - throw new ArgumentNullException("quantity is a required property for Order and cannot be null."); - - if (shipDate == null) - throw new ArgumentNullException("shipDate is a required property for Order and cannot be null."); - - if (status == null) - throw new ArgumentNullException("status is a required property for Order and cannot be null."); - - if (complete == null) - throw new ArgumentNullException("complete is a required property for Order and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; PetId = petId; Quantity = quantity; @@ -286,6 +262,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Order."); + + if (petId == null) + throw new ArgumentNullException(nameof(petId), "Property is required for class Order."); + + if (quantity == null) + throw new ArgumentNullException(nameof(quantity), "Property is required for class Order."); + + if (shipDate == null) + throw new ArgumentNullException(nameof(shipDate), "Property is required for class Order."); + + if (status == null) + throw new ArgumentNullException(nameof(status), "Property is required for class Order."); + + if (complete == null) + throw new ArgumentNullException(nameof(complete), "Property is required for class Order."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Order(id, petId, quantity, shipDate, status, complete); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 082d12576b0..502082fdc5b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -37,21 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public OuterComposite(bool myBoolean, decimal myNumber, string myString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (myNumber == null) - throw new ArgumentNullException("myNumber is a required property for OuterComposite and cannot be null."); - - if (myString == null) - throw new ArgumentNullException("myString is a required property for OuterComposite and cannot be null."); - - if (myBoolean == null) - throw new ArgumentNullException("myBoolean is a required property for OuterComposite and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - MyBoolean = myBoolean; MyNumber = myNumber; MyString = myString; @@ -165,6 +150,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (myNumber == null) + throw new ArgumentNullException(nameof(myNumber), "Property is required for class OuterComposite."); + + if (myString == null) + throw new ArgumentNullException(nameof(myString), "Property is required for class OuterComposite."); + + if (myBoolean == null) + throw new ArgumentNullException(nameof(myBoolean), "Property is required for class OuterComposite."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new OuterComposite(myBoolean, myNumber, myString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs index 75f3cb74c0d..cf7e9b68dc7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs @@ -40,30 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Pet(Category category, long id, string name, List photoUrls, StatusEnum status, List tags) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Pet and cannot be null."); - - if (category == null) - throw new ArgumentNullException("category is a required property for Pet and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Pet and cannot be null."); - - if (photoUrls == null) - throw new ArgumentNullException("photoUrls is a required property for Pet and cannot be null."); - - if (tags == null) - throw new ArgumentNullException("tags is a required property for Pet and cannot be null."); - - if (status == null) - throw new ArgumentNullException("status is a required property for Pet and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Category = category; Id = id; Name = name; @@ -280,6 +256,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Pet."); + + if (category == null) + throw new ArgumentNullException(nameof(category), "Property is required for class Pet."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Pet."); + + if (photoUrls == null) + throw new ArgumentNullException(nameof(photoUrls), "Property is required for class Pet."); + + if (tags == null) + throw new ArgumentNullException(nameof(tags), "Property is required for class Pet."); + + if (status == null) + throw new ArgumentNullException(nameof(status), "Property is required for class Pet."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Pet(category, id, name, photoUrls, status, tags); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index 73b448ebfaf..d1afcde6550 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public QuadrilateralInterface(string quadrilateralType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException("quadrilateralType is a required property for QuadrilateralInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - QuadrilateralType = quadrilateralType; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class QuadrilateralInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new QuadrilateralInterface(quadrilateralType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index a77197ed839..7279ed0e9ae 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ReadOnlyFirst(string bar, string baz) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for ReadOnlyFirst and cannot be null."); - - if (baz == null) - throw new ArgumentNullException("baz is a required property for ReadOnlyFirst and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; Baz = baz; } @@ -183,6 +171,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class ReadOnlyFirst."); + + if (baz == null) + throw new ArgumentNullException(nameof(baz), "Property is required for class ReadOnlyFirst."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ReadOnlyFirst(bar, baz); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs index 46050586d0c..bdec82a2f93 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Return(int returnProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (returnProperty == null) - throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ReturnProperty = returnProperty; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (returnProperty == null) + throw new ArgumentNullException(nameof(returnProperty), "Property is required for class Return."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Return(returnProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs index 2e29d505fd7..06578837b71 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs @@ -36,15 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Shape(Triangle triangle, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Triangle = triangle; QuadrilateralType = quadrilateralType; } @@ -57,15 +48,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Shape(Quadrilateral quadrilateral, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; } @@ -180,6 +162,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Shape."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (triangleDeserialized) return new Shape(triangle, quadrilateralType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs index c47f5d73c9a..caa324aacd4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeInterface(string shapeType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException("shapeType is a required property for ShapeInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ShapeType = shapeType; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ShapeInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ShapeInterface(shapeType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index a7de304d7c0..ccfb5800519 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -36,15 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeOrNull(Triangle triangle, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Triangle = triangle; QuadrilateralType = quadrilateralType; } @@ -57,15 +48,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; } @@ -180,6 +162,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ShapeOrNull."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (triangleDeserialized) return new ShapeOrNull(triangle, quadrilateralType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 454f652d615..66ec0c1d1f9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public SpecialModelName(string specialModelNameProperty, long specialPropertyName) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (specialPropertyName == null) - throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null."); - - if (specialModelNameProperty == null) - throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - SpecialModelNameProperty = specialModelNameProperty; SpecialPropertyName = specialPropertyName; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (specialPropertyName == null) + throw new ArgumentNullException(nameof(specialPropertyName), "Property is required for class SpecialModelName."); + + if (specialModelNameProperty == null) + throw new ArgumentNullException(nameof(specialModelNameProperty), "Property is required for class SpecialModelName."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new SpecialModelName(specialModelNameProperty, specialPropertyName); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs index 7c3ae06b5bd..7978d6c1a55 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Tag(long id, string name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Tag and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Tag and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; Name = name; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Tag."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Tag."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Tag(id, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs index 81884177e02..6abfb59ba99 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -37,18 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(EquilateralTriangle equilateralTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EquilateralTriangle = equilateralTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -63,18 +51,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(IsoscelesTriangle isoscelesTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - IsoscelesTriangle = isoscelesTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -89,18 +65,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(ScaleneTriangle scaleneTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ScaleneTriangle = scaleneTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -235,6 +199,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class Triangle."); + + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class Triangle."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (equilateralTriangleDeserialized) return new Triangle(equilateralTriangle, shapeType, triangleType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs index ddb4e8de495..f44b2b08854 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public TriangleInterface(string triangleType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (triangleType == null) - throw new ArgumentNullException("triangleType is a required property for TriangleInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - TriangleType = triangleType; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class TriangleInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new TriangleInterface(triangleType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs index 69346fa0294..72c193106d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs @@ -46,39 +46,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object anyTypeProp = default, Object anyTypePropNullable = default, Object objectWithNoDeclaredPropsNullable = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for User and cannot be null."); - - if (username == null) - throw new ArgumentNullException("username is a required property for User and cannot be null."); - - if (firstName == null) - throw new ArgumentNullException("firstName is a required property for User and cannot be null."); - - if (lastName == null) - throw new ArgumentNullException("lastName is a required property for User and cannot be null."); - - if (email == null) - throw new ArgumentNullException("email is a required property for User and cannot be null."); - - if (password == null) - throw new ArgumentNullException("password is a required property for User and cannot be null."); - - if (phone == null) - throw new ArgumentNullException("phone is a required property for User and cannot be null."); - - if (userStatus == null) - throw new ArgumentNullException("userStatus is a required property for User and cannot be null."); - - if (objectWithNoDeclaredProps == null) - throw new ArgumentNullException("objectWithNoDeclaredProps is a required property for User and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Email = email; FirstName = firstName; Id = id; @@ -309,6 +276,39 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class User."); + + if (username == null) + throw new ArgumentNullException(nameof(username), "Property is required for class User."); + + if (firstName == null) + throw new ArgumentNullException(nameof(firstName), "Property is required for class User."); + + if (lastName == null) + throw new ArgumentNullException(nameof(lastName), "Property is required for class User."); + + if (email == null) + throw new ArgumentNullException(nameof(email), "Property is required for class User."); + + if (password == null) + throw new ArgumentNullException(nameof(password), "Property is required for class User."); + + if (phone == null) + throw new ArgumentNullException(nameof(phone), "Property is required for class User."); + + if (userStatus == null) + throw new ArgumentNullException(nameof(userStatus), "Property is required for class User."); + + if (objectWithNoDeclaredProps == null) + throw new ArgumentNullException(nameof(objectWithNoDeclaredProps), "Property is required for class User."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs index 33a71620e48..8c9df6a8fe2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs @@ -37,21 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Whale(string className, bool hasBaleen, bool hasTeeth) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (hasBaleen == null) - throw new ArgumentNullException("hasBaleen is a required property for Whale and cannot be null."); - - if (hasTeeth == null) - throw new ArgumentNullException("hasTeeth is a required property for Whale and cannot be null."); - - if (className == null) - throw new ArgumentNullException("className is a required property for Whale and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; HasBaleen = hasBaleen; HasTeeth = hasTeeth; @@ -165,6 +150,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (hasBaleen == null) + throw new ArgumentNullException(nameof(hasBaleen), "Property is required for class Whale."); + + if (hasTeeth == null) + throw new ArgumentNullException(nameof(hasTeeth), "Property is required for class Whale."); + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Whale."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Whale(className, hasBaleen, hasTeeth); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs index 3df8c300ab6..3523212644c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Zebra(string className, TypeEnum type) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (type == null) - throw new ArgumentNullException("type is a required property for Zebra and cannot be null."); - - if (className == null) - throw new ArgumentNullException("className is a required property for Zebra and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; Type = type; } @@ -210,6 +198,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (type == null) + throw new ArgumentNullException(nameof(type), "Property is required for class Zebra."); + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Zebra."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Zebra(className, type); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs index 21c383f25f8..6a8399a9f7e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public AdultAllOf(List children) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (children == null) - throw new ArgumentNullException("children is a required property for AdultAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Children = children; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (children == null) + throw new ArgumentNullException(nameof(children), "Property is required for class AdultAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new AdultAllOf(children); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs index 4c287bde61e..f49a9fb004a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs @@ -41,15 +41,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Child(ChildAllOf childAllOf, bool boosterSeat, string firstName, string lastName, string type) : base(firstName, lastName, type) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (boosterSeat == null) - throw new ArgumentNullException("boosterSeat is a required property for Child and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ChildAllOf = childAllOf; BoosterSeat = boosterSeat; } @@ -144,6 +135,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (boosterSeat == null) + throw new ArgumentNullException(nameof(boosterSeat), "Property is required for class Child."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Child(childAllOf, boosterSeat, firstName, lastName, type); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs index 2a5e437e8fe..c7a6bef63fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ChildAllOf(int age) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (age == null) - throw new ArgumentNullException("age is a required property for ChildAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Age = age; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (age == null) + throw new ArgumentNullException(nameof(age), "Property is required for class ChildAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ChildAllOf(age); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs index f525ba4905b..428b89644b8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs @@ -39,21 +39,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Person(string firstName, string lastName, string type) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (type == null) - throw new ArgumentNullException("type is a required property for Person and cannot be null."); - - if (lastName == null) - throw new ArgumentNullException("lastName is a required property for Person and cannot be null."); - - if (firstName == null) - throw new ArgumentNullException("firstName is a required property for Person and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - FirstName = firstName; LastName = lastName; Type = type; @@ -175,6 +160,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (type == null) + throw new ArgumentNullException(nameof(type), "Property is required for class Person."); + + if (lastName == null) + throw new ArgumentNullException(nameof(lastName), "Property is required for class Person."); + + if (firstName == null) + throw new ArgumentNullException(nameof(firstName), "Property is required for class Person."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Person(firstName, lastName, type); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs index 61139920357..c057e1b9620 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Apple(string kind) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (kind == null) - throw new ArgumentNullException("kind is a required property for Apple and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Kind = kind; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (kind == null) + throw new ArgumentNullException(nameof(kind), "Property is required for class Apple."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Apple(kind); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs index ab60fea69c8..e8dd6a5192a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Banana(decimal count) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (count == null) - throw new ArgumentNullException("count is a required property for Banana and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Count = count; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (count == null) + throw new ArgumentNullException(nameof(count), "Property is required for class Banana."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Banana(count); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs index 89bff040eaf..19a07cfd5c4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -39,15 +39,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Apple apple, Banana banana, string color) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException("color is a required property for Fruit and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Apple = Apple; Banana = Banana; Color = color; @@ -153,6 +144,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Fruit(apple, banana, color); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs index 61139920357..c057e1b9620 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Apple(string kind) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (kind == null) - throw new ArgumentNullException("kind is a required property for Apple and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Kind = kind; } @@ -133,6 +124,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (kind == null) + throw new ArgumentNullException(nameof(kind), "Property is required for class Apple."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Apple(kind); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs index ab60fea69c8..e8dd6a5192a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Banana(decimal count) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (count == null) - throw new ArgumentNullException("count is a required property for Banana and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Count = count; } @@ -134,6 +125,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (count == null) + throw new ArgumentNullException(nameof(count), "Property is required for class Banana."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Banana(count); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs index 3b1813b31e1..a579b15d1fa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -38,15 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Apple apple, string color) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException(nameof(Color)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Apple = apple; Color = color; } @@ -59,15 +50,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Banana banana, string color) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException(nameof(Color)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Banana = banana; Color = color; } @@ -172,6 +154,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (appleDeserialized) return new Fruit(apple, color); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs index 2ee79b7ba3b..f1c04211b9d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Activity(Dictionary> activityOutputs) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (activityOutputs == null) - throw new ArgumentNullException("activityOutputs is a required property for Activity and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ActivityOutputs = activityOutputs; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (activityOutputs == null) + throw new ArgumentNullException(nameof(activityOutputs), "Property is required for class Activity."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Activity(activityOutputs); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 46998f231ec..961f370130f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ActivityOutputElementRepresentation(string prop1, Object prop2) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (prop1 == null) - throw new ArgumentNullException("prop1 is a required property for ActivityOutputElementRepresentation and cannot be null."); - - if (prop2 == null) - throw new ArgumentNullException("prop2 is a required property for ActivityOutputElementRepresentation and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Prop1 = prop1; Prop2 = prop2; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (prop1 == null) + throw new ArgumentNullException(nameof(prop1), "Property is required for class ActivityOutputElementRepresentation."); + + if (prop2 == null) + throw new ArgumentNullException(nameof(prop2), "Property is required for class ActivityOutputElementRepresentation."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ActivityOutputElementRepresentation(prop1, prop2); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 141b010799e..41ebb7e8a39 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -42,33 +42,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public AdditionalPropertiesClass(Object emptyMap, Dictionary> mapOfMapProperty, Dictionary mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary mapWithUndeclaredPropertiesAnytype3, Dictionary mapWithUndeclaredPropertiesString, Object anytype1 = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mapProperty == null) - throw new ArgumentNullException("mapProperty is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapOfMapProperty == null) - throw new ArgumentNullException("mapOfMapProperty is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype1 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype1 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype2 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype2 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesAnytype3 == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesAnytype3 is a required property for AdditionalPropertiesClass and cannot be null."); - - if (emptyMap == null) - throw new ArgumentNullException("emptyMap is a required property for AdditionalPropertiesClass and cannot be null."); - - if (mapWithUndeclaredPropertiesString == null) - throw new ArgumentNullException("mapWithUndeclaredPropertiesString is a required property for AdditionalPropertiesClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EmptyMap = emptyMap; MapOfMapProperty = mapOfMapProperty; MapProperty = mapProperty; @@ -249,6 +222,33 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mapProperty == null) + throw new ArgumentNullException(nameof(mapProperty), "Property is required for class AdditionalPropertiesClass."); + + if (mapOfMapProperty == null) + throw new ArgumentNullException(nameof(mapOfMapProperty), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype1 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype1), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype2 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype2), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesAnytype3 == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesAnytype3), "Property is required for class AdditionalPropertiesClass."); + + if (emptyMap == null) + throw new ArgumentNullException(nameof(emptyMap), "Property is required for class AdditionalPropertiesClass."); + + if (mapWithUndeclaredPropertiesString == null) + throw new ArgumentNullException(nameof(mapWithUndeclaredPropertiesString), "Property is required for class AdditionalPropertiesClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs index a8e6d39ce5f..830bec45669 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Animal(string className, string color = "red") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for Animal and cannot be null."); - - if (color == null) - throw new ArgumentNullException("color is a required property for Animal and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; Color = color; } @@ -157,6 +145,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Animal."); + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class Animal."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Animal(className, color); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs index efd488d07b9..12c5484c2ff 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -37,21 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ApiResponse(int code, string message, string type) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (code == null) - throw new ArgumentNullException("code is a required property for ApiResponse and cannot be null."); - - if (type == null) - throw new ArgumentNullException("type is a required property for ApiResponse and cannot be null."); - - if (message == null) - throw new ArgumentNullException("message is a required property for ApiResponse and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Code = code; Message = message; Type = type; @@ -164,6 +149,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (code == null) + throw new ArgumentNullException(nameof(code), "Property is required for class ApiResponse."); + + if (type == null) + throw new ArgumentNullException(nameof(type), "Property is required for class ApiResponse."); + + if (message == null) + throw new ArgumentNullException(nameof(message), "Property is required for class ApiResponse."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ApiResponse(code, message, type); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs index a792416f2ae..7282462348f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Apple(string cultivar, string origin) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (cultivar == null) - throw new ArgumentNullException("cultivar is a required property for Apple and cannot be null."); - - if (origin == null) - throw new ArgumentNullException("origin is a required property for Apple and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Cultivar = cultivar; Origin = origin; } @@ -161,6 +149,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (cultivar == null) + throw new ArgumentNullException(nameof(cultivar), "Property is required for class Apple."); + + if (origin == null) + throw new ArgumentNullException(nameof(origin), "Property is required for class Apple."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Apple(cultivar, origin); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs index eec8d8b0cfe..fbfcd9efaf1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public AppleReq(string cultivar, bool mealy) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (cultivar == null) - throw new ArgumentNullException("cultivar is a required property for AppleReq and cannot be null."); - - if (mealy == null) - throw new ArgumentNullException("mealy is a required property for AppleReq and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Cultivar = cultivar; Mealy = mealy; } @@ -141,6 +129,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (cultivar == null) + throw new ArgumentNullException(nameof(cultivar), "Property is required for class AppleReq."); + + if (mealy == null) + throw new ArgumentNullException(nameof(mealy), "Property is required for class AppleReq."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new AppleReq(cultivar, mealy); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 47f7b46aa5f..a6e92aaf78e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayOfArrayOfNumberOnly(List> arrayArrayNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayArrayNumber == null) - throw new ArgumentNullException("arrayArrayNumber is a required property for ArrayOfArrayOfNumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayArrayNumber = arrayArrayNumber; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayArrayNumber == null) + throw new ArgumentNullException(nameof(arrayArrayNumber), "Property is required for class ArrayOfArrayOfNumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayOfArrayOfNumberOnly(arrayArrayNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 08732c44004..1f8c17cac78 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayOfNumberOnly(List arrayNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayNumber == null) - throw new ArgumentNullException("arrayNumber is a required property for ArrayOfNumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayNumber = arrayNumber; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayNumber == null) + throw new ArgumentNullException(nameof(arrayNumber), "Property is required for class ArrayOfNumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayOfNumberOnly(arrayNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs index eaaa692fd01..85e928be6d1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -37,21 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ArrayTest(List> arrayArrayOfInteger, List> arrayArrayOfModel, List arrayOfString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayOfString == null) - throw new ArgumentNullException("arrayOfString is a required property for ArrayTest and cannot be null."); - - if (arrayArrayOfInteger == null) - throw new ArgumentNullException("arrayArrayOfInteger is a required property for ArrayTest and cannot be null."); - - if (arrayArrayOfModel == null) - throw new ArgumentNullException("arrayArrayOfModel is a required property for ArrayTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayArrayOfInteger = arrayArrayOfInteger; ArrayArrayOfModel = arrayArrayOfModel; ArrayOfString = arrayOfString; @@ -166,6 +151,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayOfString == null) + throw new ArgumentNullException(nameof(arrayOfString), "Property is required for class ArrayTest."); + + if (arrayArrayOfInteger == null) + throw new ArgumentNullException(nameof(arrayArrayOfInteger), "Property is required for class ArrayTest."); + + if (arrayArrayOfModel == null) + throw new ArgumentNullException(nameof(arrayArrayOfModel), "Property is required for class ArrayTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs index 1c8f4a7a912..a60328badff 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Banana(decimal lengthCm) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (lengthCm == null) - throw new ArgumentNullException("lengthCm is a required property for Banana and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - LengthCm = lengthCm; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (lengthCm == null) + throw new ArgumentNullException(nameof(lengthCm), "Property is required for class Banana."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Banana(lengthCm); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs index 014f8534eca..aa109bf1e8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public BananaReq(decimal lengthCm, bool sweet) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (lengthCm == null) - throw new ArgumentNullException("lengthCm is a required property for BananaReq and cannot be null."); - - if (sweet == null) - throw new ArgumentNullException("sweet is a required property for BananaReq and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - LengthCm = lengthCm; Sweet = sweet; } @@ -142,6 +130,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (lengthCm == null) + throw new ArgumentNullException(nameof(lengthCm), "Property is required for class BananaReq."); + + if (sweet == null) + throw new ArgumentNullException(nameof(sweet), "Property is required for class BananaReq."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new BananaReq(lengthCm, sweet); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs index f74cda1d968..08f9a36fe77 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public BasquePig(string className) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for BasquePig and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class BasquePig."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new BasquePig(className); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs index 89cb785431b..ef305b42a8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs @@ -40,30 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (smallCamel == null) - throw new ArgumentNullException("smallCamel is a required property for Capitalization and cannot be null."); - - if (capitalCamel == null) - throw new ArgumentNullException("capitalCamel is a required property for Capitalization and cannot be null."); - - if (smallSnake == null) - throw new ArgumentNullException("smallSnake is a required property for Capitalization and cannot be null."); - - if (capitalSnake == null) - throw new ArgumentNullException("capitalSnake is a required property for Capitalization and cannot be null."); - - if (sCAETHFlowPoints == null) - throw new ArgumentNullException("sCAETHFlowPoints is a required property for Capitalization and cannot be null."); - - if (aTTNAME == null) - throw new ArgumentNullException("aTTNAME is a required property for Capitalization and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ATT_NAME = aTTNAME; CapitalCamel = capitalCamel; CapitalSnake = capitalSnake; @@ -212,6 +188,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (smallCamel == null) + throw new ArgumentNullException(nameof(smallCamel), "Property is required for class Capitalization."); + + if (capitalCamel == null) + throw new ArgumentNullException(nameof(capitalCamel), "Property is required for class Capitalization."); + + if (smallSnake == null) + throw new ArgumentNullException(nameof(smallSnake), "Property is required for class Capitalization."); + + if (capitalSnake == null) + throw new ArgumentNullException(nameof(capitalSnake), "Property is required for class Capitalization."); + + if (sCAETHFlowPoints == null) + throw new ArgumentNullException(nameof(sCAETHFlowPoints), "Property is required for class Capitalization."); + + if (aTTNAME == null) + throw new ArgumentNullException(nameof(aTTNAME), "Property is required for class Capitalization."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs index 30b468956aa..09e87f9513d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public CatAllOf(bool declawed) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (declawed == null) - throw new ArgumentNullException("declawed is a required property for CatAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Declawed = declawed; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (declawed == null) + throw new ArgumentNullException(nameof(declawed), "Property is required for class CatAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new CatAllOf(declawed); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs index bbb05a49ad4..b8e0407d843 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Category(long id, string name = "default-name") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Category and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Category and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; Name = name; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Category."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Category."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Category(id, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index a56a226acfa..6f3308eb346 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ChildCatAllOf(string name, PetTypeEnum petType = PetTypeEnum.ChildCat) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for ChildCatAllOf and cannot be null."); - - if (petType == null) - throw new ArgumentNullException("petType is a required property for ChildCatAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Name = name; PetType = petType; } @@ -187,6 +175,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class ChildCatAllOf."); + + if (petType == null) + throw new ArgumentNullException(nameof(petType), "Property is required for class ChildCatAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ChildCatAllOf(name, petType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs index 932a529ec61..8b8b59299ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ClassModel(string classProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (classProperty == null) - throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassProperty = classProperty; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (classProperty == null) + throw new ArgumentNullException(nameof(classProperty), "Property is required for class ClassModel."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ClassModel(classProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs index 4dad6503d21..34d5e4a5688 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DanishPig(string className) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (className == null) - throw new ArgumentNullException("className is a required property for DanishPig and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class DanishPig."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DanishPig(className); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 0b71684d282..9564eba0df5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DateOnlyClass(DateTime dateOnlyProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (dateOnlyProperty == null) - throw new ArgumentNullException("dateOnlyProperty is a required property for DateOnlyClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DateOnlyProperty = dateOnlyProperty; } @@ -138,6 +129,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (dateOnlyProperty == null) + throw new ArgumentNullException(nameof(dateOnlyProperty), "Property is required for class DateOnlyClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DateOnlyClass(dateOnlyProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 908406d3bf6..b6ed51029a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DeprecatedObject(string name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for DeprecatedObject and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Name = name; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class DeprecatedObject."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DeprecatedObject(name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs index 171b69d1e1c..c31bd1d9d68 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public DogAllOf(string breed) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (breed == null) - throw new ArgumentNullException("breed is a required property for DogAllOf and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Breed = breed; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (breed == null) + throw new ArgumentNullException(nameof(breed), "Property is required for class DogAllOf."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new DogAllOf(breed); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs index 372a5816a6d..5767c9f5e53 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs @@ -38,21 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List shapes, NullableShape nullableShape = default) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mainShape == null) - throw new ArgumentNullException("mainShape is a required property for Drawing and cannot be null."); - - if (shapeOrNull == null) - throw new ArgumentNullException("shapeOrNull is a required property for Drawing and cannot be null."); - - if (shapes == null) - throw new ArgumentNullException("shapes is a required property for Drawing and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - MainShape = mainShape; ShapeOrNull = shapeOrNull; Shapes = shapes; @@ -174,6 +159,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mainShape == null) + throw new ArgumentNullException(nameof(mainShape), "Property is required for class Drawing."); + + if (shapeOrNull == null) + throw new ArgumentNullException(nameof(shapeOrNull), "Property is required for class Drawing."); + + if (shapes == null) + throw new ArgumentNullException(nameof(shapes), "Property is required for class Drawing."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Drawing(mainShape, shapeOrNull, shapes, nullableShape); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 29be901e753..3372d66ab2a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public EnumArrays(List arrayEnum, JustSymbolEnum justSymbol) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (justSymbol == null) - throw new ArgumentNullException("justSymbol is a required property for EnumArrays and cannot be null."); - - if (arrayEnum == null) - throw new ArgumentNullException("arrayEnum is a required property for EnumArrays and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayEnum = arrayEnum; JustSymbol = justSymbol; } @@ -249,6 +237,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (justSymbol == null) + throw new ArgumentNullException(nameof(justSymbol), "Property is required for class EnumArrays."); + + if (arrayEnum == null) + throw new ArgumentNullException(nameof(arrayEnum), "Property is required for class EnumArrays."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new EnumArrays(arrayEnum, justSymbol); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs index 2cf78a5fb13..ccc7a9a7a2f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -43,36 +43,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (enumString == null) - throw new ArgumentNullException("enumString is a required property for EnumTest and cannot be null."); - - if (enumStringRequired == null) - throw new ArgumentNullException("enumStringRequired is a required property for EnumTest and cannot be null."); - - if (enumInteger == null) - throw new ArgumentNullException("enumInteger is a required property for EnumTest and cannot be null."); - - if (enumIntegerOnly == null) - throw new ArgumentNullException("enumIntegerOnly is a required property for EnumTest and cannot be null."); - - if (enumNumber == null) - throw new ArgumentNullException("enumNumber is a required property for EnumTest and cannot be null."); - - if (outerEnumInteger == null) - throw new ArgumentNullException("outerEnumInteger is a required property for EnumTest and cannot be null."); - - if (outerEnumDefaultValue == null) - throw new ArgumentNullException("outerEnumDefaultValue is a required property for EnumTest and cannot be null."); - - if (outerEnumIntegerDefaultValue == null) - throw new ArgumentNullException("outerEnumIntegerDefaultValue is a required property for EnumTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EnumInteger = enumInteger; EnumIntegerOnly = enumIntegerOnly; EnumNumber = enumNumber; @@ -525,6 +495,36 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (enumString == null) + throw new ArgumentNullException(nameof(enumString), "Property is required for class EnumTest."); + + if (enumStringRequired == null) + throw new ArgumentNullException(nameof(enumStringRequired), "Property is required for class EnumTest."); + + if (enumInteger == null) + throw new ArgumentNullException(nameof(enumInteger), "Property is required for class EnumTest."); + + if (enumIntegerOnly == null) + throw new ArgumentNullException(nameof(enumIntegerOnly), "Property is required for class EnumTest."); + + if (enumNumber == null) + throw new ArgumentNullException(nameof(enumNumber), "Property is required for class EnumTest."); + + if (outerEnumInteger == null) + throw new ArgumentNullException(nameof(outerEnumInteger), "Property is required for class EnumTest."); + + if (outerEnumDefaultValue == null) + throw new ArgumentNullException(nameof(outerEnumDefaultValue), "Property is required for class EnumTest."); + + if (outerEnumIntegerDefaultValue == null) + throw new ArgumentNullException(nameof(outerEnumIntegerDefaultValue), "Property is required for class EnumTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs index 7997aa35771..5192d0685c9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public File(string sourceURI) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (sourceURI == null) - throw new ArgumentNullException("sourceURI is a required property for File and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - SourceURI = sourceURI; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (sourceURI == null) + throw new ArgumentNullException(nameof(sourceURI), "Property is required for class File."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new File(sourceURI); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 4b3824ae2b5..8c19ca974b7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FileSchemaTestClass(File file, List files) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (file == null) - throw new ArgumentNullException("file is a required property for FileSchemaTestClass and cannot be null."); - - if (files == null) - throw new ArgumentNullException("files is a required property for FileSchemaTestClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - File = file; Files = files; } @@ -149,6 +137,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (file == null) + throw new ArgumentNullException(nameof(file), "Property is required for class FileSchemaTestClass."); + + if (files == null) + throw new ArgumentNullException(nameof(files), "Property is required for class FileSchemaTestClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FileSchemaTestClass(file, files); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs index f6efe68bce5..84c8b8ea016 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Foo(string bar = "bar") { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for Foo and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class Foo."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Foo(bar); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 39a182f0530..1924a97861d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FooGetDefaultResponse(Foo stringProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (stringProperty == null) - throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - StringProperty = stringProperty; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (stringProperty == null) + throw new ArgumentNullException(nameof(stringProperty), "Property is required for class FooGetDefaultResponse."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FooGetDefaultResponse(stringProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index 75c1a8e531b..5c0a53ed71a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -52,66 +52,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, uint unsignedInteger, ulong unsignedLong, Guid uuid) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (integer == null) - throw new ArgumentNullException("integer is a required property for FormatTest and cannot be null."); - - if (int32 == null) - throw new ArgumentNullException("int32 is a required property for FormatTest and cannot be null."); - - if (unsignedInteger == null) - throw new ArgumentNullException("unsignedInteger is a required property for FormatTest and cannot be null."); - - if (int64 == null) - throw new ArgumentNullException("int64 is a required property for FormatTest and cannot be null."); - - if (unsignedLong == null) - throw new ArgumentNullException("unsignedLong is a required property for FormatTest and cannot be null."); - - if (number == null) - throw new ArgumentNullException("number is a required property for FormatTest and cannot be null."); - - if (floatProperty == null) - throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null."); - - if (doubleProperty == null) - throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null."); - - if (decimalProperty == null) - throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null."); - - if (stringProperty == null) - throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null."); - - if (byteProperty == null) - throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null."); - - if (binary == null) - throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null."); - - if (date == null) - throw new ArgumentNullException("date is a required property for FormatTest and cannot be null."); - - if (dateTime == null) - throw new ArgumentNullException("dateTime is a required property for FormatTest and cannot be null."); - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for FormatTest and cannot be null."); - - if (password == null) - throw new ArgumentNullException("password is a required property for FormatTest and cannot be null."); - - if (patternWithDigits == null) - throw new ArgumentNullException("patternWithDigits is a required property for FormatTest and cannot be null."); - - if (patternWithDigitsAndDelimiter == null) - throw new ArgumentNullException("patternWithDigitsAndDelimiter is a required property for FormatTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Binary = binary; ByteProperty = byteProperty; Date = date; @@ -537,6 +477,66 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (integer == null) + throw new ArgumentNullException(nameof(integer), "Property is required for class FormatTest."); + + if (int32 == null) + throw new ArgumentNullException(nameof(int32), "Property is required for class FormatTest."); + + if (unsignedInteger == null) + throw new ArgumentNullException(nameof(unsignedInteger), "Property is required for class FormatTest."); + + if (int64 == null) + throw new ArgumentNullException(nameof(int64), "Property is required for class FormatTest."); + + if (unsignedLong == null) + throw new ArgumentNullException(nameof(unsignedLong), "Property is required for class FormatTest."); + + if (number == null) + throw new ArgumentNullException(nameof(number), "Property is required for class FormatTest."); + + if (floatProperty == null) + throw new ArgumentNullException(nameof(floatProperty), "Property is required for class FormatTest."); + + if (doubleProperty == null) + throw new ArgumentNullException(nameof(doubleProperty), "Property is required for class FormatTest."); + + if (decimalProperty == null) + throw new ArgumentNullException(nameof(decimalProperty), "Property is required for class FormatTest."); + + if (stringProperty == null) + throw new ArgumentNullException(nameof(stringProperty), "Property is required for class FormatTest."); + + if (byteProperty == null) + throw new ArgumentNullException(nameof(byteProperty), "Property is required for class FormatTest."); + + if (binary == null) + throw new ArgumentNullException(nameof(binary), "Property is required for class FormatTest."); + + if (date == null) + throw new ArgumentNullException(nameof(date), "Property is required for class FormatTest."); + + if (dateTime == null) + throw new ArgumentNullException(nameof(dateTime), "Property is required for class FormatTest."); + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class FormatTest."); + + if (password == null) + throw new ArgumentNullException(nameof(password), "Property is required for class FormatTest."); + + if (patternWithDigits == null) + throw new ArgumentNullException(nameof(patternWithDigits), "Property is required for class FormatTest."); + + if (patternWithDigitsAndDelimiter == null) + throw new ArgumentNullException(nameof(patternWithDigitsAndDelimiter), "Property is required for class FormatTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, unsignedInteger, unsignedLong, uuid); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs index 6d793581a27..98d483b16b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -36,15 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Apple apple, string color) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException(nameof(Color)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Apple = apple; Color = color; } @@ -57,15 +48,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Fruit(Banana banana, string color) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException(nameof(Color)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Banana = banana; Color = color; } @@ -163,6 +145,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class Fruit."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (appleDeserialized) return new Fruit(apple, color); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs index d1630926033..c3786405daa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -37,15 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public GmFruit(Apple apple, Banana banana, string color) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (color == null) - throw new ArgumentNullException("color is a required property for GmFruit and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Apple = Apple; Banana = Banana; Color = color; @@ -144,6 +135,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (color == null) + throw new ArgumentNullException(nameof(color), "Property is required for class GmFruit."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new GmFruit(apple, banana, color); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index d0ebffcd70c..090466a47a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public GrandparentAnimal(string petType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (petType == null) - throw new ArgumentNullException("petType is a required property for GrandparentAnimal and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - PetType = petType; } @@ -141,6 +132,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (petType == null) + throw new ArgumentNullException(nameof(petType), "Property is required for class GrandparentAnimal."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new GrandparentAnimal(petType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index ba5b4e850a0..71fe06569db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] internal HasOnlyReadOnly(string bar, string foo) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for HasOnlyReadOnly and cannot be null."); - - if (foo == null) - throw new ArgumentNullException("foo is a required property for HasOnlyReadOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; Foo = foo; } @@ -184,6 +172,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class HasOnlyReadOnly."); + + if (foo == null) + throw new ArgumentNullException(nameof(foo), "Property is required for class HasOnlyReadOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new HasOnlyReadOnly(bar, foo); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs index 0c52844f3df..7026233cc1d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public List(string _123list) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (_123list == null) - throw new ArgumentNullException("_123list is a required property for List and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - _123List = _123list; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (_123list == null) + throw new ArgumentNullException(nameof(_123list), "Property is required for class List."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new List(_123list); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs index 3982af38911..b19072ebd10 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs @@ -38,24 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public MapTest(Dictionary directMap, Dictionary indirectMap, Dictionary> mapMapOfString, Dictionary mapOfEnumString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (mapMapOfString == null) - throw new ArgumentNullException("mapMapOfString is a required property for MapTest and cannot be null."); - - if (mapOfEnumString == null) - throw new ArgumentNullException("mapOfEnumString is a required property for MapTest and cannot be null."); - - if (directMap == null) - throw new ArgumentNullException("directMap is a required property for MapTest and cannot be null."); - - if (indirectMap == null) - throw new ArgumentNullException("indirectMap is a required property for MapTest and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DirectMap = directMap; IndirectMap = indirectMap; MapMapOfString = mapMapOfString; @@ -233,6 +215,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (mapMapOfString == null) + throw new ArgumentNullException(nameof(mapMapOfString), "Property is required for class MapTest."); + + if (mapOfEnumString == null) + throw new ArgumentNullException(nameof(mapOfEnumString), "Property is required for class MapTest."); + + if (directMap == null) + throw new ArgumentNullException(nameof(directMap), "Property is required for class MapTest."); + + if (indirectMap == null) + throw new ArgumentNullException(nameof(indirectMap), "Property is required for class MapTest."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 86c4a36a075..090600eafa4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -38,24 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary map, Guid uuid, Guid uuidWithPattern) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (uuidWithPattern == null) - throw new ArgumentNullException("uuidWithPattern is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (dateTime == null) - throw new ArgumentNullException("dateTime is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - - if (map == null) - throw new ArgumentNullException("map is a required property for MixedPropertiesAndAdditionalPropertiesClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - DateTime = dateTime; Map = map; Uuid = uuid; @@ -195,6 +177,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (uuidWithPattern == null) + throw new ArgumentNullException(nameof(uuidWithPattern), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (dateTime == null) + throw new ArgumentNullException(nameof(dateTime), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + + if (map == null) + throw new ArgumentNullException(nameof(map), "Property is required for class MixedPropertiesAndAdditionalPropertiesClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid, uuidWithPattern); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs index 10458d40a8a..a868300ace6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Model200Response(string classProperty, int name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (name == null) - throw new ArgumentNullException("name is a required property for Model200Response and cannot be null."); - - if (classProperty == null) - throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassProperty = classProperty; Name = name; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Model200Response."); + + if (classProperty == null) + throw new ArgumentNullException(nameof(classProperty), "Property is required for class Model200Response."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Model200Response(classProperty, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs index ba8b6196a1a..9f00e8ebd0f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ModelClient(string clientProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (clientProperty == null) - throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - _ClientProperty = clientProperty; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (clientProperty == null) + throw new ArgumentNullException(nameof(clientProperty), "Property is required for class ModelClient."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ModelClient(clientProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs index cbf6dc94808..73bae313bcd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs @@ -38,24 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Name(int nameProperty, string property, int snakeCase, int _123number) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (nameProperty == null) - throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null."); - - if (snakeCase == null) - throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null."); - - if (property == null) - throw new ArgumentNullException("property is a required property for Name and cannot be null."); - - if (_123number == null) - throw new ArgumentNullException("_123number is a required property for Name and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - NameProperty = nameProperty; Property = property; SnakeCase = snakeCase; @@ -219,6 +201,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (nameProperty == null) + throw new ArgumentNullException(nameof(nameProperty), "Property is required for class Name."); + + if (snakeCase == null) + throw new ArgumentNullException(nameof(snakeCase), "Property is required for class Name."); + + if (property == null) + throw new ArgumentNullException(nameof(property), "Property is required for class Name."); + + if (_123number == null) + throw new ArgumentNullException(nameof(_123number), "Property is required for class Name."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Name(nameProperty, property, snakeCase, _123number); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs index 4c5b50e7766..b8901c35e81 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -46,18 +46,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public NullableClass(List arrayItemsNullable, Dictionary objectItemsNullable, List arrayAndItemsNullableProp = default, List arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary objectAndItemsNullableProp = default, Dictionary objectNullableProp = default, string stringProp = default) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (arrayItemsNullable == null) - throw new ArgumentNullException("arrayItemsNullable is a required property for NullableClass and cannot be null."); - - if (objectItemsNullable == null) - throw new ArgumentNullException("objectItemsNullable is a required property for NullableClass and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ArrayItemsNullable = arrayItemsNullable; ObjectItemsNullable = objectItemsNullable; ArrayAndItemsNullableProp = arrayAndItemsNullableProp; @@ -292,6 +280,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (arrayItemsNullable == null) + throw new ArgumentNullException(nameof(arrayItemsNullable), "Property is required for class NullableClass."); + + if (objectItemsNullable == null) + throw new ArgumentNullException(nameof(objectItemsNullable), "Property is required for class NullableClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs index f207e60d900..271cdaa329e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public NumberOnly(decimal justNumber) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (justNumber == null) - throw new ArgumentNullException("justNumber is a required property for NumberOnly and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - JustNumber = justNumber; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (justNumber == null) + throw new ArgumentNullException(nameof(justNumber), "Property is required for class NumberOnly."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new NumberOnly(justNumber); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 8fc287460d8..8213572e4d9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -38,24 +38,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ObjectWithDeprecatedFields(List bars, DeprecatedObject deprecatedRef, decimal id, string uuid) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (uuid == null) - throw new ArgumentNullException("uuid is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (id == null) - throw new ArgumentNullException("id is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (deprecatedRef == null) - throw new ArgumentNullException("deprecatedRef is a required property for ObjectWithDeprecatedFields and cannot be null."); - - if (bars == null) - throw new ArgumentNullException("bars is a required property for ObjectWithDeprecatedFields and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bars = bars; DeprecatedRef = deprecatedRef; Id = id; @@ -185,6 +167,24 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (uuid == null) + throw new ArgumentNullException(nameof(uuid), "Property is required for class ObjectWithDeprecatedFields."); + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class ObjectWithDeprecatedFields."); + + if (deprecatedRef == null) + throw new ArgumentNullException(nameof(deprecatedRef), "Property is required for class ObjectWithDeprecatedFields."); + + if (bars == null) + throw new ArgumentNullException(nameof(bars), "Property is required for class ObjectWithDeprecatedFields."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs index 8f05a735834..3947538474d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs @@ -40,30 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Order(long id, long petId, int quantity, DateTime shipDate, StatusEnum status, bool complete = false) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Order and cannot be null."); - - if (petId == null) - throw new ArgumentNullException("petId is a required property for Order and cannot be null."); - - if (quantity == null) - throw new ArgumentNullException("quantity is a required property for Order and cannot be null."); - - if (shipDate == null) - throw new ArgumentNullException("shipDate is a required property for Order and cannot be null."); - - if (status == null) - throw new ArgumentNullException("status is a required property for Order and cannot be null."); - - if (complete == null) - throw new ArgumentNullException("complete is a required property for Order and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; PetId = petId; Quantity = quantity; @@ -286,6 +262,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Order."); + + if (petId == null) + throw new ArgumentNullException(nameof(petId), "Property is required for class Order."); + + if (quantity == null) + throw new ArgumentNullException(nameof(quantity), "Property is required for class Order."); + + if (shipDate == null) + throw new ArgumentNullException(nameof(shipDate), "Property is required for class Order."); + + if (status == null) + throw new ArgumentNullException(nameof(status), "Property is required for class Order."); + + if (complete == null) + throw new ArgumentNullException(nameof(complete), "Property is required for class Order."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Order(id, petId, quantity, shipDate, status, complete); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 082d12576b0..502082fdc5b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -37,21 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public OuterComposite(bool myBoolean, decimal myNumber, string myString) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (myNumber == null) - throw new ArgumentNullException("myNumber is a required property for OuterComposite and cannot be null."); - - if (myString == null) - throw new ArgumentNullException("myString is a required property for OuterComposite and cannot be null."); - - if (myBoolean == null) - throw new ArgumentNullException("myBoolean is a required property for OuterComposite and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - MyBoolean = myBoolean; MyNumber = myNumber; MyString = myString; @@ -165,6 +150,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (myNumber == null) + throw new ArgumentNullException(nameof(myNumber), "Property is required for class OuterComposite."); + + if (myString == null) + throw new ArgumentNullException(nameof(myString), "Property is required for class OuterComposite."); + + if (myBoolean == null) + throw new ArgumentNullException(nameof(myBoolean), "Property is required for class OuterComposite."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new OuterComposite(myBoolean, myNumber, myString); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs index 75f3cb74c0d..cf7e9b68dc7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs @@ -40,30 +40,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Pet(Category category, long id, string name, List photoUrls, StatusEnum status, List tags) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Pet and cannot be null."); - - if (category == null) - throw new ArgumentNullException("category is a required property for Pet and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Pet and cannot be null."); - - if (photoUrls == null) - throw new ArgumentNullException("photoUrls is a required property for Pet and cannot be null."); - - if (tags == null) - throw new ArgumentNullException("tags is a required property for Pet and cannot be null."); - - if (status == null) - throw new ArgumentNullException("status is a required property for Pet and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Category = category; Id = id; Name = name; @@ -280,6 +256,30 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Pet."); + + if (category == null) + throw new ArgumentNullException(nameof(category), "Property is required for class Pet."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Pet."); + + if (photoUrls == null) + throw new ArgumentNullException(nameof(photoUrls), "Property is required for class Pet."); + + if (tags == null) + throw new ArgumentNullException(nameof(tags), "Property is required for class Pet."); + + if (status == null) + throw new ArgumentNullException(nameof(status), "Property is required for class Pet."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Pet(category, id, name, photoUrls, status, tags); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index 73b448ebfaf..d1afcde6550 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public QuadrilateralInterface(string quadrilateralType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException("quadrilateralType is a required property for QuadrilateralInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - QuadrilateralType = quadrilateralType; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class QuadrilateralInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new QuadrilateralInterface(quadrilateralType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index a77197ed839..7279ed0e9ae 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ReadOnlyFirst(string bar, string baz) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (bar == null) - throw new ArgumentNullException("bar is a required property for ReadOnlyFirst and cannot be null."); - - if (baz == null) - throw new ArgumentNullException("baz is a required property for ReadOnlyFirst and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Bar = bar; Baz = baz; } @@ -183,6 +171,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (bar == null) + throw new ArgumentNullException(nameof(bar), "Property is required for class ReadOnlyFirst."); + + if (baz == null) + throw new ArgumentNullException(nameof(baz), "Property is required for class ReadOnlyFirst."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ReadOnlyFirst(bar, baz); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs index 46050586d0c..bdec82a2f93 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Return(int returnProperty) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (returnProperty == null) - throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ReturnProperty = returnProperty; } @@ -132,6 +123,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (returnProperty == null) + throw new ArgumentNullException(nameof(returnProperty), "Property is required for class Return."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Return(returnProperty); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs index 2e29d505fd7..06578837b71 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs @@ -36,15 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Shape(Triangle triangle, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Triangle = triangle; QuadrilateralType = quadrilateralType; } @@ -57,15 +48,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Shape(Quadrilateral quadrilateral, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; } @@ -180,6 +162,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class Shape."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (triangleDeserialized) return new Shape(triangle, quadrilateralType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs index c47f5d73c9a..caa324aacd4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeInterface(string shapeType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException("shapeType is a required property for ShapeInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ShapeType = shapeType; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class ShapeInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new ShapeInterface(shapeType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index a7de304d7c0..ccfb5800519 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -36,15 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeOrNull(Triangle triangle, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Triangle = triangle; QuadrilateralType = quadrilateralType; } @@ -57,15 +48,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public ShapeOrNull(Quadrilateral quadrilateral, string quadrilateralType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (quadrilateralType == null) - throw new ArgumentNullException(nameof(QuadrilateralType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Quadrilateral = quadrilateral; QuadrilateralType = quadrilateralType; } @@ -180,6 +162,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (quadrilateralType == null) + throw new ArgumentNullException(nameof(quadrilateralType), "Property is required for class ShapeOrNull."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (triangleDeserialized) return new ShapeOrNull(triangle, quadrilateralType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 454f652d615..66ec0c1d1f9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public SpecialModelName(string specialModelNameProperty, long specialPropertyName) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (specialPropertyName == null) - throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null."); - - if (specialModelNameProperty == null) - throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - SpecialModelNameProperty = specialModelNameProperty; SpecialPropertyName = specialPropertyName; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (specialPropertyName == null) + throw new ArgumentNullException(nameof(specialPropertyName), "Property is required for class SpecialModelName."); + + if (specialModelNameProperty == null) + throw new ArgumentNullException(nameof(specialModelNameProperty), "Property is required for class SpecialModelName."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new SpecialModelName(specialModelNameProperty, specialPropertyName); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs index 7c3ae06b5bd..7978d6c1a55 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Tag(long id, string name) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for Tag and cannot be null."); - - if (name == null) - throw new ArgumentNullException("name is a required property for Tag and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Id = id; Name = name; } @@ -148,6 +136,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class Tag."); + + if (name == null) + throw new ArgumentNullException(nameof(name), "Property is required for class Tag."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Tag(id, name); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs index 81884177e02..6abfb59ba99 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -37,18 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(EquilateralTriangle equilateralTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - EquilateralTriangle = equilateralTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -63,18 +51,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(IsoscelesTriangle isoscelesTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - IsoscelesTriangle = isoscelesTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -89,18 +65,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Triangle(ScaleneTriangle scaleneTriangle, string shapeType, string triangleType) { - #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (shapeType == null) - throw new ArgumentNullException(nameof(ShapeType)); - - if (triangleType == null) - throw new ArgumentNullException(nameof(TriangleType)); - - #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' - #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ScaleneTriangle = scaleneTriangle; ShapeType = shapeType; TriangleType = triangleType; @@ -235,6 +199,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (shapeType == null) + throw new ArgumentNullException(nameof(shapeType), "Property is required for class Triangle."); + + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class Triangle."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + if (equilateralTriangleDeserialized) return new Triangle(equilateralTriangle, shapeType, triangleType); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs index ddb4e8de495..f44b2b08854 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -35,15 +35,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public TriangleInterface(string triangleType) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (triangleType == null) - throw new ArgumentNullException("triangleType is a required property for TriangleInterface and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - TriangleType = triangleType; } @@ -131,6 +122,15 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (triangleType == null) + throw new ArgumentNullException(nameof(triangleType), "Property is required for class TriangleInterface."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new TriangleInterface(triangleType); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs index 69346fa0294..72c193106d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs @@ -46,39 +46,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object anyTypeProp = default, Object anyTypePropNullable = default, Object objectWithNoDeclaredPropsNullable = default) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (id == null) - throw new ArgumentNullException("id is a required property for User and cannot be null."); - - if (username == null) - throw new ArgumentNullException("username is a required property for User and cannot be null."); - - if (firstName == null) - throw new ArgumentNullException("firstName is a required property for User and cannot be null."); - - if (lastName == null) - throw new ArgumentNullException("lastName is a required property for User and cannot be null."); - - if (email == null) - throw new ArgumentNullException("email is a required property for User and cannot be null."); - - if (password == null) - throw new ArgumentNullException("password is a required property for User and cannot be null."); - - if (phone == null) - throw new ArgumentNullException("phone is a required property for User and cannot be null."); - - if (userStatus == null) - throw new ArgumentNullException("userStatus is a required property for User and cannot be null."); - - if (objectWithNoDeclaredProps == null) - throw new ArgumentNullException("objectWithNoDeclaredProps is a required property for User and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - Email = email; FirstName = firstName; Id = id; @@ -309,6 +276,39 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (id == null) + throw new ArgumentNullException(nameof(id), "Property is required for class User."); + + if (username == null) + throw new ArgumentNullException(nameof(username), "Property is required for class User."); + + if (firstName == null) + throw new ArgumentNullException(nameof(firstName), "Property is required for class User."); + + if (lastName == null) + throw new ArgumentNullException(nameof(lastName), "Property is required for class User."); + + if (email == null) + throw new ArgumentNullException(nameof(email), "Property is required for class User."); + + if (password == null) + throw new ArgumentNullException(nameof(password), "Property is required for class User."); + + if (phone == null) + throw new ArgumentNullException(nameof(phone), "Property is required for class User."); + + if (userStatus == null) + throw new ArgumentNullException(nameof(userStatus), "Property is required for class User."); + + if (objectWithNoDeclaredProps == null) + throw new ArgumentNullException(nameof(objectWithNoDeclaredProps), "Property is required for class User."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs index 33a71620e48..8c9df6a8fe2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs @@ -37,21 +37,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Whale(string className, bool hasBaleen, bool hasTeeth) { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (hasBaleen == null) - throw new ArgumentNullException("hasBaleen is a required property for Whale and cannot be null."); - - if (hasTeeth == null) - throw new ArgumentNullException("hasTeeth is a required property for Whale and cannot be null."); - - if (className == null) - throw new ArgumentNullException("className is a required property for Whale and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; HasBaleen = hasBaleen; HasTeeth = hasTeeth; @@ -165,6 +150,21 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (hasBaleen == null) + throw new ArgumentNullException(nameof(hasBaleen), "Property is required for class Whale."); + + if (hasTeeth == null) + throw new ArgumentNullException(nameof(hasTeeth), "Property is required for class Whale."); + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Whale."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Whale(className, hasBaleen, hasTeeth); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs index 3df8c300ab6..3523212644c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs @@ -36,18 +36,6 @@ namespace Org.OpenAPITools.Model [JsonConstructor] public Zebra(string className, TypeEnum type) : base() { -#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - - if (type == null) - throw new ArgumentNullException("type is a required property for Zebra and cannot be null."); - - if (className == null) - throw new ArgumentNullException("className is a required property for Zebra and cannot be null."); - -#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' -#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' - ClassName = className; Type = type; } @@ -210,6 +198,18 @@ namespace Org.OpenAPITools.Model } } +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (type == null) + throw new ArgumentNullException(nameof(type), "Property is required for class Zebra."); + + if (className == null) + throw new ArgumentNullException(nameof(className), "Property is required for class Zebra."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + return new Zebra(className, type); } From e1719f2b7b1ec633e50bbe572e35854f6fad9dfd Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 17 Mar 2023 16:02:27 +0800 Subject: [PATCH 060/131] [JavaSpring] migrate config files to use 3.0 spec (#14981) * update spring config file to use 3.0 spec * migrate spring config file to use 3.0 spec * update github workflow to cover more samples --- .github/workflows/samples-spring.yaml | 7 +- bin/configs/spring-cloud-async-oas3.yaml | 2 +- bin/configs/spring-cloud-async.yaml | 11 - ...d-petstore-feign-spring-pageable-oas3.yaml | 2 +- ...-cloud-petstore-feign-spring-pageable.yaml | 9 - bin/configs/spring-stubs-oas3.yaml | 2 +- .../spring-stubs-skip-default-interface.yaml | 2 +- bin/configs/spring-stubs.yaml | 10 - ...g-pageable-delegatePattern-without-j8.yaml | 2 +- ...erver-spring-pageable-delegatePattern.yaml | 2 +- ...ore-server-spring-pageable-without-j8.yaml | 2 +- ...gboot-petstore-server-spring-pageable.yaml | 2 +- ...dels-for-testing-with-spring-pageable.yaml | 2170 +++++++++++++++++ .../spring/petstore-with-spring-pageable.yaml | 733 ++++++ .../.openapi-generator-ignore | 23 - .../.openapi-generator/FILES | 16 - .../.openapi-generator/VERSION | 1 - .../petstore/spring-cloud-async/README.md | 53 - .../petstore/spring-cloud-async/pom.xml | 82 - .../java/org/openapitools/api/PetApi.java | 309 --- .../org/openapitools/api/PetApiClient.java | 8 - .../java/org/openapitools/api/StoreApi.java | 147 -- .../org/openapitools/api/StoreApiClient.java | 8 - .../java/org/openapitools/api/UserApi.java | 244 -- .../org/openapitools/api/UserApiClient.java | 8 - .../ApiKeyRequestInterceptor.java | 31 - .../configuration/ClientConfiguration.java | 48 - .../java/org/openapitools/model/Category.java | 109 - .../openapitools/model/ModelApiResponse.java | 135 - .../java/org/openapitools/model/Order.java | 246 -- .../main/java/org/openapitools/model/Tag.java | 109 - .../java/org/openapitools/model/User.java | 253 -- .../.openapi-generator-ignore | 23 - .../.openapi-generator/FILES | 16 - .../.openapi-generator/VERSION | 1 - .../spring-cloud-spring-pageable/README.md | 53 - .../spring-cloud-spring-pageable/pom.xml | 82 - .../java/org/openapitools/api/PetApi.java | 312 --- .../org/openapitools/api/PetApiClient.java | 8 - .../java/org/openapitools/api/StoreApi.java | 146 -- .../org/openapitools/api/StoreApiClient.java | 8 - .../java/org/openapitools/api/UserApi.java | 266 -- .../org/openapitools/api/UserApiClient.java | 8 - .../ApiKeyRequestInterceptor.java | 31 - .../configuration/ClientConfiguration.java | 48 - .../java/org/openapitools/model/Category.java | 109 - .../openapitools/model/ModelApiResponse.java | 135 - .../java/org/openapitools/model/Order.java | 246 -- .../main/java/org/openapitools/model/Tag.java | 109 - .../java/org/openapitools/model/User.java | 253 -- .../java/org/openapitools/api/PetApi.java | 47 +- .../java/org/openapitools/api/StoreApi.java | 9 +- .../java/org/openapitools/api/UserApi.java | 58 +- .../java/org/openapitools/model/Category.java | 2 +- .../java/org/openapitools/api/PetApi.java | 47 +- .../java/org/openapitools/api/StoreApi.java | 9 +- .../java/org/openapitools/api/UserApi.java | 58 +- .../java/org/openapitools/model/Category.java | 2 +- .../java/org/openapitools/api/PetApi.java | 75 +- .../java/org/openapitools/api/StoreApi.java | 9 +- .../java/org/openapitools/api/UserApi.java | 58 +- .../java/org/openapitools/model/Category.java | 2 +- .../spring-stubs/.openapi-generator-ignore | 23 - .../spring-stubs/.openapi-generator/FILES | 12 - .../spring-stubs/.openapi-generator/VERSION | 1 - .../server/petstore/spring-stubs/README.md | 27 - samples/server/petstore/spring-stubs/pom.xml | 83 - .../java/org/openapitools/api/ApiUtil.java | 19 - .../java/org/openapitools/api/PetApi.java | 387 --- .../java/org/openapitools/api/StoreApi.java | 190 -- .../java/org/openapitools/api/UserApi.java | 285 --- .../java/org/openapitools/model/Category.java | 109 - .../openapitools/model/ModelApiResponse.java | 135 - .../java/org/openapitools/model/Order.java | 246 -- .../main/java/org/openapitools/model/Tag.java | 109 - .../java/org/openapitools/model/User.java | 253 -- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderExample.java | 2 +- .../src/main/resources/openapi.yaml | 128 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderExample.java | 2 +- .../src/main/resources/openapi.yaml | 128 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderExample.java | 2 +- .../src/main/resources/openapi.yaml | 128 +- .../openapitools/model/SpecialModelName.java | 6 +- .../openapitools/model/TypeHolderExample.java | 2 +- .../src/main/resources/openapi.yaml | 128 +- 88 files changed, 3641 insertions(+), 5798 deletions(-) delete mode 100644 bin/configs/spring-cloud-async.yaml delete mode 100644 bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml delete mode 100644 bin/configs/spring-stubs.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-pageable.yaml delete mode 100644 samples/client/petstore/spring-cloud-async/.openapi-generator-ignore delete mode 100644 samples/client/petstore/spring-cloud-async/.openapi-generator/FILES delete mode 100644 samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION delete mode 100644 samples/client/petstore/spring-cloud-async/README.md delete mode 100644 samples/client/petstore/spring-cloud-async/pom.xml delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApiClient.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApiClient.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApiClient.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java delete mode 100644 samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator-ignore delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/FILES delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/README.md delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/pom.xml delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApiClient.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApiClient.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApiClient.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java delete mode 100644 samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java delete mode 100644 samples/server/petstore/spring-stubs/.openapi-generator-ignore delete mode 100644 samples/server/petstore/spring-stubs/.openapi-generator/FILES delete mode 100644 samples/server/petstore/spring-stubs/.openapi-generator/VERSION delete mode 100644 samples/server/petstore/spring-stubs/README.md delete mode 100644 samples/server/petstore/spring-stubs/pom.xml delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/ApiUtil.java delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java delete mode 100644 samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java diff --git a/.github/workflows/samples-spring.yaml b/.github/workflows/samples-spring.yaml index 104e244a112..0ba66f74a5e 100644 --- a/.github/workflows/samples-spring.yaml +++ b/.github/workflows/samples-spring.yaml @@ -22,9 +22,10 @@ jobs: - samples/openapi3/client/petstore/spring-cloud - samples/client/petstore/spring-cloud-date-time - samples/openapi3/client/petstore/spring-cloud-date-time - - samples/client/petstore/spring-stubs - samples/openapi3/client/petstore/spring-stubs - samples/openapi3/client/petstore/spring-stubs-skip-default-interface + - samples/openapi3/client/petstore/spring-cloud-async + - samples/openapi3/client/petstore/spring-cloud-spring-pageable # servers - samples/server/petstore/springboot - samples/openapi3/server/petstore/springboot @@ -41,6 +42,10 @@ jobs: - samples/openapi3/server/petstore/spring-boot-oneof - samples/server/petstore/springboot-virtualan - samples/server/petstore/springboot-implicitHeaders-annotationLibrary + - samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8 + - samples/server/petstore/springboot-spring-pageable-delegatePattern + - samples/server/petstore/springboot-spring-pageable-without-j8 + - samples/server/petstore/springboot-spring-pageable steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 diff --git a/bin/configs/spring-cloud-async-oas3.yaml b/bin/configs/spring-cloud-async-oas3.yaml index 59c9d22e695..01e4dc6ce4d 100644 --- a/bin/configs/spring-cloud-async-oas3.yaml +++ b/bin/configs/spring-cloud-async-oas3.yaml @@ -1,7 +1,7 @@ generatorName: spring outputDir: samples/openapi3/client/petstore/spring-cloud-async library: spring-cloud -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: groupId: org.openapitools.openapi3 diff --git a/bin/configs/spring-cloud-async.yaml b/bin/configs/spring-cloud-async.yaml deleted file mode 100644 index b14f654366f..00000000000 --- a/bin/configs/spring-cloud-async.yaml +++ /dev/null @@ -1,11 +0,0 @@ -generatorName: spring -outputDir: samples/client/petstore/spring-cloud-async -library: spring-cloud -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -additionalProperties: - documentationProvider: springfox - async: "true" - java8: "true" - artifactId: petstore-spring-cloud - hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml b/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml index 02c96627b64..b130111f0e0 100644 --- a/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml +++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml @@ -1,7 +1,7 @@ generatorName: spring outputDir: samples/openapi3/client/petstore/spring-cloud-spring-pageable library: spring-cloud -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-pageable.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: groupId: org.openapitools.openapi3 diff --git a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml b/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml deleted file mode 100644 index 506a1c53be6..00000000000 --- a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml +++ /dev/null @@ -1,9 +0,0 @@ -generatorName: spring -outputDir: samples/client/petstore/spring-cloud-spring-pageable -library: spring-cloud -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -additionalProperties: - documentationProvider: springfox - artifactId: spring-cloud-spring-pageable - hideGenerationTimestamp: 'true' diff --git a/bin/configs/spring-stubs-oas3.yaml b/bin/configs/spring-stubs-oas3.yaml index d5149f28adc..c37ba7e3c3c 100644 --- a/bin/configs/spring-stubs-oas3.yaml +++ b/bin/configs/spring-stubs-oas3.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/openapi3/client/petstore/spring-stubs -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: groupId: org.openapitools.openapi3 diff --git a/bin/configs/spring-stubs-skip-default-interface.yaml b/bin/configs/spring-stubs-skip-default-interface.yaml index bb107e0bd2a..43d4dd08089 100644 --- a/bin/configs/spring-stubs-skip-default-interface.yaml +++ b/bin/configs/spring-stubs-skip-default-interface.yaml @@ -1,6 +1,6 @@ generatorName: spring outputDir: samples/openapi3/client/petstore/spring-stubs-skip-default-interface -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: groupId: org.openapitools.openapi3 diff --git a/bin/configs/spring-stubs.yaml b/bin/configs/spring-stubs.yaml deleted file mode 100644 index 349c5e229c7..00000000000 --- a/bin/configs/spring-stubs.yaml +++ /dev/null @@ -1,10 +0,0 @@ -generatorName: spring -outputDir: samples/server/petstore/spring-stubs -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -additionalProperties: - documentationProvider: springfox - artifactId: spring-stubs - interfaceOnly: "true" - singleContentTypes: "true" - hideGenerationTimestamp: "true" diff --git a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml index 7d16b4a1e76..7716066d45e 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml @@ -1,7 +1,7 @@ generatorName: spring outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8 library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring delegatePattern: true java8: false diff --git a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml index 6cb1ca4b9cc..4060de18878 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml @@ -1,7 +1,7 @@ generatorName: spring outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring delegatePattern: true additionalProperties: diff --git a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml index 87c63968490..bbfb4e85312 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml @@ -1,7 +1,7 @@ generatorName: spring outputDir: samples/server/petstore/springboot-spring-pageable-without-j8 library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring java8: false additionalProperties: diff --git a/bin/configs/springboot-petstore-server-spring-pageable.yaml b/bin/configs/springboot-petstore-server-spring-pageable.yaml index 2f4e88ed812..5ba08260299 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable.yaml @@ -1,7 +1,7 @@ generatorName: spring outputDir: samples/server/petstore/springboot-spring-pageable library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: documentationProvider: springfox diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml new file mode 100644 index 00000000000..3d6ed2942c3 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml @@ -0,0 +1,2170 @@ +openapi: 3.0.1 +info: + title: OpenAPI Petstore + description: 'This spec is mainly for testing Petstore server and contains fake + endpoints, models. Please do not use this for any other purpose. Special characters: + " \' + license: + name: Apache-2.0 + url: http://www.apache.org/licenses/LICENSE-2.0.html + version: 1.0.0 +servers: +- url: http://petstore.swagger.io:80/v2 +tags: +- name: pet + description: Everything about your Pets +- name: store + description: Access to Petstore orders +- name: user + description: Operations about user +paths: + /pet: + put: + tags: + - pet + summary: Update an existing pet + operationId: updatePet + requestBody: + description: Pet object that needs to be added to the store + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + required: true + responses: + 200: + description: successful operation + content: {} + 400: + description: Invalid ID supplied + content: {} + 404: + description: Pet not found + content: {} + 405: + description: Validation exception + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + x-codegen-request-body-name: body + post: + tags: + - pet + summary: Add a new pet to the store + operationId: addPet + requestBody: + description: Pet object that needs to be added to the store + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + required: true + responses: + 200: + description: successful operation + content: {} + 405: + description: Invalid input + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + x-codegen-request-body-name: body + /pet/findByStatus: + get: + tags: + - pet + summary: Finds Pets by status + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - name: status + in: query + description: Status values that need to be considered for filter + required: true + style: form + explode: false + schema: + type: array + items: + type: string + default: available + enum: + - available + - pending + - sold + responses: + 200: + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + 400: + description: Invalid status value + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + x-spring-paginated: true + /pet/findByTags: + get: + tags: + - pet + summary: Finds Pets by tags + description: Multiple tags can be provided with comma separated strings. Use + tag1, tag2, tag3 for testing. + operationId: findPetsByTags + parameters: + - name: tags + in: query + description: Tags to filter by + required: true + style: form + explode: false + schema: + type: array + items: + type: string + responses: + 200: + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + 400: + description: Invalid tag value + content: {} + deprecated: true + security: + - petstore_auth: + - write:pets + - read:pets + x-spring-paginated: true + /pet/{petId}: + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: petId + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + responses: + 200: + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + 400: + description: Invalid ID supplied + content: {} + 404: + description: Pet not found + content: {} + security: + - api_key: [] + post: + tags: + - pet + summary: Updates a pet in the store with form data + operationId: updatePetWithForm + parameters: + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + schema: + type: integer + format: int64 + requestBody: + content: + application/x-www-form-urlencoded: + schema: + properties: + name: + type: string + description: Updated name of the pet + status: + type: string + description: Updated status of the pet + responses: + 405: + description: Invalid input + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + delete: + tags: + - pet + summary: Deletes a pet + operationId: deletePet + parameters: + - name: api_key + in: header + schema: + type: string + - name: petId + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + 200: + description: successful operation + content: {} + 400: + description: Invalid pet value + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + /pet/{petId}/uploadImage: + post: + tags: + - pet + summary: uploads an image + operationId: uploadFile + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + requestBody: + content: + multipart/form-data: + schema: + properties: + additionalMetadata: + type: string + description: Additional data to pass to server + file: + type: string + description: file to upload + format: binary + responses: + 200: + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + security: + - petstore_auth: + - write:pets + - read:pets + /store/inventory: + get: + tags: + - store + summary: Returns pet inventories by status + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + 200: + description: successful operation + content: + application/json: + schema: + type: object + additionalProperties: + type: integer + format: int32 + security: + - api_key: [] + /store/order: + post: + tags: + - store + summary: Place an order for a pet + operationId: placeOrder + requestBody: + description: order placed for purchasing the pet + content: + '*/*': + schema: + $ref: '#/components/schemas/Order' + required: true + responses: + 200: + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + 400: + description: Invalid Order + content: {} + x-codegen-request-body-name: body + /store/order/{order_id}: + get: + tags: + - store + summary: Find purchase order by ID + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - name: order_id + in: path + description: ID of pet that needs to be fetched + required: true + schema: + maximum: 5 + minimum: 1 + type: integer + format: int64 + responses: + 200: + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + 400: + description: Invalid ID supplied + content: {} + 404: + description: Order not found + content: {} + delete: + tags: + - store + summary: Delete purchase order by ID + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - name: order_id + in: path + description: ID of the order that needs to be deleted + required: true + schema: + type: string + responses: + 400: + description: Invalid ID supplied + content: {} + 404: + description: Order not found + content: {} + /user: + post: + tags: + - user + summary: Create user + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + description: Created user object + content: + '*/*': + schema: + $ref: '#/components/schemas/User' + required: true + responses: + default: + description: successful operation + content: {} + x-codegen-request-body-name: body + /user/createWithArray: + post: + tags: + - user + summary: Creates list of users with given input array + operationId: createUsersWithArrayInput + requestBody: + description: List of user object + content: + '*/*': + schema: + type: array + items: + $ref: '#/components/schemas/User' + required: true + responses: + default: + description: successful operation + content: {} + x-codegen-request-body-name: body + /user/createWithList: + post: + tags: + - user + summary: Creates list of users with given input array + operationId: createUsersWithListInput + requestBody: + description: List of user object + content: + '*/*': + schema: + type: array + items: + $ref: '#/components/schemas/User' + required: true + responses: + default: + description: successful operation + content: {} + x-codegen-request-body-name: body + /user/login: + get: + tags: + - user + summary: Logs user into the system + operationId: loginUser + parameters: + - name: username + in: query + description: The user name for login + required: true + schema: + type: string + - name: password + in: query + description: The password for login in clear text + required: true + schema: + type: string + responses: + 200: + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + schema: + type: integer + format: int32 + X-Expires-After: + description: date in UTC when token expires + schema: + type: string + format: date-time + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + 400: + description: Invalid username/password supplied + content: {} + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + operationId: logoutUser + responses: + default: + description: successful operation + content: {} + /user/{username}: + get: + tags: + - user + summary: Get user by user name + operationId: getUserByName + parameters: + - name: username + in: path + description: The name that needs to be fetched. Use user1 for testing. + required: true + schema: + type: string + responses: + 200: + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + 400: + description: Invalid username supplied + content: {} + 404: + description: User not found + content: {} + put: + tags: + - user + summary: Updated user + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - name: username + in: path + description: name that need to be deleted + required: true + schema: + type: string + requestBody: + description: Updated user object + content: + '*/*': + schema: + $ref: '#/components/schemas/User' + required: true + responses: + 400: + description: Invalid user supplied + content: {} + 404: + description: User not found + content: {} + x-codegen-request-body-name: body + delete: + tags: + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + schema: + type: string + responses: + 400: + description: Invalid username supplied + content: {} + 404: + description: User not found + content: {} + /fake_classname_test: + patch: + tags: + - fake_classname_tags 123#$%^ + summary: To test class name in snake case + description: To test class name in snake case + operationId: testClassname + requestBody: + description: client model + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + required: true + responses: + 200: + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + security: + - api_key_query: [] + x-codegen-request-body-name: body + /fake: + get: + tags: + - fake + summary: To test enum parameters + description: To test enum parameters + operationId: testEnumParameters + parameters: + - name: enum_header_string_array + in: header + description: Header parameter enum test (string array) + style: simple + explode: false + schema: + type: array + items: + type: string + default: $ + enum: + - '>' + - $ + - name: enum_header_string + in: header + description: Header parameter enum test (string) + schema: + type: string + default: -efg + enum: + - _abc + - -efg + - (xyz) + - name: enum_query_string_array + in: query + description: Query parameter enum test (string array) + style: form + explode: false + schema: + type: array + items: + type: string + default: $ + enum: + - '>' + - $ + - name: enum_query_string + in: query + description: Query parameter enum test (string) + schema: + type: string + default: -efg + enum: + - _abc + - -efg + - (xyz) + - name: enum_query_integer + in: query + description: Query parameter enum test (double) + schema: + type: integer + format: int32 + enum: + - 1 + - -2 + - name: enum_query_double + in: query + description: Query parameter enum test (double) + schema: + type: number + format: double + enum: + - 1.1 + - -1.2 + requestBody: + content: + application/x-www-form-urlencoded: + schema: + properties: + enum_form_string_array: + type: array + description: Form parameter enum test (string array) + items: + type: string + default: $ + enum: + - '>' + - $ + enum_form_string: + type: string + description: Form parameter enum test (string) + default: -efg + enum: + - _abc + - -efg + - (xyz) + responses: + 400: + description: Invalid request + content: {} + 404: + description: Not found + content: {} + post: + tags: + - fake + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + required: + - byte + - double + - number + - pattern_without_delimiter + properties: + integer: + maximum: 100 + minimum: 10 + type: integer + description: None + format: int32 + int32: + maximum: 200 + minimum: 20 + type: integer + description: None + format: int32 + int64: + type: integer + description: None + format: int64 + number: + maximum: 543.2 + minimum: 32.1 + type: number + description: None + float: + maximum: 987.6 + type: number + description: None + format: float + double: + maximum: 123.4 + minimum: 67.8 + type: number + description: None + format: double + string: + pattern: /[a-z]/i + type: string + description: None + pattern_without_delimiter: + pattern: ^[A-Z].* + type: string + description: None + byte: + type: string + description: None + format: byte + binary: + type: string + description: None + format: binary + date: + type: string + description: None + format: date + dateTime: + type: string + description: None + format: date-time + password: + maxLength: 64 + minLength: 10 + type: string + description: None + format: password + callback: + type: string + description: None + required: true + responses: + 400: + description: Invalid username supplied + content: {} + 404: + description: User not found + content: {} + security: + - http_basic_test: [] + delete: + tags: + - fake + summary: Fake endpoint to test group parameters (optional) + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - name: required_string_group + in: query + description: Required String in group parameters + required: true + schema: + type: integer + - name: required_boolean_group + in: header + description: Required Boolean in group parameters + required: true + schema: + type: boolean + - name: required_int64_group + in: query + description: Required Integer in group parameters + required: true + schema: + type: integer + format: int64 + - name: string_group + in: query + description: String in group parameters + schema: + type: integer + - name: boolean_group + in: header + description: Boolean in group parameters + schema: + type: boolean + - name: int64_group + in: query + description: Integer in group parameters + schema: + type: integer + format: int64 + responses: + 400: + description: Something wrong + content: {} + x-group-parameters: true + patch: + tags: + - fake + summary: To test "client" model + description: To test "client" model + operationId: testClientModel + requestBody: + description: client model + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + required: true + responses: + 200: + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + x-codegen-request-body-name: body + /fake/outer/number: + post: + tags: + - fake + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + description: Input number as post body + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + required: false + responses: + 200: + description: Output number + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + x-codegen-request-body-name: body + /fake/outer/string: + post: + tags: + - fake + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + requestBody: + description: Input string as post body + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + required: false + responses: + 200: + description: Output string + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + x-codegen-request-body-name: body + /fake/outer/boolean: + post: + tags: + - fake + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + description: Input boolean as post body + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + required: false + responses: + 200: + description: Output boolean + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + x-codegen-request-body-name: body + /fake/outer/composite: + post: + tags: + - fake + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + description: Input composite as post body + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + required: false + responses: + 200: + description: Output composite + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + x-codegen-request-body-name: body + /fake/jsonFormData: + get: + tags: + - fake + summary: test json serialization of form data + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + required: + - param + - param2 + properties: + param: + type: string + description: field1 + param2: + type: string + description: field2 + required: true + responses: + 200: + description: successful operation + content: {} + /fake/inline-additionalProperties: + post: + tags: + - fake + summary: test inline additionalProperties + operationId: testInlineAdditionalProperties + requestBody: + description: request body + content: + application/json: + schema: + type: object + additionalProperties: + type: string + required: true + responses: + 200: + description: successful operation + content: {} + x-codegen-request-body-name: param + /fake/body-with-query-params: + put: + tags: + - fake + operationId: testBodyWithQueryParams + parameters: + - name: query + in: query + required: true + schema: + type: string + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + 200: + description: Success + content: {} + x-codegen-request-body-name: body + /fake/create_xml_item: + post: + tags: + - fake + summary: creates an XmlItem + description: this route creates an XmlItem + operationId: createXmlItem + requestBody: + description: XmlItem Body + content: + application/xml: + schema: + $ref: '#/components/schemas/XmlItem' + application/xml; charset=utf-8: + schema: + $ref: '#/components/schemas/XmlItem' + application/xml; charset=utf-16: + schema: + $ref: '#/components/schemas/XmlItem' + text/xml: + schema: + $ref: '#/components/schemas/XmlItem' + text/xml; charset=utf-8: + schema: + $ref: '#/components/schemas/XmlItem' + text/xml; charset=utf-16: + schema: + $ref: '#/components/schemas/XmlItem' + required: true + responses: + 200: + description: successful operation + content: {} + x-codegen-request-body-name: XmlItem + /another-fake/dummy: + patch: + tags: + - $another-fake? + summary: To test special tags + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + description: client model + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + required: true + responses: + 200: + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + x-codegen-request-body-name: body + /fake/body-with-file-schema: + put: + tags: + - fake + description: For this test, the body for this request much reference a schema + named `File`. + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + 200: + description: Success + content: {} + x-codegen-request-body-name: body + /fake/test-query-parameters: + put: + tags: + - fake + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - name: pipe + in: query + required: true + style: form + explode: false + schema: + type: array + items: + type: string + - name: ioutil + in: query + required: true + schema: + type: array + items: + type: string + - name: http + in: query + required: true + style: spaceDelimited + schema: + type: array + items: + type: string + - name: url + in: query + required: true + style: form + explode: false + schema: + type: array + items: + type: string + - name: context + in: query + required: true + style: form + explode: true + schema: + type: array + items: + type: string + responses: + 200: + description: Success + content: {} + /fake/{petId}/uploadImageWithRequiredFile: + post: + tags: + - pet + summary: uploads an image (required) + operationId: uploadFileWithRequiredFile + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + requestBody: + content: + multipart/form-data: + schema: + required: + - requiredFile + properties: + additionalMetadata: + type: string + description: Additional data to pass to server + requiredFile: + type: string + description: file to upload + format: binary + required: true + responses: + 200: + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + security: + - petstore_auth: + - write:pets + - read:pets + /versioning/headers: + post: + tags: + - versioning + operationId: versioningHeaders + parameters: + - name: VersionWithDefaultValue + in: header + required: true + schema: + type: string + default: V1 + x-version-param: true + x-version-param: true + - name: VersionNoDefaultValue + in: header + required: true + schema: + type: string + x-version-param: true + x-version-param: true + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + responses: + 200: + description: successful operation + content: + '*/*': + schema: + $ref: '#/components/schemas/ApiResponse' + /versioning/query-params: + post: + tags: + - versioning + operationId: versioningQueryParams + parameters: + - name: VersionWithDefaultValue + in: query + required: true + schema: + type: string + default: V1 + x-version-param: true + x-version-param: true + - name: VersionNoDefaultValue + in: query + required: true + schema: + type: string + x-version-param: true + x-version-param: true + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + responses: + 200: + description: successful operation + content: + '*/*': + schema: + $ref: '#/components/schemas/ApiResponse' + /versioning/mix: + post: + tags: + - versioning + operationId: versioningMix + parameters: + - name: VersionWithDefaultValueQuery + in: query + required: true + schema: + type: string + default: V1 + x-version-param: true + x-version-param: true + - name: VersionNoDefaultValueQuery + in: query + required: true + schema: + type: string + x-version-param: true + x-version-param: true + - name: VersionWithDefaultValueHeader + in: header + required: true + schema: + type: string + default: V1 + x-version-param: true + x-version-param: true + - name: VersionNoDefaultValueHeader + in: header + required: true + schema: + type: string + x-version-param: true + x-version-param: true + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + responses: + 200: + description: successful operation + content: + '*/*': + schema: + $ref: '#/components/schemas/ApiResponse' +components: + schemas: + Order: + type: object + properties: + id: + type: integer + format: int64 + petId: + type: integer + format: int64 + quantity: + type: integer + format: int32 + shipDate: + type: string + format: date-time + status: + type: string + description: Order Status + enum: + - placed + - approved + - delivered + complete: + type: boolean + default: false + xml: + name: Order + Category: + required: + - name + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + default: default-name + xml: + name: Category + User: + type: object + properties: + id: + type: integer + format: int64 + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + type: integer + description: User Status + format: int32 + xml: + name: User + Tag: + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + xml: + name: Tag + Pet: + required: + - name + - photoUrls + type: object + properties: + id: + type: integer + format: int64 + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + type: string + example: doggie + photoUrls: + type: array + xml: + name: photoUrl + wrapped: true + items: + type: string + tags: + type: array + xml: + name: tag + wrapped: true + items: + $ref: '#/components/schemas/Tag' + status: + type: string + description: pet status in the store + enum: + - available + - pending + - sold + xml: + name: Pet + ApiResponse: + type: object + properties: + code: + type: integer + format: int32 + type: + type: string + message: + type: string + _special_model_name_: + type: object + properties: + $special[property.name]: + type: integer + format: int64 + xml: + name: $special[model.name] + Return: + type: object + properties: + return: + type: integer + format: int32 + description: Model for testing reserved words + xml: + name: Return + Name: + required: + - name + type: object + properties: + name: + type: integer + format: int32 + snake_case: + type: integer + format: int32 + readOnly: true + property: + type: string + 123Number: + type: integer + readOnly: true + description: Model for testing model name same as property name + xml: + name: Name + 200_response: + type: object + properties: + name: + type: integer + format: int32 + class: + type: string + description: Model for testing model name starting with number + xml: + name: Name + ClassModel: + type: object + properties: + _class: + type: string + description: Model for testing model with "_class" property + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - type: object + properties: + breed: + type: string + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - type: object + properties: + declawed: + type: boolean + Animal: + required: + - className + type: object + properties: + className: + type: string + color: + type: string + default: red + discriminator: + propertyName: className + AnimalFarm: + type: array + items: + $ref: '#/components/schemas/Animal' + format_test: + required: + - byte + - date + - number + - password + type: object + properties: + integer: + maximum: 1E+2 + minimum: 1E+1 + type: integer + int32: + maximum: 2E+2 + minimum: 2E+1 + type: integer + format: int32 + int64: + type: integer + format: int64 + number: + maximum: 543.2 + minimum: 32.1 + type: number + float: + maximum: 987.6 + minimum: 54.3 + type: number + format: float + double: + maximum: 123.4 + minimum: 67.8 + type: number + format: double + string: + pattern: /[a-z]/i + type: string + byte: + pattern: ^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$ + type: string + format: byte + binary: + type: string + format: binary + date: + type: string + format: date + dateTime: + type: string + format: date-time + uuid: + type: string + format: uuid + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + password: + maxLength: 64 + minLength: 10 + type: string + format: password + BigDecimal: + type: string + format: number + EnumClass: + type: string + default: -efg + enum: + - _abc + - -efg + - (xyz) + Enum_Test: + required: + - enum_string_required + type: object + properties: + enum_string: + type: string + enum: + - UPPER + - lower + - "" + enum_string_required: + type: string + enum: + - UPPER + - lower + - "" + enum_integer: + type: integer + format: int32 + enum: + - 1 + - -1 + enum_number: + type: number + format: double + enum: + - 1.1 + - -1.2 + outerEnum: + $ref: '#/components/schemas/OuterEnum' + AdditionalPropertiesClass: + type: object + properties: + map_string: + type: object + additionalProperties: + type: string + map_number: + type: object + additionalProperties: + type: number + map_integer: + type: object + additionalProperties: + type: integer + map_boolean: + type: object + additionalProperties: + type: boolean + map_array_integer: + type: object + additionalProperties: + type: array + items: + type: integer + map_array_anytype: + type: object + additionalProperties: + type: array + items: + type: object + properties: {} + map_map_string: + type: object + additionalProperties: + type: object + additionalProperties: + type: string + map_map_anytype: + type: object + additionalProperties: + type: object + additionalProperties: + type: object + properties: {} + anytype_1: + type: object + properties: {} + anytype_2: + type: object + anytype_3: + type: object + properties: {} + AdditionalPropertiesString: + type: object + properties: + name: + type: string + additionalProperties: + type: string + AdditionalPropertiesInteger: + type: object + properties: + name: + type: string + additionalProperties: + type: integer + AdditionalPropertiesNumber: + type: object + properties: + name: + type: string + additionalProperties: + type: number + AdditionalPropertiesBoolean: + type: object + properties: + name: + type: string + additionalProperties: + type: boolean + AdditionalPropertiesArray: + type: object + properties: + name: + type: string + additionalProperties: + type: array + items: + type: object + properties: {} + AdditionalPropertiesObject: + type: object + properties: + name: + type: string + additionalProperties: + type: object + additionalProperties: + type: object + properties: {} + AdditionalPropertiesAnyType: + type: object + properties: + name: + type: string + additionalProperties: + type: object + properties: {} + MixedPropertiesAndAdditionalPropertiesClass: + type: object + properties: + uuid: + type: string + format: uuid + dateTime: + type: string + format: date-time + map: + type: object + additionalProperties: + $ref: '#/components/schemas/Animal' + List: + type: object + properties: + 123-list: + type: string + Client: + type: object + properties: + client: + type: string + ReadOnlyFirst: + type: object + properties: + bar: + type: string + readOnly: true + baz: + type: string + hasOnlyReadOnly: + type: object + properties: + bar: + type: string + readOnly: true + foo: + type: string + readOnly: true + Capitalization: + type: object + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + type: string + description: | + Name of the pet + MapTest: + type: object + properties: + map_map_of_string: + type: object + additionalProperties: + type: object + additionalProperties: + type: string + map_of_enum_string: + type: object + additionalProperties: + type: string + enum: + - UPPER + - lower + direct_map: + type: object + additionalProperties: + type: boolean + indirect_map: + $ref: '#/components/schemas/StringBooleanMap' + ArrayTest: + type: object + properties: + array_of_string: + type: array + items: + type: string + array_array_of_integer: + type: array + items: + type: array + items: + type: integer + format: int64 + array_array_of_model: + type: array + items: + type: array + items: + $ref: '#/components/schemas/ReadOnlyFirst' + NumberOnly: + type: object + properties: + JustNumber: + type: number + ArrayOfNumberOnly: + type: object + properties: + ArrayNumber: + type: array + items: + type: number + ArrayOfArrayOfNumberOnly: + type: object + properties: + ArrayArrayNumber: + type: array + items: + type: array + items: + type: number + EnumArrays: + type: object + properties: + just_symbol: + type: string + enum: + - '>=' + - $ + array_enum: + type: array + items: + type: string + enum: + - fish + - crab + OuterEnum: + type: string + enum: + - placed + - approved + - delivered + OuterComposite: + type: object + properties: + my_number: + $ref: '#/components/schemas/OuterNumber' + my_string: + $ref: '#/components/schemas/OuterString' + my_boolean: + $ref: '#/components/schemas/OuterBoolean' + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + type: object + additionalProperties: + type: boolean + FileSchemaTestClass: + type: object + properties: + file: + $ref: '#/components/schemas/File' + files: + type: array + items: + $ref: '#/components/schemas/File' + File: + type: object + properties: + sourceURI: + type: string + description: Test capitalization + description: Must be named `File` for test. + TypeHolderDefault: + required: + - array_item + - bool_item + - integer_item + - number_item + - string_item + type: object + properties: + string_item: + type: string + default: what + number_item: + type: number + integer_item: + type: integer + bool_item: + type: boolean + default: true + array_item: + type: array + items: + type: integer + TypeHolderExample: + required: + - array_item + - bool_item + - float_item + - integer_item + - number_item + - string_item + type: object + properties: + string_item: + type: string + example: what + number_item: + type: number + example: 1.234 + float_item: + type: number + format: float + example: 1.234 + integer_item: + type: integer + example: -2 + bool_item: + type: boolean + example: true + array_item: + type: array + example: + - 0 + - 1 + - 2 + - 3 + items: + type: integer + XmlItem: + type: object + properties: + attribute_string: + type: string + example: string + xml: + attribute: true + attribute_number: + type: number + example: 1.234 + xml: + attribute: true + attribute_integer: + type: integer + example: -2 + xml: + attribute: true + attribute_boolean: + type: boolean + example: true + xml: + attribute: true + wrapped_array: + type: array + xml: + wrapped: true + items: + type: integer + name_string: + type: string + example: string + xml: + name: xml_name_string + name_number: + type: number + example: 1.234 + xml: + name: xml_name_number + name_integer: + type: integer + example: -2 + xml: + name: xml_name_integer + name_boolean: + type: boolean + example: true + xml: + name: xml_name_boolean + name_array: + type: array + items: + type: integer + xml: + name: xml_name_array_item + name_wrapped_array: + type: array + xml: + name: xml_name_wrapped_array + wrapped: true + items: + type: integer + xml: + name: xml_name_wrapped_array_item + prefix_string: + type: string + example: string + xml: + prefix: ab + prefix_number: + type: number + example: 1.234 + xml: + prefix: cd + prefix_integer: + type: integer + example: -2 + xml: + prefix: ef + prefix_boolean: + type: boolean + example: true + xml: + prefix: gh + prefix_array: + type: array + items: + type: integer + xml: + prefix: ij + prefix_wrapped_array: + type: array + xml: + prefix: kl + wrapped: true + items: + type: integer + xml: + prefix: mn + namespace_string: + type: string + example: string + xml: + namespace: http://a.com/schema + namespace_number: + type: number + example: 1.234 + xml: + namespace: http://b.com/schema + namespace_integer: + type: integer + example: -2 + xml: + namespace: http://c.com/schema + namespace_boolean: + type: boolean + example: true + xml: + namespace: http://d.com/schema + namespace_array: + type: array + items: + type: integer + xml: + namespace: http://e.com/schema + namespace_wrapped_array: + type: array + xml: + namespace: http://f.com/schema + wrapped: true + items: + type: integer + xml: + namespace: http://g.com/schema + prefix_ns_string: + type: string + example: string + xml: + namespace: http://a.com/schema + prefix: a + prefix_ns_number: + type: number + example: 1.234 + xml: + namespace: http://b.com/schema + prefix: b + prefix_ns_integer: + type: integer + example: -2 + xml: + namespace: http://c.com/schema + prefix: c + prefix_ns_boolean: + type: boolean + example: true + xml: + namespace: http://d.com/schema + prefix: d + prefix_ns_array: + type: array + items: + type: integer + xml: + namespace: http://e.com/schema + prefix: e + prefix_ns_wrapped_array: + type: array + xml: + namespace: http://f.com/schema + prefix: f + wrapped: true + items: + type: integer + xml: + namespace: http://g.com/schema + prefix: g + xml: + namespace: http://a.com/schema + prefix: pre + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + api_key: + type: apiKey + name: api_key + in: header + api_key_query: + type: apiKey + name: api_key_query + in: query + http_basic_test: + type: http + scheme: basic diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-pageable.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-pageable.yaml new file mode 100644 index 00000000000..bd045d28262 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-pageable.yaml @@ -0,0 +1,733 @@ +openapi: 3.0.1 +info: + title: OpenAPI Petstore + description: This is a sample server Petstore server. For this sample, you can use + the api key `special-key` to test the authorization filters. + license: + name: Apache-2.0 + url: http://www.apache.org/licenses/LICENSE-2.0.html + version: 1.0.0 +servers: +- url: http://petstore.swagger.io/v2 +tags: +- name: pet + description: Everything about your Pets +- name: store + description: Access to Petstore orders +- name: user + description: Operations about user +paths: + /pet: + put: + tags: + - pet + summary: Update an existing pet + operationId: updatePet + requestBody: + description: Pet object that needs to be added to the store + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + required: true + responses: + 400: + description: Invalid ID supplied + content: {} + 404: + description: Pet not found + content: {} + 405: + description: Validation exception + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + x-codegen-request-body-name: body + post: + tags: + - pet + summary: Add a new pet to the store + operationId: addPet + requestBody: + description: Pet object that needs to be added to the store + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + required: true + responses: + 405: + description: Invalid input + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + x-codegen-request-body-name: body + /pet/findByStatus: + get: + tags: + - pet + summary: Finds Pets by status + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - name: status + in: query + description: Status values that need to be considered for filter + required: true + style: form + explode: false + schema: + type: array + items: + type: string + default: available + enum: + - available + - pending + - sold + responses: + 200: + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + 400: + description: Invalid status value + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + x-spring-paginated: true + /pet/findByTags: + get: + tags: + - pet + summary: Finds Pets by tags + description: Multiple tags can be provided with comma separated strings. Use + tag1, tag2, tag3 for testing. + operationId: findPetsByTags + parameters: + - name: tags + in: query + description: Tags to filter by + required: true + style: form + explode: false + schema: + type: array + items: + type: string + responses: + 200: + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + 400: + description: Invalid tag value + content: {} + deprecated: true + security: + - petstore_auth: + - write:pets + - read:pets + x-spring-paginated: true + /pet/{petId}: + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: petId + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + responses: + 200: + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + 400: + description: Invalid ID supplied + content: {} + 404: + description: Pet not found + content: {} + security: + - api_key: [] + post: + tags: + - pet + summary: Updates a pet in the store with form data + operationId: updatePetWithForm + parameters: + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + schema: + type: integer + format: int64 + requestBody: + content: + application/x-www-form-urlencoded: + schema: + properties: + name: + type: string + description: Updated name of the pet + status: + type: string + description: Updated status of the pet + responses: + 405: + description: Invalid input + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + delete: + tags: + - pet + summary: Deletes a pet + operationId: deletePet + parameters: + - name: api_key + in: header + schema: + type: string + - name: petId + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + 400: + description: Invalid pet value + content: {} + security: + - petstore_auth: + - write:pets + - read:pets + /pet/{petId}/uploadImage: + post: + tags: + - pet + summary: uploads an image + operationId: uploadFile + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + requestBody: + content: + multipart/form-data: + schema: + properties: + additionalMetadata: + type: string + description: Additional data to pass to server + file: + type: string + description: file to upload + format: binary + responses: + 200: + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + security: + - petstore_auth: + - write:pets + - read:pets + /store/inventory: + get: + tags: + - store + summary: Returns pet inventories by status + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + 200: + description: successful operation + content: + application/json: + schema: + type: object + additionalProperties: + type: integer + format: int32 + security: + - api_key: [] + /store/order: + post: + tags: + - store + summary: Place an order for a pet + operationId: placeOrder + requestBody: + description: order placed for purchasing the pet + content: + '*/*': + schema: + $ref: '#/components/schemas/Order' + required: true + responses: + 200: + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + 400: + description: Invalid Order + content: {} + x-codegen-request-body-name: body + /store/order/{orderId}: + get: + tags: + - store + summary: Find purchase order by ID + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - name: orderId + in: path + description: ID of pet that needs to be fetched + required: true + schema: + maximum: 5 + minimum: 1 + type: integer + format: int64 + responses: + 200: + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + 400: + description: Invalid ID supplied + content: {} + 404: + description: Order not found + content: {} + delete: + tags: + - store + summary: Delete purchase order by ID + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - name: orderId + in: path + description: ID of the order that needs to be deleted + required: true + schema: + type: string + responses: + 400: + description: Invalid ID supplied + content: {} + 404: + description: Order not found + content: {} + /user: + post: + tags: + - user + summary: Create user + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + description: Created user object + content: + '*/*': + schema: + $ref: '#/components/schemas/User' + required: true + responses: + default: + description: successful operation + content: {} + x-codegen-request-body-name: body + /user/createWithArray: + post: + tags: + - user + summary: Creates list of users with given input array + operationId: createUsersWithArrayInput + requestBody: + description: List of user object + content: + '*/*': + schema: + type: array + items: + $ref: '#/components/schemas/User' + required: true + responses: + default: + description: successful operation + content: {} + x-codegen-request-body-name: body + /user/createWithList: + post: + tags: + - user + summary: Creates list of users with given input array + operationId: createUsersWithListInput + requestBody: + description: List of user object + content: + '*/*': + schema: + type: array + items: + $ref: '#/components/schemas/User' + required: true + responses: + default: + description: successful operation + content: {} + x-codegen-request-body-name: body + /user/login: + get: + tags: + - user + summary: Logs user into the system + operationId: loginUser + parameters: + - name: username + in: query + description: The user name for login + required: true + schema: + type: string + - name: password + in: query + description: The password for login in clear text + required: true + schema: + type: string + responses: + 200: + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + schema: + type: integer + format: int32 + X-Expires-After: + description: date in UTC when token expires + schema: + type: string + format: date-time + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + 400: + description: Invalid username/password supplied + content: {} + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + operationId: logoutUser + responses: + default: + description: successful operation + content: {} + options: + tags: + - user + summary: logoutUserOptions + operationId: logoutUserOptions + responses: + default: + description: endpoint configuration response + content: {} + /user/{username}: + get: + tags: + - user + summary: Get user by user name + operationId: getUserByName + parameters: + - name: username + in: path + description: The name that needs to be fetched. Use user1 for testing. + required: true + schema: + type: string + responses: + 200: + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + 400: + description: Invalid username supplied + content: {} + 404: + description: User not found + content: {} + put: + tags: + - user + summary: Updated user + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - name: username + in: path + description: name that need to be deleted + required: true + schema: + type: string + requestBody: + description: Updated user object + content: + '*/*': + schema: + $ref: '#/components/schemas/User' + required: true + responses: + 400: + description: Invalid user supplied + content: {} + 404: + description: User not found + content: {} + x-codegen-request-body-name: body + delete: + tags: + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + schema: + type: string + responses: + 400: + description: Invalid username supplied + content: {} + 404: + description: User not found + content: {} +components: + schemas: + Order: + title: Pet Order + type: object + properties: + id: + type: integer + format: int64 + petId: + type: integer + format: int64 + quantity: + type: integer + format: int32 + shipDate: + type: string + format: date-time + status: + type: string + description: Order Status + enum: + - placed + - approved + - delivered + complete: + type: boolean + default: false + description: An order for a pets from the pet store + xml: + name: Order + Category: + title: Pet category + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + description: A category for a pet + xml: + name: Category + User: + title: a User + type: object + properties: + id: + type: integer + format: int64 + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + type: integer + description: User Status + format: int32 + description: A User who is purchasing from the pet store + xml: + name: User + Tag: + title: Pet Tag + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + description: A tag for a pet + xml: + name: Tag + Pet: + title: a Pet + required: + - name + - photoUrls + type: object + properties: + id: + type: integer + format: int64 + category: + $ref: '#/components/schemas/Category' + name: + type: string + example: doggie + photoUrls: + type: array + xml: + name: photoUrl + wrapped: true + items: + type: string + tags: + type: array + xml: + name: tag + wrapped: true + items: + $ref: '#/components/schemas/Tag' + status: + type: string + description: pet status in the store + enum: + - available + - pending + - sold + description: A pet for sale in the pet store + xml: + name: Pet + ApiResponse: + title: An uploaded response + type: object + properties: + code: + type: integer + format: int32 + type: + type: string + message: + type: string + description: Describes the result of uploading an image resource + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + api_key: + type: apiKey + name: api_key + in: header + diff --git a/samples/client/petstore/spring-cloud-async/.openapi-generator-ignore b/samples/client/petstore/spring-cloud-async/.openapi-generator-ignore deleted file mode 100644 index 7484ee590a3..00000000000 --- a/samples/client/petstore/spring-cloud-async/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/client/petstore/spring-cloud-async/.openapi-generator/FILES b/samples/client/petstore/spring-cloud-async/.openapi-generator/FILES deleted file mode 100644 index 3510d2b2d27..00000000000 --- a/samples/client/petstore/spring-cloud-async/.openapi-generator/FILES +++ /dev/null @@ -1,16 +0,0 @@ -README.md -pom.xml -src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiClient.java -src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiClient.java -src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiClient.java -src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java -src/main/java/org/openapitools/configuration/ClientConfiguration.java -src/main/java/org/openapitools/model/Category.java -src/main/java/org/openapitools/model/ModelApiResponse.java -src/main/java/org/openapitools/model/Order.java -src/main/java/org/openapitools/model/Pet.java -src/main/java/org/openapitools/model/Tag.java -src/main/java/org/openapitools/model/User.java diff --git a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION deleted file mode 100644 index 7f4d792ec2c..00000000000 --- a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-async/README.md b/samples/client/petstore/spring-cloud-async/README.md deleted file mode 100644 index f176b79c8ae..00000000000 --- a/samples/client/petstore/spring-cloud-async/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# petstore-spring-cloud - -## Requirements - -Building the API client library requires [Maven](https://maven.apache.org/) to be installed. - -## Installation - -To install the API client library to your local Maven repository, simply execute: - -```shell -mvn install -``` - -To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: - -```shell -mvn deploy -``` - -Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. - -### Maven users - -Add this dependency to your project's POM: - -```xml - - org.openapitools - petstore-spring-cloud - 1.0.0 - compile - -``` - -### Gradle users - -Add this dependency to your project's build file: - -```groovy -compile "org.openapitools:petstore-spring-cloud:1.0.0" -``` - -### Others - -At first generate the JAR by executing: - -mvn package - -Then manually install the following JARs: - -* target/petstore-spring-cloud-1.0.0.jar -* target/lib/*.jar diff --git a/samples/client/petstore/spring-cloud-async/pom.xml b/samples/client/petstore/spring-cloud-async/pom.xml deleted file mode 100644 index e893d0fa75f..00000000000 --- a/samples/client/petstore/spring-cloud-async/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - 4.0.0 - org.openapitools - petstore-spring-cloud - jar - petstore-spring-cloud - 1.0.0 - - 1.8 - ${java.version} - ${java.version} - UTF-8 - 2.9.2 - - - org.springframework.boot - spring-boot-starter-parent - 2.7.6 - - - - src/main/java - - - - - - org.springframework.cloud - spring-cloud-starter-parent - 2021.0.5 - pom - import - - - - - - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.data - spring-data-commons - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java deleted file mode 100644 index 699618ea67f..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ /dev/null @@ -1,309 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "pet", description = "Everything about your Pets") -public interface PetApi { - - /** - * POST /pet : Add a new pet to the store - * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid input (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Add a new pet to the store", - nickname = "addPet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 405, message = "Invalid input") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet", - consumes = "application/json" - ) - CompletableFuture> addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ); - - - /** - * DELETE /pet/{petId} : Deletes a pet - * - * @param petId Pet id to delete (required) - * @param apiKey (optional) - * @return Invalid pet value (status code 400) - */ - @ApiOperation( - tags = { "pet" }, - value = "Deletes a pet", - nickname = "deletePet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid pet value") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/pet/{petId}" - ) - CompletableFuture> deletePet( - @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey - ); - - - /** - * GET /pet/findByStatus : Finds Pets by status - * Multiple status values can be provided with comma separated strings - * - * @param status Status values that need to be considered for filter (required) - * @return successful operation (status code 200) - * or Invalid status value (status code 400) - */ - @ApiOperation( - tags = { "pet" }, - value = "Finds Pets by status", - nickname = "findPetsByStatus", - notes = "Multiple status values can be provided with comma separated strings", - response = Pet.class, - responseContainer = "List", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid status value") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByStatus", - produces = "application/json" - ) - CompletableFuture>> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status - ); - - - /** - * GET /pet/findByTags : Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @param tags Tags to filter by (required) - * @return successful operation (status code 200) - * or Invalid tag value (status code 400) - * @deprecated - */ - @Deprecated - @ApiOperation( - tags = { "pet" }, - value = "Finds Pets by tags", - nickname = "findPetsByTags", - notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", - response = Pet.class, - responseContainer = "List", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid tag value") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByTags", - produces = "application/json" - ) - CompletableFuture>> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags - ); - - - /** - * GET /pet/{petId} : Find pet by ID - * Returns a single pet - * - * @param petId ID of pet to return (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - */ - @ApiOperation( - tags = { "pet" }, - value = "Find pet by ID", - nickname = "getPetById", - notes = "Returns a single pet", - response = Pet.class, - authorizations = { - @Authorization(value = "api_key") - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class), - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Pet not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/{petId}", - produces = "application/json" - ) - CompletableFuture> getPetById( - @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId - ); - - - /** - * PUT /pet : Update an existing pet - * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * or Validation exception (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Update an existing pet", - nickname = "updatePet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Pet not found"), - @ApiResponse(code = 405, message = "Validation exception") - }) - @RequestMapping( - method = RequestMethod.PUT, - value = "/pet", - consumes = "application/json" - ) - CompletableFuture> updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ); - - - /** - * POST /pet/{petId} : Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated (required) - * @param name Updated name of the pet (optional) - * @param status Updated status of the pet (optional) - * @return Invalid input (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Updates a pet in the store with form data", - nickname = "updatePetWithForm", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 405, message = "Invalid input") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}", - consumes = "application/x-www-form-urlencoded" - ) - CompletableFuture> updatePetWithForm( - @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, - @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status - ); - - - /** - * POST /pet/{petId}/uploadImage : uploads an image - * - * @param petId ID of pet to update (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @param file file to upload (optional) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "pet" }, - value = "uploads an image", - nickname = "uploadFile", - notes = "", - response = ModelApiResponse.class, - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}/uploadImage", - produces = "application/json", - consumes = "multipart/form-data" - ) - CompletableFuture> uploadFile( - @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, - @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file - ); - -} diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApiClient.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApiClient.java deleted file mode 100644 index f80fe4ddc67..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApiClient.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.openapitools.api; - -import org.springframework.cloud.openfeign.FeignClient; -import org.openapitools.configuration.ClientConfiguration; - -@FeignClient(name="${pet.name:pet}", url="${pet.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class) -public interface PetApiClient extends PetApi { -} diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java deleted file mode 100644 index a5a1c63c5aa..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ /dev/null @@ -1,147 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "store", description = "Access to Petstore orders") -public interface StoreApi { - - /** - * DELETE /store/order/{orderId} : Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * - * @param orderId ID of the order that needs to be deleted (required) - * @return Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @ApiOperation( - tags = { "store" }, - value = "Delete purchase order by ID", - nickname = "deleteOrder", - notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors" - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Order not found") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/store/order/{orderId}" - ) - CompletableFuture> deleteOrder( - @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId - ); - - - /** - * GET /store/inventory : Returns pet inventories by status - * Returns a map of status codes to quantities - * - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "store" }, - value = "Returns pet inventories by status", - nickname = "getInventory", - notes = "Returns a map of status codes to quantities", - response = Integer.class, - responseContainer = "Map", - authorizations = { - @Authorization(value = "api_key") - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/inventory", - produces = "application/json" - ) - CompletableFuture>> getInventory( - - ); - - - /** - * GET /store/order/{orderId} : Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - * - * @param orderId ID of pet that needs to be fetched (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @ApiOperation( - tags = { "store" }, - value = "Find purchase order by ID", - nickname = "getOrderById", - notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", - response = Order.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Order not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/order/{orderId}", - produces = "application/json" - ) - CompletableFuture> getOrderById( - @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId - ); - - - /** - * POST /store/order : Place an order for a pet - * - * @param body order placed for purchasing the pet (required) - * @return successful operation (status code 200) - * or Invalid Order (status code 400) - */ - @ApiOperation( - tags = { "store" }, - value = "Place an order for a pet", - nickname = "placeOrder", - notes = "", - response = Order.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid Order") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/store/order", - produces = "application/json" - ) - CompletableFuture> placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body - ); - -} diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApiClient.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApiClient.java deleted file mode 100644 index 71d613a871d..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApiClient.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.openapitools.api; - -import org.springframework.cloud.openfeign.FeignClient; -import org.openapitools.configuration.ClientConfiguration; - -@FeignClient(name="${store.name:store}", url="${store.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class) -public interface StoreApiClient extends StoreApi { -} diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java deleted file mode 100644 index 7c1808d367e..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ /dev/null @@ -1,244 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "user", description = "Operations about user") -public interface UserApi { - - /** - * POST /user : Create user - * This can only be done by the logged in user. - * - * @param body Created user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Create user", - nickname = "createUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user" - ) - CompletableFuture> createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body - ); - - - /** - * POST /user/createWithArray : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Creates list of users with given input array", - nickname = "createUsersWithArrayInput", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithArray" - ) - CompletableFuture> createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body - ); - - - /** - * POST /user/createWithList : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Creates list of users with given input array", - nickname = "createUsersWithListInput", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithList" - ) - CompletableFuture> createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body - ); - - - /** - * DELETE /user/{username} : Delete user - * This can only be done by the logged in user. - * - * @param username The name that needs to be deleted (required) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Delete user", - nickname = "deleteUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid username supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/user/{username}" - ) - CompletableFuture> deleteUser( - @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username - ); - - - /** - * GET /user/{username} : Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. (required) - * @return successful operation (status code 200) - * or Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Get user by user name", - nickname = "getUserByName", - notes = "", - response = User.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = User.class), - @ApiResponse(code = 400, message = "Invalid username supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/{username}", - produces = "application/json" - ) - CompletableFuture> getUserByName( - @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username - ); - - - /** - * GET /user/login : Logs user into the system - * - * @param username The user name for login (required) - * @param password The password for login in clear text (required) - * @return successful operation (status code 200) - * or Invalid username/password supplied (status code 400) - */ - @ApiOperation( - tags = { "user" }, - value = "Logs user into the system", - nickname = "loginUser", - notes = "", - response = String.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = String.class), - @ApiResponse(code = 400, message = "Invalid username/password supplied") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/login", - produces = "application/json" - ) - CompletableFuture> loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password - ); - - - /** - * GET /user/logout : Logs out current logged in user session - * - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Logs out current logged in user session", - nickname = "logoutUser", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/logout" - ) - CompletableFuture> logoutUser( - - ); - - - /** - * PUT /user/{username} : Updated user - * This can only be done by the logged in user. - * - * @param username name that need to be deleted (required) - * @param body Updated user object (required) - * @return Invalid user supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Updated user", - nickname = "updateUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid user supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.PUT, - value = "/user/{username}" - ) - CompletableFuture> updateUser( - @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body - ); - -} diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApiClient.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApiClient.java deleted file mode 100644 index 1db4598108d..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApiClient.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.openapitools.api; - -import org.springframework.cloud.openfeign.FeignClient; -import org.openapitools.configuration.ClientConfiguration; - -@FeignClient(name="${user.name:user}", url="${user.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class) -public interface UserApiClient extends UserApi { -} diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java deleted file mode 100644 index 199278dcb53..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.openapitools.configuration; - -import feign.RequestInterceptor; -import feign.RequestTemplate; -import feign.Util; - - -public class ApiKeyRequestInterceptor implements RequestInterceptor { - private final String location; - private final String name; - private String value; - - public ApiKeyRequestInterceptor(String location, String name, String value) { - Util.checkNotNull(location, "location", new Object[0]); - Util.checkNotNull(name, "name", new Object[0]); - Util.checkNotNull(value, "value", new Object[0]); - this.location = location; - this.name = name; - this.value = value; - } - - @Override - public void apply(RequestTemplate requestTemplate) { - if(location.equals("header")) { - requestTemplate.header(name, value); - } else if(location.equals("query")) { - requestTemplate.query(name, value); - } - } - -} diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java deleted file mode 100644 index 49f1c66c11a..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.openapitools.configuration; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor; -import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext; -import org.springframework.security.oauth2.client.OAuth2ClientContext; -import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails; - -@Configuration -@EnableConfigurationProperties -public class ClientConfiguration { - - @Bean - @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id") - public OAuth2FeignRequestInterceptor petstoreAuthRequestInterceptor(OAuth2ClientContext oAuth2ClientContext) { - return new OAuth2FeignRequestInterceptor(oAuth2ClientContext, petstoreAuthResourceDetails()); - } - - @Bean - @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id") - public OAuth2ClientContext oAuth2ClientContext() { - return new DefaultOAuth2ClientContext(); - } - - @Bean - @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id") - @ConfigurationProperties("openapipetstore.security.petstoreAuth") - public ImplicitResourceDetails petstoreAuthResourceDetails() { - ImplicitResourceDetails details = new ImplicitResourceDetails(); - details.setUserAuthorizationUri("http://petstore.swagger.io/api/oauth/dialog"); - return details; - } - - @Value("${openapipetstore.security.apiKey.key:}") - private String apiKeyKey; - - @Bean - @ConditionalOnProperty(name = "openapipetstore.security.apiKey.key") - public ApiKeyRequestInterceptor apiKeyRequestInterceptor() { - return new ApiKeyRequestInterceptor("header", "api_key", this.apiKeyKey); - } - -} diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java deleted file mode 100644 index 9f5ef4d9f1a..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A category for a pet - */ - -@ApiModel(description = "A category for a pet") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Category { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Category id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Category name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @ApiModelProperty(value = "") - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Category category = (Category) o; - return Objects.equals(this.id, category.id) && - Objects.equals(this.name, category.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Category {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java deleted file mode 100644 index 52fb11fd3cf..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Describes the result of uploading an image resource - */ - -@ApiModel(description = "Describes the result of uploading an image resource") -@JsonTypeName("ApiResponse") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelApiResponse { - - @JsonProperty("code") - private Integer code; - - @JsonProperty("type") - private String type; - - @JsonProperty("message") - private String message; - - public ModelApiResponse code(Integer code) { - this.code = code; - return this; - } - - /** - * Get code - * @return code - */ - - @ApiModelProperty(value = "") - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public ModelApiResponse type(String type) { - this.type = type; - return this; - } - - /** - * Get type - * @return type - */ - - @ApiModelProperty(value = "") - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public ModelApiResponse message(String message) { - this.message = message; - return this; - } - - /** - * Get message - * @return message - */ - - @ApiModelProperty(value = "") - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelApiResponse _apiResponse = (ModelApiResponse) o; - return Objects.equals(this.code, _apiResponse.code) && - Objects.equals(this.type, _apiResponse.type) && - Objects.equals(this.message, _apiResponse.message); - } - - @Override - public int hashCode() { - return Objects.hash(code, type, message); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelApiResponse {\n"); - sb.append(" code: ").append(toIndentedString(code)).append("\n"); - sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" message: ").append(toIndentedString(message)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java deleted file mode 100644 index 66d9df6dfd9..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java +++ /dev/null @@ -1,246 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.time.OffsetDateTime; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * An order for a pets from the pet store - */ - -@ApiModel(description = "An order for a pets from the pet store") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Order { - - @JsonProperty("id") - private Long id; - - @JsonProperty("petId") - private Long petId; - - @JsonProperty("quantity") - private Integer quantity; - - @JsonProperty("shipDate") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime shipDate; - - /** - * Order Status - */ - public enum StatusEnum { - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - @JsonProperty("complete") - private Boolean complete = false; - - public Order id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Order petId(Long petId) { - this.petId = petId; - return this; - } - - /** - * Get petId - * @return petId - */ - - @ApiModelProperty(value = "") - public Long getPetId() { - return petId; - } - - public void setPetId(Long petId) { - this.petId = petId; - } - - public Order quantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - /** - * Get quantity - * @return quantity - */ - - @ApiModelProperty(value = "") - public Integer getQuantity() { - return quantity; - } - - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - public Order shipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - return this; - } - - /** - * Get shipDate - * @return shipDate - */ - @Valid - @ApiModelProperty(value = "") - public OffsetDateTime getShipDate() { - return shipDate; - } - - public void setShipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - } - - public Order status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * Order Status - * @return status - */ - - @ApiModelProperty(value = "Order Status") - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - public Order complete(Boolean complete) { - this.complete = complete; - return this; - } - - /** - * Get complete - * @return complete - */ - - @ApiModelProperty(value = "") - public Boolean getComplete() { - return complete; - } - - public void setComplete(Boolean complete) { - this.complete = complete; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Order order = (Order) o; - return Objects.equals(this.id, order.id) && - Objects.equals(this.petId, order.petId) && - Objects.equals(this.quantity, order.quantity) && - Objects.equals(this.shipDate, order.shipDate) && - Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete); - } - - @Override - public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Order {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); - sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); - sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java deleted file mode 100644 index b30aa3fd9a2..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A tag for a pet - */ - -@ApiModel(description = "A tag for a pet") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Tag { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Tag id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Tag name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @ApiModelProperty(value = "") - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Tag tag = (Tag) o; - return Objects.equals(this.id, tag.id) && - Objects.equals(this.name, tag.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Tag {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java deleted file mode 100644 index 8d71f0fcc04..00000000000 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java +++ /dev/null @@ -1,253 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A User who is purchasing from the pet store - */ - -@ApiModel(description = "A User who is purchasing from the pet store") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class User { - - @JsonProperty("id") - private Long id; - - @JsonProperty("username") - private String username; - - @JsonProperty("firstName") - private String firstName; - - @JsonProperty("lastName") - private String lastName; - - @JsonProperty("email") - private String email; - - @JsonProperty("password") - private String password; - - @JsonProperty("phone") - private String phone; - - @JsonProperty("userStatus") - private Integer userStatus; - - public User id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public User username(String username) { - this.username = username; - return this; - } - - /** - * Get username - * @return username - */ - - @ApiModelProperty(value = "") - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public User firstName(String firstName) { - this.firstName = firstName; - return this; - } - - /** - * Get firstName - * @return firstName - */ - - @ApiModelProperty(value = "") - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public User lastName(String lastName) { - this.lastName = lastName; - return this; - } - - /** - * Get lastName - * @return lastName - */ - - @ApiModelProperty(value = "") - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public User email(String email) { - this.email = email; - return this; - } - - /** - * Get email - * @return email - */ - - @ApiModelProperty(value = "") - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public User password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - - @ApiModelProperty(value = "") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public User phone(String phone) { - this.phone = phone; - return this; - } - - /** - * Get phone - * @return phone - */ - - @ApiModelProperty(value = "") - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public User userStatus(Integer userStatus) { - this.userStatus = userStatus; - return this; - } - - /** - * User Status - * @return userStatus - */ - - @ApiModelProperty(value = "User Status") - public Integer getUserStatus() { - return userStatus; - } - - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - User user = (User) o; - return Objects.equals(this.id, user.id) && - Objects.equals(this.username, user.username) && - Objects.equals(this.firstName, user.firstName) && - Objects.equals(this.lastName, user.lastName) && - Objects.equals(this.email, user.email) && - Objects.equals(this.password, user.password) && - Objects.equals(this.phone, user.phone) && - Objects.equals(this.userStatus, user.userStatus); - } - - @Override - public int hashCode() { - return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" username: ").append(toIndentedString(username)).append("\n"); - sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); - sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); - sb.append(" email: ").append(toIndentedString(email)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); - sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator-ignore b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator-ignore deleted file mode 100644 index 7484ee590a3..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/FILES b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/FILES deleted file mode 100644 index 3510d2b2d27..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/FILES +++ /dev/null @@ -1,16 +0,0 @@ -README.md -pom.xml -src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiClient.java -src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiClient.java -src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiClient.java -src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java -src/main/java/org/openapitools/configuration/ClientConfiguration.java -src/main/java/org/openapitools/model/Category.java -src/main/java/org/openapitools/model/ModelApiResponse.java -src/main/java/org/openapitools/model/Order.java -src/main/java/org/openapitools/model/Pet.java -src/main/java/org/openapitools/model/Tag.java -src/main/java/org/openapitools/model/User.java diff --git a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION deleted file mode 100644 index 7f4d792ec2c..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-spring-pageable/README.md b/samples/client/petstore/spring-cloud-spring-pageable/README.md deleted file mode 100644 index 6d07c5eb9af..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# spring-cloud-spring-pageable - -## Requirements - -Building the API client library requires [Maven](https://maven.apache.org/) to be installed. - -## Installation - -To install the API client library to your local Maven repository, simply execute: - -```shell -mvn install -``` - -To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: - -```shell -mvn deploy -``` - -Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. - -### Maven users - -Add this dependency to your project's POM: - -```xml - - org.openapitools - spring-cloud-spring-pageable - 1.0.0 - compile - -``` - -### Gradle users - -Add this dependency to your project's build file: - -```groovy -compile "org.openapitools:spring-cloud-spring-pageable:1.0.0" -``` - -### Others - -At first generate the JAR by executing: - -mvn package - -Then manually install the following JARs: - -* target/spring-cloud-spring-pageable-1.0.0.jar -* target/lib/*.jar diff --git a/samples/client/petstore/spring-cloud-spring-pageable/pom.xml b/samples/client/petstore/spring-cloud-spring-pageable/pom.xml deleted file mode 100644 index 027c3fae62c..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - 4.0.0 - org.openapitools - spring-cloud-spring-pageable - jar - spring-cloud-spring-pageable - 1.0.0 - - 1.8 - ${java.version} - ${java.version} - UTF-8 - 2.9.2 - - - org.springframework.boot - spring-boot-starter-parent - 2.7.6 - - - - src/main/java - - - - - - org.springframework.cloud - spring-cloud-starter-parent - 2021.0.5 - pom - import - - - - - - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.data - spring-data-commons - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java deleted file mode 100644 index 99777fe2496..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ /dev/null @@ -1,312 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import springfox.documentation.annotations.ApiIgnore; -import org.openapitools.model.ModelApiResponse; -import org.springframework.data.domain.Pageable; -import org.openapitools.model.Pet; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "pet", description = "Everything about your Pets") -public interface PetApi { - - /** - * POST /pet : Add a new pet to the store - * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid input (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Add a new pet to the store", - nickname = "addPet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 405, message = "Invalid input") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet", - consumes = "application/json" - ) - ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ); - - - /** - * DELETE /pet/{petId} : Deletes a pet - * - * @param petId Pet id to delete (required) - * @param apiKey (optional) - * @return Invalid pet value (status code 400) - */ - @ApiOperation( - tags = { "pet" }, - value = "Deletes a pet", - nickname = "deletePet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid pet value") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/pet/{petId}" - ) - ResponseEntity deletePet( - @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey - ); - - - /** - * GET /pet/findByStatus : Finds Pets by status - * Multiple status values can be provided with comma separated strings - * - * @param status Status values that need to be considered for filter (required) - * @return successful operation (status code 200) - * or Invalid status value (status code 400) - */ - @ApiOperation( - tags = { "pet" }, - value = "Finds Pets by status", - nickname = "findPetsByStatus", - notes = "Multiple status values can be provided with comma separated strings", - response = Pet.class, - responseContainer = "List", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid status value") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByStatus", - produces = "application/json" - ) - ResponseEntity> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, - @ApiIgnore final Pageable pageable - ); - - - /** - * GET /pet/findByTags : Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @param tags Tags to filter by (required) - * @return successful operation (status code 200) - * or Invalid tag value (status code 400) - * @deprecated - */ - @Deprecated - @ApiOperation( - tags = { "pet" }, - value = "Finds Pets by tags", - nickname = "findPetsByTags", - notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", - response = Pet.class, - responseContainer = "List", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid tag value") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByTags", - produces = "application/json" - ) - ResponseEntity> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, - @ApiIgnore final Pageable pageable - ); - - - /** - * GET /pet/{petId} : Find pet by ID - * Returns a single pet - * - * @param petId ID of pet to return (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - */ - @ApiOperation( - tags = { "pet" }, - value = "Find pet by ID", - nickname = "getPetById", - notes = "Returns a single pet", - response = Pet.class, - authorizations = { - @Authorization(value = "api_key") - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class), - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Pet not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/{petId}", - produces = "application/json" - ) - ResponseEntity getPetById( - @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId - ); - - - /** - * PUT /pet : Update an existing pet - * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * or Validation exception (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Update an existing pet", - nickname = "updatePet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Pet not found"), - @ApiResponse(code = 405, message = "Validation exception") - }) - @RequestMapping( - method = RequestMethod.PUT, - value = "/pet", - consumes = "application/json" - ) - ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ); - - - /** - * POST /pet/{petId} : Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated (required) - * @param name Updated name of the pet (optional) - * @param status Updated status of the pet (optional) - * @return Invalid input (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Updates a pet in the store with form data", - nickname = "updatePetWithForm", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 405, message = "Invalid input") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}", - consumes = "application/x-www-form-urlencoded" - ) - ResponseEntity updatePetWithForm( - @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, - @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status - ); - - - /** - * POST /pet/{petId}/uploadImage : uploads an image - * - * @param petId ID of pet to update (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @param file file to upload (optional) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "pet" }, - value = "uploads an image", - nickname = "uploadFile", - notes = "", - response = ModelApiResponse.class, - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}/uploadImage", - produces = "application/json", - consumes = "multipart/form-data" - ) - ResponseEntity uploadFile( - @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, - @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file - ); - -} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApiClient.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApiClient.java deleted file mode 100644 index f80fe4ddc67..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApiClient.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.openapitools.api; - -import org.springframework.cloud.openfeign.FeignClient; -import org.openapitools.configuration.ClientConfiguration; - -@FeignClient(name="${pet.name:pet}", url="${pet.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class) -public interface PetApiClient extends PetApi { -} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java deleted file mode 100644 index 3d01a3785e5..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ /dev/null @@ -1,146 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "store", description = "Access to Petstore orders") -public interface StoreApi { - - /** - * DELETE /store/order/{orderId} : Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * - * @param orderId ID of the order that needs to be deleted (required) - * @return Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @ApiOperation( - tags = { "store" }, - value = "Delete purchase order by ID", - nickname = "deleteOrder", - notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors" - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Order not found") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/store/order/{orderId}" - ) - ResponseEntity deleteOrder( - @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId - ); - - - /** - * GET /store/inventory : Returns pet inventories by status - * Returns a map of status codes to quantities - * - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "store" }, - value = "Returns pet inventories by status", - nickname = "getInventory", - notes = "Returns a map of status codes to quantities", - response = Integer.class, - responseContainer = "Map", - authorizations = { - @Authorization(value = "api_key") - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/inventory", - produces = "application/json" - ) - ResponseEntity> getInventory( - - ); - - - /** - * GET /store/order/{orderId} : Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - * - * @param orderId ID of pet that needs to be fetched (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @ApiOperation( - tags = { "store" }, - value = "Find purchase order by ID", - nickname = "getOrderById", - notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", - response = Order.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Order not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/order/{orderId}", - produces = "application/json" - ) - ResponseEntity getOrderById( - @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId - ); - - - /** - * POST /store/order : Place an order for a pet - * - * @param body order placed for purchasing the pet (required) - * @return successful operation (status code 200) - * or Invalid Order (status code 400) - */ - @ApiOperation( - tags = { "store" }, - value = "Place an order for a pet", - nickname = "placeOrder", - notes = "", - response = Order.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid Order") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/store/order", - produces = "application/json" - ) - ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body - ); - -} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApiClient.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApiClient.java deleted file mode 100644 index 71d613a871d..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApiClient.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.openapitools.api; - -import org.springframework.cloud.openfeign.FeignClient; -import org.openapitools.configuration.ClientConfiguration; - -@FeignClient(name="${store.name:store}", url="${store.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class) -public interface StoreApiClient extends StoreApi { -} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java deleted file mode 100644 index 3ee2989fe8d..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ /dev/null @@ -1,266 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "user", description = "Operations about user") -public interface UserApi { - - /** - * POST /user : Create user - * This can only be done by the logged in user. - * - * @param body Created user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Create user", - nickname = "createUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user" - ) - ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body - ); - - - /** - * POST /user/createWithArray : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Creates list of users with given input array", - nickname = "createUsersWithArrayInput", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithArray" - ) - ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body - ); - - - /** - * POST /user/createWithList : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Creates list of users with given input array", - nickname = "createUsersWithListInput", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithList" - ) - ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body - ); - - - /** - * DELETE /user/{username} : Delete user - * This can only be done by the logged in user. - * - * @param username The name that needs to be deleted (required) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Delete user", - nickname = "deleteUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid username supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/user/{username}" - ) - ResponseEntity deleteUser( - @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username - ); - - - /** - * GET /user/{username} : Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. (required) - * @return successful operation (status code 200) - * or Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Get user by user name", - nickname = "getUserByName", - notes = "", - response = User.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = User.class), - @ApiResponse(code = 400, message = "Invalid username supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/{username}", - produces = "application/json" - ) - ResponseEntity getUserByName( - @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username - ); - - - /** - * GET /user/login : Logs user into the system - * - * @param username The user name for login (required) - * @param password The password for login in clear text (required) - * @return successful operation (status code 200) - * or Invalid username/password supplied (status code 400) - */ - @ApiOperation( - tags = { "user" }, - value = "Logs user into the system", - nickname = "loginUser", - notes = "", - response = String.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = String.class), - @ApiResponse(code = 400, message = "Invalid username/password supplied") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/login", - produces = "application/json" - ) - ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password - ); - - - /** - * GET /user/logout : Logs out current logged in user session - * - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Logs out current logged in user session", - nickname = "logoutUser", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/logout" - ) - ResponseEntity logoutUser( - - ); - - - /** - * OPTIONS /user/logout : logoutUserOptions - * - * @return endpoint configuration response (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "logoutUserOptions", - nickname = "logoutUserOptions", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "endpoint configuration response") - }) - @RequestMapping( - method = RequestMethod.OPTIONS, - value = "/user/logout" - ) - ResponseEntity logoutUserOptions( - - ); - - - /** - * PUT /user/{username} : Updated user - * This can only be done by the logged in user. - * - * @param username name that need to be deleted (required) - * @param body Updated user object (required) - * @return Invalid user supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Updated user", - nickname = "updateUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid user supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.PUT, - value = "/user/{username}" - ) - ResponseEntity updateUser( - @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body - ); - -} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApiClient.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApiClient.java deleted file mode 100644 index 1db4598108d..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApiClient.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.openapitools.api; - -import org.springframework.cloud.openfeign.FeignClient; -import org.openapitools.configuration.ClientConfiguration; - -@FeignClient(name="${user.name:user}", url="${user.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class) -public interface UserApiClient extends UserApi { -} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java deleted file mode 100644 index 199278dcb53..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.openapitools.configuration; - -import feign.RequestInterceptor; -import feign.RequestTemplate; -import feign.Util; - - -public class ApiKeyRequestInterceptor implements RequestInterceptor { - private final String location; - private final String name; - private String value; - - public ApiKeyRequestInterceptor(String location, String name, String value) { - Util.checkNotNull(location, "location", new Object[0]); - Util.checkNotNull(name, "name", new Object[0]); - Util.checkNotNull(value, "value", new Object[0]); - this.location = location; - this.name = name; - this.value = value; - } - - @Override - public void apply(RequestTemplate requestTemplate) { - if(location.equals("header")) { - requestTemplate.header(name, value); - } else if(location.equals("query")) { - requestTemplate.query(name, value); - } - } - -} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java deleted file mode 100644 index 49f1c66c11a..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.openapitools.configuration; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor; -import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext; -import org.springframework.security.oauth2.client.OAuth2ClientContext; -import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails; - -@Configuration -@EnableConfigurationProperties -public class ClientConfiguration { - - @Bean - @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id") - public OAuth2FeignRequestInterceptor petstoreAuthRequestInterceptor(OAuth2ClientContext oAuth2ClientContext) { - return new OAuth2FeignRequestInterceptor(oAuth2ClientContext, petstoreAuthResourceDetails()); - } - - @Bean - @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id") - public OAuth2ClientContext oAuth2ClientContext() { - return new DefaultOAuth2ClientContext(); - } - - @Bean - @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id") - @ConfigurationProperties("openapipetstore.security.petstoreAuth") - public ImplicitResourceDetails petstoreAuthResourceDetails() { - ImplicitResourceDetails details = new ImplicitResourceDetails(); - details.setUserAuthorizationUri("http://petstore.swagger.io/api/oauth/dialog"); - return details; - } - - @Value("${openapipetstore.security.apiKey.key:}") - private String apiKeyKey; - - @Bean - @ConditionalOnProperty(name = "openapipetstore.security.apiKey.key") - public ApiKeyRequestInterceptor apiKeyRequestInterceptor() { - return new ApiKeyRequestInterceptor("header", "api_key", this.apiKeyKey); - } - -} diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java deleted file mode 100644 index 9f5ef4d9f1a..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A category for a pet - */ - -@ApiModel(description = "A category for a pet") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Category { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Category id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Category name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @ApiModelProperty(value = "") - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Category category = (Category) o; - return Objects.equals(this.id, category.id) && - Objects.equals(this.name, category.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Category {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java deleted file mode 100644 index 52fb11fd3cf..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Describes the result of uploading an image resource - */ - -@ApiModel(description = "Describes the result of uploading an image resource") -@JsonTypeName("ApiResponse") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelApiResponse { - - @JsonProperty("code") - private Integer code; - - @JsonProperty("type") - private String type; - - @JsonProperty("message") - private String message; - - public ModelApiResponse code(Integer code) { - this.code = code; - return this; - } - - /** - * Get code - * @return code - */ - - @ApiModelProperty(value = "") - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public ModelApiResponse type(String type) { - this.type = type; - return this; - } - - /** - * Get type - * @return type - */ - - @ApiModelProperty(value = "") - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public ModelApiResponse message(String message) { - this.message = message; - return this; - } - - /** - * Get message - * @return message - */ - - @ApiModelProperty(value = "") - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelApiResponse _apiResponse = (ModelApiResponse) o; - return Objects.equals(this.code, _apiResponse.code) && - Objects.equals(this.type, _apiResponse.type) && - Objects.equals(this.message, _apiResponse.message); - } - - @Override - public int hashCode() { - return Objects.hash(code, type, message); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelApiResponse {\n"); - sb.append(" code: ").append(toIndentedString(code)).append("\n"); - sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" message: ").append(toIndentedString(message)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java deleted file mode 100644 index 66d9df6dfd9..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ /dev/null @@ -1,246 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.time.OffsetDateTime; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * An order for a pets from the pet store - */ - -@ApiModel(description = "An order for a pets from the pet store") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Order { - - @JsonProperty("id") - private Long id; - - @JsonProperty("petId") - private Long petId; - - @JsonProperty("quantity") - private Integer quantity; - - @JsonProperty("shipDate") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime shipDate; - - /** - * Order Status - */ - public enum StatusEnum { - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - @JsonProperty("complete") - private Boolean complete = false; - - public Order id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Order petId(Long petId) { - this.petId = petId; - return this; - } - - /** - * Get petId - * @return petId - */ - - @ApiModelProperty(value = "") - public Long getPetId() { - return petId; - } - - public void setPetId(Long petId) { - this.petId = petId; - } - - public Order quantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - /** - * Get quantity - * @return quantity - */ - - @ApiModelProperty(value = "") - public Integer getQuantity() { - return quantity; - } - - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - public Order shipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - return this; - } - - /** - * Get shipDate - * @return shipDate - */ - @Valid - @ApiModelProperty(value = "") - public OffsetDateTime getShipDate() { - return shipDate; - } - - public void setShipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - } - - public Order status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * Order Status - * @return status - */ - - @ApiModelProperty(value = "Order Status") - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - public Order complete(Boolean complete) { - this.complete = complete; - return this; - } - - /** - * Get complete - * @return complete - */ - - @ApiModelProperty(value = "") - public Boolean getComplete() { - return complete; - } - - public void setComplete(Boolean complete) { - this.complete = complete; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Order order = (Order) o; - return Objects.equals(this.id, order.id) && - Objects.equals(this.petId, order.petId) && - Objects.equals(this.quantity, order.quantity) && - Objects.equals(this.shipDate, order.shipDate) && - Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete); - } - - @Override - public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Order {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); - sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); - sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java deleted file mode 100644 index b30aa3fd9a2..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A tag for a pet - */ - -@ApiModel(description = "A tag for a pet") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Tag { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Tag id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Tag name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @ApiModelProperty(value = "") - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Tag tag = (Tag) o; - return Objects.equals(this.id, tag.id) && - Objects.equals(this.name, tag.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Tag {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java deleted file mode 100644 index 8d71f0fcc04..00000000000 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java +++ /dev/null @@ -1,253 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A User who is purchasing from the pet store - */ - -@ApiModel(description = "A User who is purchasing from the pet store") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class User { - - @JsonProperty("id") - private Long id; - - @JsonProperty("username") - private String username; - - @JsonProperty("firstName") - private String firstName; - - @JsonProperty("lastName") - private String lastName; - - @JsonProperty("email") - private String email; - - @JsonProperty("password") - private String password; - - @JsonProperty("phone") - private String phone; - - @JsonProperty("userStatus") - private Integer userStatus; - - public User id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public User username(String username) { - this.username = username; - return this; - } - - /** - * Get username - * @return username - */ - - @ApiModelProperty(value = "") - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public User firstName(String firstName) { - this.firstName = firstName; - return this; - } - - /** - * Get firstName - * @return firstName - */ - - @ApiModelProperty(value = "") - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public User lastName(String lastName) { - this.lastName = lastName; - return this; - } - - /** - * Get lastName - * @return lastName - */ - - @ApiModelProperty(value = "") - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public User email(String email) { - this.email = email; - return this; - } - - /** - * Get email - * @return email - */ - - @ApiModelProperty(value = "") - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public User password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - - @ApiModelProperty(value = "") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public User phone(String phone) { - this.phone = phone; - return this; - } - - /** - * Get phone - * @return phone - */ - - @ApiModelProperty(value = "") - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public User userStatus(Integer userStatus) { - this.userStatus = userStatus; - return this; - } - - /** - * User Status - * @return userStatus - */ - - @ApiModelProperty(value = "User Status") - public Integer getUserStatus() { - return userStatus; - } - - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - User user = (User) o; - return Objects.equals(this.id, user.id) && - Objects.equals(this.username, user.username) && - Objects.equals(this.firstName, user.firstName) && - Objects.equals(this.lastName, user.lastName) && - Objects.equals(this.email, user.email) && - Objects.equals(this.password, user.password) && - Objects.equals(this.phone, user.phone) && - Objects.equals(this.userStatus, user.userStatus); - } - - @Override - public int hashCode() { - return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" username: ").append(toIndentedString(username)).append("\n"); - sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); - sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); - sb.append(" email: ").append(toIndentedString(email)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); - sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index 07fe6a8e9a5..a119abe880e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -41,15 +41,22 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid input (status code 405) + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid input (status code 405) */ @Operation( operationId = "addPet", summary = "Add a new pet to the store", + description = "", tags = { "pet" }, responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), + @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) + }), @ApiResponse(responseCode = "405", description = "Invalid input") }, security = { @@ -59,15 +66,17 @@ public interface PetApi { @RequestMapping( method = RequestMethod.POST, value = "/pet", + produces = "application/json", consumes = "application/json" ) - CompletableFuture> addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + CompletableFuture> addPet( + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -76,6 +85,7 @@ public interface PetApi { @Operation( operationId = "deletePet", summary = "Deletes a pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "400", description = "Invalid pet value") @@ -115,7 +125,7 @@ public interface PetApi { @ApiResponse(responseCode = "400", description = "Invalid status value") }, security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) + @SecurityRequirement(name = "petstore_auth", scopes={ "read:pets" }) } ) @RequestMapping( @@ -151,7 +161,7 @@ public interface PetApi { @ApiResponse(responseCode = "400", description = "Invalid tag value") }, security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) + @SecurityRequirement(name = "petstore_auth", scopes={ "read:pets" }) } ) @RequestMapping( @@ -202,37 +212,49 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid ID supplied (status code 400) + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) * or Validation exception (status code 405) + * API documentation for the updatePet operation + * @see Update an existing pet Documentation */ @Operation( operationId = "updatePet", summary = "Update an existing pet", + description = "", tags = { "pet" }, responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), + @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) + }), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Pet not found"), @ApiResponse(responseCode = "405", description = "Validation exception") }, security = { @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } + }, + externalDocs = @ExternalDocumentation(description = "API documentation for the updatePet operation", url = "http://petstore.swagger.io/v2/doc/updatePet") ) @RequestMapping( method = RequestMethod.PUT, value = "/pet", + produces = "application/json", consumes = "application/json" ) - CompletableFuture> updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + CompletableFuture> updatePet( + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -242,6 +264,7 @@ public interface PetApi { @Operation( operationId = "updatePetWithForm", summary = "Updates a pet in the store with form data", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "405", description = "Invalid input") @@ -264,6 +287,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -273,6 +297,7 @@ public interface PetApi { @Operation( operationId = "uploadFile", summary = "uploads an image", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 3f0ff1517fe..9e5d1ad6955 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -131,14 +131,16 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @Operation( operationId = "placeOrder", summary = "Place an order for a pet", + description = "", tags = { "store" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -151,10 +153,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = "application/json" + produces = "application/json", + consumes = "application/json" ) CompletableFuture> placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index c91b948c9a0..b435398acd3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -44,7 +44,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @Operation( @@ -54,60 +54,76 @@ public interface UserApi { tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = "application/json" ) CompletableFuture> createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithArrayInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = "application/json" ) CompletableFuture> createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ); /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithListInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = "application/json" ) CompletableFuture> createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ); @@ -127,6 +143,9 @@ public interface UserApi { responses = { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( @@ -140,6 +159,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -149,6 +169,7 @@ public interface UserApi { @Operation( operationId = "getUserByName", summary = "Get user by user name", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -171,6 +192,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -180,6 +202,7 @@ public interface UserApi { @Operation( operationId = "loginUser", summary = "Logs user into the system", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -195,22 +218,27 @@ public interface UserApi { produces = "application/json" ) CompletableFuture> loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password ); /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @Operation( operationId = "logoutUser", summary = "Logs out current logged in user session", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( @@ -227,7 +255,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -239,15 +267,19 @@ public interface UserApi { responses = { @ApiResponse(responseCode = "400", description = "Invalid user supplied"), @ApiResponse(responseCode = "404", description = "User not found") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = "application/json" ) CompletableFuture> updateUser( @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java index 2a90a2f0a4f..18b55b13d16 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java @@ -56,7 +56,7 @@ public class Category { * Get name * @return name */ - + @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String getName() { return name; diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java index 0c8523bbaff..e47e06fe14c 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java @@ -40,15 +40,22 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid input (status code 405) + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid input (status code 405) */ @Operation( operationId = "addPet", summary = "Add a new pet to the store", + description = "", tags = { "pet" }, responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), + @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) + }), @ApiResponse(responseCode = "405", description = "Invalid input") }, security = { @@ -58,15 +65,17 @@ public interface PetApi { @RequestMapping( method = RequestMethod.POST, value = "/pet", + produces = "application/json", consumes = "application/json" ) - ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ResponseEntity addPet( + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -75,6 +84,7 @@ public interface PetApi { @Operation( operationId = "deletePet", summary = "Deletes a pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "400", description = "Invalid pet value") @@ -114,7 +124,7 @@ public interface PetApi { @ApiResponse(responseCode = "400", description = "Invalid status value") }, security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) + @SecurityRequirement(name = "petstore_auth", scopes={ "read:pets" }) } ) @RequestMapping( @@ -150,7 +160,7 @@ public interface PetApi { @ApiResponse(responseCode = "400", description = "Invalid tag value") }, security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) + @SecurityRequirement(name = "petstore_auth", scopes={ "read:pets" }) } ) @RequestMapping( @@ -201,37 +211,49 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid ID supplied (status code 400) + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) * or Validation exception (status code 405) + * API documentation for the updatePet operation + * @see Update an existing pet Documentation */ @Operation( operationId = "updatePet", summary = "Update an existing pet", + description = "", tags = { "pet" }, responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), + @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) + }), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Pet not found"), @ApiResponse(responseCode = "405", description = "Validation exception") }, security = { @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } + }, + externalDocs = @ExternalDocumentation(description = "API documentation for the updatePet operation", url = "http://petstore.swagger.io/v2/doc/updatePet") ) @RequestMapping( method = RequestMethod.PUT, value = "/pet", + produces = "application/json", consumes = "application/json" ) - ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ResponseEntity updatePet( + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -241,6 +263,7 @@ public interface PetApi { @Operation( operationId = "updatePetWithForm", summary = "Updates a pet in the store with form data", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "405", description = "Invalid input") @@ -263,6 +286,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -272,6 +296,7 @@ public interface PetApi { @Operation( operationId = "uploadFile", summary = "uploads an image", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index 74f5f38a056..3b17078a953 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -130,14 +130,16 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @Operation( operationId = "placeOrder", summary = "Place an order for a pet", + description = "", tags = { "store" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -150,10 +152,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = "application/json" + produces = "application/json", + consumes = "application/json" ) ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) throws Exception; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index 8af73af9024..401408be66a 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java @@ -43,7 +43,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @Operation( @@ -53,60 +53,76 @@ public interface UserApi { tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = "application/json" ) ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) throws Exception; /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithArrayInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) throws Exception; /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithListInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) throws Exception; @@ -126,6 +142,9 @@ public interface UserApi { responses = { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( @@ -139,6 +158,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -148,6 +168,7 @@ public interface UserApi { @Operation( operationId = "getUserByName", summary = "Get user by user name", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -170,6 +191,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -179,6 +201,7 @@ public interface UserApi { @Operation( operationId = "loginUser", summary = "Logs user into the system", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -194,22 +217,27 @@ public interface UserApi { produces = "application/json" ) ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password ) throws Exception; /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @Operation( operationId = "logoutUser", summary = "Logs out current logged in user session", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( @@ -226,7 +254,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -238,15 +266,19 @@ public interface UserApi { responses = { @ApiResponse(responseCode = "400", description = "Invalid user supplied"), @ApiResponse(responseCode = "404", description = "User not found") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = "application/json" ) ResponseEntity updateUser( @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) throws Exception; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java index 2a90a2f0a4f..18b55b13d16 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java @@ -56,7 +56,7 @@ public class Category { * Get name * @return name */ - + @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String getName() { return name; diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index 6257b5d0c73..c64c29ae3f8 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -44,15 +44,22 @@ public interface PetApi { /** * POST /pet : Add a new pet to the store + * * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid input (status code 405) + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid input (status code 405) */ @Operation( operationId = "addPet", summary = "Add a new pet to the store", + description = "", tags = { "pet" }, responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), + @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) + }), @ApiResponse(responseCode = "405", description = "Invalid input") }, security = { @@ -62,11 +69,26 @@ public interface PetApi { @RequestMapping( method = RequestMethod.POST, value = "/pet", + produces = "application/json", consumes = "application/json" ) - default ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + default ResponseEntity addPet( + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -74,6 +96,7 @@ public interface PetApi { /** * DELETE /pet/{petId} : Deletes a pet + * * * @param petId Pet id to delete (required) * @param apiKey (optional) @@ -82,6 +105,7 @@ public interface PetApi { @Operation( operationId = "deletePet", summary = "Deletes a pet", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "400", description = "Invalid pet value") @@ -124,7 +148,7 @@ public interface PetApi { @ApiResponse(responseCode = "400", description = "Invalid status value") }, security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) + @SecurityRequirement(name = "petstore_auth", scopes={ "read:pets" }) } ) @RequestMapping( @@ -177,7 +201,7 @@ public interface PetApi { @ApiResponse(responseCode = "400", description = "Invalid tag value") }, security = { - @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) + @SecurityRequirement(name = "petstore_auth", scopes={ "read:pets" }) } ) @RequestMapping( @@ -262,33 +286,58 @@ public interface PetApi { /** * PUT /pet : Update an existing pet + * * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid ID supplied (status code 400) + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) * or Pet not found (status code 404) * or Validation exception (status code 405) + * API documentation for the updatePet operation + * @see Update an existing pet Documentation */ @Operation( operationId = "updatePet", summary = "Update an existing pet", + description = "", tags = { "pet" }, responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/xml", schema = @Schema(implementation = Pet.class)), + @Content(mediaType = "application/json", schema = @Schema(implementation = Pet.class)) + }), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Pet not found"), @ApiResponse(responseCode = "405", description = "Validation exception") }, security = { @SecurityRequirement(name = "petstore_auth", scopes={ "write:pets", "read:pets" }) - } + }, + externalDocs = @ExternalDocumentation(description = "API documentation for the updatePet operation", url = "http://petstore.swagger.io/v2/doc/updatePet") ) @RequestMapping( method = RequestMethod.PUT, value = "/pet", + produces = "application/json", consumes = "application/json" ) - default ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + default ResponseEntity updatePet( + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + String exampleString = " 123456789 doggie aeiou aeiou "; + ApiUtil.setExampleResponse(request, "application/xml", exampleString); + break; + } + } + }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -296,6 +345,7 @@ public interface PetApi { /** * POST /pet/{petId} : Updates a pet in the store with form data + * * * @param petId ID of pet that needs to be updated (required) * @param name Updated name of the pet (optional) @@ -305,6 +355,7 @@ public interface PetApi { @Operation( operationId = "updatePetWithForm", summary = "Updates a pet in the store with form data", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "405", description = "Invalid input") @@ -330,6 +381,7 @@ public interface PetApi { /** * POST /pet/{petId}/uploadImage : uploads an image + * * * @param petId ID of pet to update (required) * @param additionalMetadata Additional data to pass to server (optional) @@ -339,6 +391,7 @@ public interface PetApi { @Operation( operationId = "uploadFile", summary = "uploads an image", + description = "", tags = { "pet" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index f3382db4c24..f6ec18a8e76 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -157,14 +157,16 @@ public interface StoreApi { /** * POST /store/order : Place an order for a pet + * * - * @param body order placed for purchasing the pet (required) + * @param order order placed for purchasing the pet (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) */ @Operation( operationId = "placeOrder", summary = "Place an order for a pet", + description = "", tags = { "store" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -177,10 +179,11 @@ public interface StoreApi { @RequestMapping( method = RequestMethod.POST, value = "/store/order", - produces = "application/json" + produces = "application/json", + consumes = "application/json" ) default ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index 4be8545c355..9776ebf7a4b 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -47,7 +47,7 @@ public interface UserApi { * POST /user : Create user * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user Created user object (required) * @return successful operation (status code 200) */ @Operation( @@ -57,14 +57,18 @@ public interface UserApi { tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user" + value = "/user", + consumes = "application/json" ) default ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -73,24 +77,30 @@ public interface UserApi { /** * POST /user/createWithArray : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithArrayInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithArray" + value = "/user/createWithArray", + consumes = "application/json" ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -99,24 +109,30 @@ public interface UserApi { /** * POST /user/createWithList : Creates list of users with given input array + * * - * @param body List of user object (required) + * @param user List of user object (required) * @return successful operation (status code 200) */ @Operation( operationId = "createUsersWithListInput", summary = "Creates list of users with given input array", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.POST, - value = "/user/createWithList" + value = "/user/createWithList", + consumes = "application/json" ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List body + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -139,6 +155,9 @@ public interface UserApi { responses = { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( @@ -155,6 +174,7 @@ public interface UserApi { /** * GET /user/{username} : Get user by user name + * * * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return successful operation (status code 200) @@ -164,6 +184,7 @@ public interface UserApi { @Operation( operationId = "getUserByName", summary = "Get user by user name", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -203,6 +224,7 @@ public interface UserApi { /** * GET /user/login : Logs user into the system + * * * @param username The user name for login (required) * @param password The password for login in clear text (required) @@ -212,6 +234,7 @@ public interface UserApi { @Operation( operationId = "loginUser", summary = "Logs user into the system", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "200", description = "successful operation", content = { @@ -227,7 +250,7 @@ public interface UserApi { produces = "application/json" ) default ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -237,15 +260,20 @@ public interface UserApi { /** * GET /user/logout : Logs out current logged in user session + * * * @return successful operation (status code 200) */ @Operation( operationId = "logoutUser", summary = "Logs out current logged in user session", + description = "", tags = { "user" }, responses = { @ApiResponse(responseCode = "default", description = "successful operation") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( @@ -265,7 +293,7 @@ public interface UserApi { * This can only be done by the logged in user. * * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param user Updated user object (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) */ @@ -277,15 +305,19 @@ public interface UserApi { responses = { @ApiResponse(responseCode = "400", description = "Invalid user supplied"), @ApiResponse(responseCode = "404", description = "User not found") + }, + security = { + @SecurityRequirement(name = "api_key") } ) @RequestMapping( method = RequestMethod.PUT, - value = "/user/{username}" + value = "/user/{username}", + consumes = "application/json" ) default ResponseEntity updateUser( @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java index 2a90a2f0a4f..18b55b13d16 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java @@ -56,7 +56,7 @@ public class Category { * Get name * @return name */ - + @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String getName() { return name; diff --git a/samples/server/petstore/spring-stubs/.openapi-generator-ignore b/samples/server/petstore/spring-stubs/.openapi-generator-ignore deleted file mode 100644 index 7484ee590a3..00000000000 --- a/samples/server/petstore/spring-stubs/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# OpenAPI Generator Ignore -# Generated by openapi-generator https://github.com/openapitools/openapi-generator - -# Use this file to prevent files from being overwritten by the generator. -# The patterns follow closely to .gitignore or .dockerignore. - -# As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/server/petstore/spring-stubs/.openapi-generator/FILES b/samples/server/petstore/spring-stubs/.openapi-generator/FILES deleted file mode 100644 index 87837793235..00000000000 --- a/samples/server/petstore/spring-stubs/.openapi-generator/FILES +++ /dev/null @@ -1,12 +0,0 @@ -README.md -pom.xml -src/main/java/org/openapitools/api/ApiUtil.java -src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/model/Category.java -src/main/java/org/openapitools/model/ModelApiResponse.java -src/main/java/org/openapitools/model/Order.java -src/main/java/org/openapitools/model/Pet.java -src/main/java/org/openapitools/model/Tag.java -src/main/java/org/openapitools/model/User.java diff --git a/samples/server/petstore/spring-stubs/.openapi-generator/VERSION b/samples/server/petstore/spring-stubs/.openapi-generator/VERSION deleted file mode 100644 index 7f4d792ec2c..00000000000 --- a/samples/server/petstore/spring-stubs/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-stubs/README.md b/samples/server/petstore/spring-stubs/README.md deleted file mode 100644 index d43a1de307d..00000000000 --- a/samples/server/petstore/spring-stubs/README.md +++ /dev/null @@ -1,27 +0,0 @@ - -# OpenAPI generated API stub - -Spring Framework stub - - -## Overview -This code was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. -By using the [OpenAPI-Spec](https://openapis.org), you can easily generate an API stub. -This is an example of building API stub interfaces in Java using the Spring framework. - -The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints -by adding ```@Controller``` classes that implement the interface. Eg: -```java -@Controller -public class PetController implements PetApi { -// implement all PetApi methods -} -``` - -You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg: -```java -@FeignClient(name="pet", url="http://petstore.swagger.io/v2") -public interface PetClient extends PetApi { - -} -``` diff --git a/samples/server/petstore/spring-stubs/pom.xml b/samples/server/petstore/spring-stubs/pom.xml deleted file mode 100644 index c7768e6f120..00000000000 --- a/samples/server/petstore/spring-stubs/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - 4.0.0 - org.openapitools - spring-stubs - jar - spring-stubs - 1.0.0 - - 1.8 - ${java.version} - ${java.version} - UTF-8 - 2.9.2 - 4.15.5 - - - org.springframework.boot - spring-boot-starter-parent - 2.5.14 - - - - src/main/java - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.data - spring-data-commons - - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - org.webjars - swagger-ui - ${swagger-ui.version} - - - org.webjars - webjars-locator-core - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - - org.springframework.boot - spring-boot-starter-validation - - - com.fasterxml.jackson.core - jackson-databind - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/ApiUtil.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/ApiUtil.java deleted file mode 100644 index 1245b1dd0cc..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/ApiUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.openapitools.api; - -import org.springframework.web.context.request.NativeWebRequest; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -public class ApiUtil { - public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { - try { - HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class); - res.setCharacterEncoding("UTF-8"); - res.addHeader("Content-Type", contentType); - res.getWriter().print(example); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java deleted file mode 100644 index cc1b435e472..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ /dev/null @@ -1,387 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "pet", description = "Everything about your Pets") -public interface PetApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /pet : Add a new pet to the store - * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid input (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Add a new pet to the store", - nickname = "addPet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 405, message = "Invalid input") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet", - consumes = "application/json" - ) - default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * DELETE /pet/{petId} : Deletes a pet - * - * @param petId Pet id to delete (required) - * @param apiKey (optional) - * @return Invalid pet value (status code 400) - */ - @ApiOperation( - tags = { "pet" }, - value = "Deletes a pet", - nickname = "deletePet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid pet value") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/pet/{petId}" - ) - default ResponseEntity deletePet( - @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/findByStatus : Finds Pets by status - * Multiple status values can be provided with comma separated strings - * - * @param status Status values that need to be considered for filter (required) - * @return successful operation (status code 200) - * or Invalid status value (status code 400) - */ - @ApiOperation( - tags = { "pet" }, - value = "Finds Pets by status", - nickname = "findPetsByStatus", - notes = "Multiple status values can be provided with comma separated strings", - response = Pet.class, - responseContainer = "List", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid status value") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByStatus", - produces = "application/json" - ) - default ResponseEntity> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/findByTags : Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @param tags Tags to filter by (required) - * @return successful operation (status code 200) - * or Invalid tag value (status code 400) - * @deprecated - */ - @Deprecated - @ApiOperation( - tags = { "pet" }, - value = "Finds Pets by tags", - nickname = "findPetsByTags", - notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", - response = Pet.class, - responseContainer = "List", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid tag value") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/findByTags", - produces = "application/json" - ) - default ResponseEntity> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /pet/{petId} : Find pet by ID - * Returns a single pet - * - * @param petId ID of pet to return (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - */ - @ApiOperation( - tags = { "pet" }, - value = "Find pet by ID", - nickname = "getPetById", - notes = "Returns a single pet", - response = Pet.class, - authorizations = { - @Authorization(value = "api_key") - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Pet.class), - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Pet not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/pet/{petId}", - produces = "application/json" - ) - default ResponseEntity getPetById( - @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /pet : Update an existing pet - * - * @param body Pet object that needs to be added to the store (required) - * @return Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * or Validation exception (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Update an existing pet", - nickname = "updatePet", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Pet not found"), - @ApiResponse(code = 405, message = "Validation exception") - }) - @RequestMapping( - method = RequestMethod.PUT, - value = "/pet", - consumes = "application/json" - ) - default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /pet/{petId} : Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated (required) - * @param name Updated name of the pet (optional) - * @param status Updated status of the pet (optional) - * @return Invalid input (status code 405) - */ - @ApiOperation( - tags = { "pet" }, - value = "Updates a pet in the store with form data", - nickname = "updatePetWithForm", - notes = "", - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 405, message = "Invalid input") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}", - consumes = "application/x-www-form-urlencoded" - ) - default ResponseEntity updatePetWithForm( - @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, - @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /pet/{petId}/uploadImage : uploads an image - * - * @param petId ID of pet to update (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @param file file to upload (optional) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "pet" }, - value = "uploads an image", - nickname = "uploadFile", - notes = "", - response = ModelApiResponse.class, - authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") - }) - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/pet/{petId}/uploadImage", - produces = "application/json", - consumes = "multipart/form-data" - ) - default ResponseEntity uploadFile( - @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, - @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java deleted file mode 100644 index 5d356e58266..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ /dev/null @@ -1,190 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.Map; -import org.openapitools.model.Order; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "store", description = "Access to Petstore orders") -public interface StoreApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * DELETE /store/order/{orderId} : Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * - * @param orderId ID of the order that needs to be deleted (required) - * @return Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @ApiOperation( - tags = { "store" }, - value = "Delete purchase order by ID", - nickname = "deleteOrder", - notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors" - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Order not found") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/store/order/{orderId}" - ) - default ResponseEntity deleteOrder( - @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /store/inventory : Returns pet inventories by status - * Returns a map of status codes to quantities - * - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "store" }, - value = "Returns pet inventories by status", - nickname = "getInventory", - notes = "Returns a map of status codes to quantities", - response = Integer.class, - responseContainer = "Map", - authorizations = { - @Authorization(value = "api_key") - } - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/inventory", - produces = "application/json" - ) - default ResponseEntity> getInventory( - - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /store/order/{orderId} : Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions - * - * @param orderId ID of pet that needs to be fetched (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Order not found (status code 404) - */ - @ApiOperation( - tags = { "store" }, - value = "Find purchase order by ID", - nickname = "getOrderById", - notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", - response = Order.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid ID supplied"), - @ApiResponse(code = 404, message = "Order not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/store/order/{orderId}", - produces = "application/json" - ) - default ResponseEntity getOrderById( - @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /store/order : Place an order for a pet - * - * @param body order placed for purchasing the pet (required) - * @return successful operation (status code 200) - * or Invalid Order (status code 400) - */ - @ApiOperation( - tags = { "store" }, - value = "Place an order for a pet", - nickname = "placeOrder", - notes = "", - response = Order.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid Order") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/store/order", - produces = "application/json" - ) - default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java deleted file mode 100644 index 26b1f455a7a..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ /dev/null @@ -1,285 +0,0 @@ -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -package org.openapitools.api; - -import java.util.List; -import java.time.OffsetDateTime; -import org.openapitools.model.User; -import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.Generated; - -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -@Validated -@Api(value = "user", description = "Operations about user") -public interface UserApi { - - default Optional getRequest() { - return Optional.empty(); - } - - /** - * POST /user : Create user - * This can only be done by the logged in user. - * - * @param body Created user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Create user", - nickname = "createUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user" - ) - default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /user/createWithArray : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Creates list of users with given input array", - nickname = "createUsersWithArrayInput", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithArray" - ) - default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * POST /user/createWithList : Creates list of users with given input array - * - * @param body List of user object (required) - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Creates list of users with given input array", - nickname = "createUsersWithListInput", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.POST, - value = "/user/createWithList" - ) - default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * DELETE /user/{username} : Delete user - * This can only be done by the logged in user. - * - * @param username The name that needs to be deleted (required) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Delete user", - nickname = "deleteUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid username supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.DELETE, - value = "/user/{username}" - ) - default ResponseEntity deleteUser( - @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/{username} : Get user by user name - * - * @param username The name that needs to be fetched. Use user1 for testing. (required) - * @return successful operation (status code 200) - * or Invalid username supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Get user by user name", - nickname = "getUserByName", - notes = "", - response = User.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = User.class), - @ApiResponse(code = 400, message = "Invalid username supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/{username}", - produces = "application/json" - ) - default ResponseEntity getUserByName( - @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username - ) { - getRequest().ifPresent(request -> { - for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { - if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; - ApiUtil.setExampleResponse(request, "application/json", exampleString); - break; - } - if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { - String exampleString = " 123456789 aeiou aeiou aeiou aeiou aeiou aeiou 123 "; - ApiUtil.setExampleResponse(request, "application/xml", exampleString); - break; - } - } - }); - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/login : Logs user into the system - * - * @param username The user name for login (required) - * @param password The password for login in clear text (required) - * @return successful operation (status code 200) - * or Invalid username/password supplied (status code 400) - */ - @ApiOperation( - tags = { "user" }, - value = "Logs user into the system", - nickname = "loginUser", - notes = "", - response = String.class - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation", response = String.class), - @ApiResponse(code = 400, message = "Invalid username/password supplied") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/login", - produces = "application/json" - ) - default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * GET /user/logout : Logs out current logged in user session - * - * @return successful operation (status code 200) - */ - @ApiOperation( - tags = { "user" }, - value = "Logs out current logged in user session", - nickname = "logoutUser", - notes = "" - ) - @ApiResponses({ - @ApiResponse(code = 200, message = "successful operation") - }) - @RequestMapping( - method = RequestMethod.GET, - value = "/user/logout" - ) - default ResponseEntity logoutUser( - - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - - - /** - * PUT /user/{username} : Updated user - * This can only be done by the logged in user. - * - * @param username name that need to be deleted (required) - * @param body Updated user object (required) - * @return Invalid user supplied (status code 400) - * or User not found (status code 404) - */ - @ApiOperation( - tags = { "user" }, - value = "Updated user", - nickname = "updateUser", - notes = "This can only be done by the logged in user." - ) - @ApiResponses({ - @ApiResponse(code = 400, message = "Invalid user supplied"), - @ApiResponse(code = 404, message = "User not found") - }) - @RequestMapping( - method = RequestMethod.PUT, - value = "/user/{username}" - ) - default ResponseEntity updateUser( - @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body - ) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - - } - -} diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java deleted file mode 100644 index 9f5ef4d9f1a..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A category for a pet - */ - -@ApiModel(description = "A category for a pet") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Category { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Category id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Category name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @ApiModelProperty(value = "") - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Category category = (Category) o; - return Objects.equals(this.id, category.id) && - Objects.equals(this.name, category.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Category {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java deleted file mode 100644 index 52fb11fd3cf..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * Describes the result of uploading an image resource - */ - -@ApiModel(description = "Describes the result of uploading an image resource") -@JsonTypeName("ApiResponse") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class ModelApiResponse { - - @JsonProperty("code") - private Integer code; - - @JsonProperty("type") - private String type; - - @JsonProperty("message") - private String message; - - public ModelApiResponse code(Integer code) { - this.code = code; - return this; - } - - /** - * Get code - * @return code - */ - - @ApiModelProperty(value = "") - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public ModelApiResponse type(String type) { - this.type = type; - return this; - } - - /** - * Get type - * @return type - */ - - @ApiModelProperty(value = "") - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public ModelApiResponse message(String message) { - this.message = message; - return this; - } - - /** - * Get message - * @return message - */ - - @ApiModelProperty(value = "") - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - ModelApiResponse _apiResponse = (ModelApiResponse) o; - return Objects.equals(this.code, _apiResponse.code) && - Objects.equals(this.type, _apiResponse.type) && - Objects.equals(this.message, _apiResponse.message); - } - - @Override - public int hashCode() { - return Objects.hash(code, type, message); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelApiResponse {\n"); - sb.append(" code: ").append(toIndentedString(code)).append("\n"); - sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" message: ").append(toIndentedString(message)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java deleted file mode 100644 index 66d9df6dfd9..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java +++ /dev/null @@ -1,246 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.time.OffsetDateTime; -import org.springframework.format.annotation.DateTimeFormat; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * An order for a pets from the pet store - */ - -@ApiModel(description = "An order for a pets from the pet store") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Order { - - @JsonProperty("id") - private Long id; - - @JsonProperty("petId") - private Long petId; - - @JsonProperty("quantity") - private Integer quantity; - - @JsonProperty("shipDate") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime shipDate; - - /** - * Order Status - */ - public enum StatusEnum { - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - StatusEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static StatusEnum fromValue(String value) { - for (StatusEnum b : StatusEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - - @JsonProperty("status") - private StatusEnum status; - - @JsonProperty("complete") - private Boolean complete = false; - - public Order id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Order petId(Long petId) { - this.petId = petId; - return this; - } - - /** - * Get petId - * @return petId - */ - - @ApiModelProperty(value = "") - public Long getPetId() { - return petId; - } - - public void setPetId(Long petId) { - this.petId = petId; - } - - public Order quantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - /** - * Get quantity - * @return quantity - */ - - @ApiModelProperty(value = "") - public Integer getQuantity() { - return quantity; - } - - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - public Order shipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - return this; - } - - /** - * Get shipDate - * @return shipDate - */ - @Valid - @ApiModelProperty(value = "") - public OffsetDateTime getShipDate() { - return shipDate; - } - - public void setShipDate(OffsetDateTime shipDate) { - this.shipDate = shipDate; - } - - public Order status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * Order Status - * @return status - */ - - @ApiModelProperty(value = "Order Status") - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - public Order complete(Boolean complete) { - this.complete = complete; - return this; - } - - /** - * Get complete - * @return complete - */ - - @ApiModelProperty(value = "") - public Boolean getComplete() { - return complete; - } - - public void setComplete(Boolean complete) { - this.complete = complete; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Order order = (Order) o; - return Objects.equals(this.id, order.id) && - Objects.equals(this.petId, order.petId) && - Objects.equals(this.quantity, order.quantity) && - Objects.equals(this.shipDate, order.shipDate) && - Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete); - } - - @Override - public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Order {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); - sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); - sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java deleted file mode 100644 index b30aa3fd9a2..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A tag for a pet - */ - -@ApiModel(description = "A tag for a pet") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class Tag { - - @JsonProperty("id") - private Long id; - - @JsonProperty("name") - private String name; - - public Tag id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Tag name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - */ - - @ApiModelProperty(value = "") - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Tag tag = (Tag) o; - return Objects.equals(this.id, tag.id) && - Objects.equals(this.name, tag.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Tag {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java deleted file mode 100644 index 8d71f0fcc04..00000000000 --- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java +++ /dev/null @@ -1,253 +0,0 @@ -package org.openapitools.model; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import javax.validation.Valid; -import javax.validation.constraints.*; - - -import java.util.*; -import javax.annotation.Generated; - -/** - * A User who is purchasing from the pet store - */ - -@ApiModel(description = "A User who is purchasing from the pet store") -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") -public class User { - - @JsonProperty("id") - private Long id; - - @JsonProperty("username") - private String username; - - @JsonProperty("firstName") - private String firstName; - - @JsonProperty("lastName") - private String lastName; - - @JsonProperty("email") - private String email; - - @JsonProperty("password") - private String password; - - @JsonProperty("phone") - private String phone; - - @JsonProperty("userStatus") - private Integer userStatus; - - public User id(Long id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - */ - - @ApiModelProperty(value = "") - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public User username(String username) { - this.username = username; - return this; - } - - /** - * Get username - * @return username - */ - - @ApiModelProperty(value = "") - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public User firstName(String firstName) { - this.firstName = firstName; - return this; - } - - /** - * Get firstName - * @return firstName - */ - - @ApiModelProperty(value = "") - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public User lastName(String lastName) { - this.lastName = lastName; - return this; - } - - /** - * Get lastName - * @return lastName - */ - - @ApiModelProperty(value = "") - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public User email(String email) { - this.email = email; - return this; - } - - /** - * Get email - * @return email - */ - - @ApiModelProperty(value = "") - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public User password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - */ - - @ApiModelProperty(value = "") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public User phone(String phone) { - this.phone = phone; - return this; - } - - /** - * Get phone - * @return phone - */ - - @ApiModelProperty(value = "") - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public User userStatus(Integer userStatus) { - this.userStatus = userStatus; - return this; - } - - /** - * User Status - * @return userStatus - */ - - @ApiModelProperty(value = "User Status") - public Integer getUserStatus() { - return userStatus; - } - - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - User user = (User) o; - return Objects.equals(this.id, user.id) && - Objects.equals(this.username, user.username) && - Objects.equals(this.firstName, user.firstName) && - Objects.equals(this.lastName, user.lastName) && - Objects.equals(this.email, user.email) && - Objects.equals(this.password, user.password) && - Objects.equals(this.phone, user.phone) && - Objects.equals(this.userStatus, user.userStatus); - } - - @Override - public int hashCode() { - return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" username: ").append(toIndentedString(username)).append("\n"); - sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); - sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); - sb.append(" email: ").append(toIndentedString(email)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); - sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..80d9ff32309 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model_name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 7f2cc3784a1..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -178,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml index 05bd8cc1889..c1bde43b2e3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml @@ -184,17 +184,22 @@ paths: delete: operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: {} @@ -217,12 +222,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -251,12 +258,14 @@ paths: operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -282,12 +291,14 @@ paths: operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -371,11 +382,13 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": content: {} @@ -395,6 +408,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -403,6 +417,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -501,17 +516,21 @@ paths: operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -525,14 +544,18 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": content: {} description: Invalid username/password supplied @@ -561,11 +584,13 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": content: {} @@ -583,11 +608,13 @@ paths: operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -615,11 +642,13 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: '*/*': @@ -676,40 +705,55 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": content: {} @@ -729,6 +773,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -739,8 +784,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -748,10 +795,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) explode: false in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -762,8 +811,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -771,24 +822,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -1014,11 +1072,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1136,14 +1196,17 @@ paths: type: string type: array style: form - - in: query + - explode: true + in: query name: ioutil required: true schema: items: type: string type: array - - in: query + style: form + - explode: false + in: query name: http required: true schema: @@ -1183,12 +1246,14 @@ paths: operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -1217,28 +1282,34 @@ paths: post: operationId: versioningHeaders parameters: - - in: header + - explode: false + in: header name: VersionWithDefaultValue required: true schema: default: V1 type: string x-version-param: true + style: simple x-version-param: true - - in: header + - explode: false + in: header name: VersionNoDefaultValue required: true schema: type: string x-version-param: true + style: simple x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1255,28 +1326,34 @@ paths: post: operationId: versioningQueryParams parameters: - - in: query + - explode: true + in: query name: VersionWithDefaultValue required: true schema: default: V1 type: string x-version-param: true + style: form x-version-param: true - - in: query + - explode: true + in: query name: VersionNoDefaultValue required: true schema: type: string x-version-param: true + style: form x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1293,43 +1370,53 @@ paths: post: operationId: versioningMix parameters: - - in: query + - explode: true + in: query name: VersionWithDefaultValueQuery required: true schema: default: V1 type: string x-version-param: true + style: form x-version-param: true - - in: query + - explode: true + in: query name: VersionNoDefaultValueQuery required: true schema: type: string x-version-param: true + style: form x-version-param: true - - in: header + - explode: false + in: header name: VersionWithDefaultValueHeader required: true schema: default: V1 type: string x-version-param: true + style: simple x-version-param: true - - in: header + - explode: false + in: header name: VersionNoDefaultValueHeader required: true schema: type: string x-version-param: true + style: simple x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1508,7 +1595,7 @@ components: message: type: string type: object - $special[model.name]: + _special_model_name_: properties: $special[property.name]: format: int64 @@ -1589,13 +1676,13 @@ components: format_test: properties: integer: - maximum: 100 - minimum: 10 + maximum: 100.0 + minimum: 10.0 type: integer int32: format: int32 - maximum: 200 - minimum: 20 + maximum: 200.0 + minimum: 20.0 type: integer int64: format: int64 @@ -2234,7 +2321,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2244,7 +2330,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2264,7 +2349,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2337,7 +2421,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2349,7 +2432,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2361,7 +2443,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: @@ -2394,4 +2475,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..80d9ff32309 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model_name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index 7f2cc3784a1..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -178,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml index 05bd8cc1889..c1bde43b2e3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml @@ -184,17 +184,22 @@ paths: delete: operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: {} @@ -217,12 +222,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -251,12 +258,14 @@ paths: operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -282,12 +291,14 @@ paths: operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -371,11 +382,13 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": content: {} @@ -395,6 +408,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -403,6 +417,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -501,17 +516,21 @@ paths: operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -525,14 +544,18 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": content: {} description: Invalid username/password supplied @@ -561,11 +584,13 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": content: {} @@ -583,11 +608,13 @@ paths: operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -615,11 +642,13 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: '*/*': @@ -676,40 +705,55 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": content: {} @@ -729,6 +773,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -739,8 +784,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -748,10 +795,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) explode: false in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -762,8 +811,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -771,24 +822,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -1014,11 +1072,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1136,14 +1196,17 @@ paths: type: string type: array style: form - - in: query + - explode: true + in: query name: ioutil required: true schema: items: type: string type: array - - in: query + style: form + - explode: false + in: query name: http required: true schema: @@ -1183,12 +1246,14 @@ paths: operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -1217,28 +1282,34 @@ paths: post: operationId: versioningHeaders parameters: - - in: header + - explode: false + in: header name: VersionWithDefaultValue required: true schema: default: V1 type: string x-version-param: true + style: simple x-version-param: true - - in: header + - explode: false + in: header name: VersionNoDefaultValue required: true schema: type: string x-version-param: true + style: simple x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1255,28 +1326,34 @@ paths: post: operationId: versioningQueryParams parameters: - - in: query + - explode: true + in: query name: VersionWithDefaultValue required: true schema: default: V1 type: string x-version-param: true + style: form x-version-param: true - - in: query + - explode: true + in: query name: VersionNoDefaultValue required: true schema: type: string x-version-param: true + style: form x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1293,43 +1370,53 @@ paths: post: operationId: versioningMix parameters: - - in: query + - explode: true + in: query name: VersionWithDefaultValueQuery required: true schema: default: V1 type: string x-version-param: true + style: form x-version-param: true - - in: query + - explode: true + in: query name: VersionNoDefaultValueQuery required: true schema: type: string x-version-param: true + style: form x-version-param: true - - in: header + - explode: false + in: header name: VersionWithDefaultValueHeader required: true schema: default: V1 type: string x-version-param: true + style: simple x-version-param: true - - in: header + - explode: false + in: header name: VersionNoDefaultValueHeader required: true schema: type: string x-version-param: true + style: simple x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1508,7 +1595,7 @@ components: message: type: string type: object - $special[model.name]: + _special_model_name_: properties: $special[property.name]: format: int64 @@ -1589,13 +1676,13 @@ components: format_test: properties: integer: - maximum: 100 - minimum: 10 + maximum: 100.0 + minimum: 10.0 type: integer int32: format: int32 - maximum: 200 - minimum: 20 + maximum: 200.0 + minimum: 20.0 type: integer int64: format: int64 @@ -2234,7 +2321,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2244,7 +2330,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2264,7 +2349,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2337,7 +2421,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2349,7 +2432,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2361,7 +2443,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: @@ -2394,4 +2475,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..80d9ff32309 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model_name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 7f2cc3784a1..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -178,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml index 05bd8cc1889..c1bde43b2e3 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml @@ -184,17 +184,22 @@ paths: delete: operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: {} @@ -217,12 +222,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -251,12 +258,14 @@ paths: operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -282,12 +291,14 @@ paths: operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -371,11 +382,13 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": content: {} @@ -395,6 +408,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -403,6 +417,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -501,17 +516,21 @@ paths: operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -525,14 +544,18 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": content: {} description: Invalid username/password supplied @@ -561,11 +584,13 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": content: {} @@ -583,11 +608,13 @@ paths: operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -615,11 +642,13 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: '*/*': @@ -676,40 +705,55 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": content: {} @@ -729,6 +773,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -739,8 +784,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -748,10 +795,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) explode: false in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -762,8 +811,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -771,24 +822,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -1014,11 +1072,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1136,14 +1196,17 @@ paths: type: string type: array style: form - - in: query + - explode: true + in: query name: ioutil required: true schema: items: type: string type: array - - in: query + style: form + - explode: false + in: query name: http required: true schema: @@ -1183,12 +1246,14 @@ paths: operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -1217,28 +1282,34 @@ paths: post: operationId: versioningHeaders parameters: - - in: header + - explode: false + in: header name: VersionWithDefaultValue required: true schema: default: V1 type: string x-version-param: true + style: simple x-version-param: true - - in: header + - explode: false + in: header name: VersionNoDefaultValue required: true schema: type: string x-version-param: true + style: simple x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1255,28 +1326,34 @@ paths: post: operationId: versioningQueryParams parameters: - - in: query + - explode: true + in: query name: VersionWithDefaultValue required: true schema: default: V1 type: string x-version-param: true + style: form x-version-param: true - - in: query + - explode: true + in: query name: VersionNoDefaultValue required: true schema: type: string x-version-param: true + style: form x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1293,43 +1370,53 @@ paths: post: operationId: versioningMix parameters: - - in: query + - explode: true + in: query name: VersionWithDefaultValueQuery required: true schema: default: V1 type: string x-version-param: true + style: form x-version-param: true - - in: query + - explode: true + in: query name: VersionNoDefaultValueQuery required: true schema: type: string x-version-param: true + style: form x-version-param: true - - in: header + - explode: false + in: header name: VersionWithDefaultValueHeader required: true schema: default: V1 type: string x-version-param: true + style: simple x-version-param: true - - in: header + - explode: false + in: header name: VersionNoDefaultValueHeader required: true schema: type: string x-version-param: true + style: simple x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1508,7 +1595,7 @@ components: message: type: string type: object - $special[model.name]: + _special_model_name_: properties: $special[property.name]: format: int64 @@ -1589,13 +1676,13 @@ components: format_test: properties: integer: - maximum: 100 - minimum: 10 + maximum: 100.0 + minimum: 10.0 type: integer int32: format: int32 - maximum: 200 - minimum: 20 + maximum: 200.0 + minimum: 20.0 type: integer int64: format: int64 @@ -2234,7 +2321,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2244,7 +2330,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2264,7 +2349,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2337,7 +2421,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2349,7 +2432,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2361,7 +2443,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: @@ -2394,4 +2475,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java index f321ab78cd5..80d9ff32309 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -20,7 +20,7 @@ import javax.annotation.Generated; * SpecialModelName */ -@JsonTypeName("$special[model.name]") +@JsonTypeName("_special_model_name_") @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { @@ -54,8 +54,8 @@ public class SpecialModelName { if (o == null || getClass() != o.getClass()) { return false; } - SpecialModelName $specialModelName = (SpecialModelName) o; - return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); + SpecialModelName specialModelName = (SpecialModelName) o; + return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); } @Override diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index 7f2cc3784a1..da3cb34f1e7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -178,7 +178,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml index 05bd8cc1889..c1bde43b2e3 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml @@ -184,17 +184,22 @@ paths: delete: operationId: deletePet parameters: - - in: header + - explode: false + in: header name: api_key + required: false schema: type: string + style: simple - description: Pet id to delete + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: {} @@ -217,12 +222,14 @@ paths: operationId: getPetById parameters: - description: ID of pet to return + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -251,12 +258,14 @@ paths: operationId: updatePetWithForm parameters: - description: ID of pet that needs to be updated + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: application/x-www-form-urlencoded: @@ -282,12 +291,14 @@ paths: operationId: uploadFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -371,11 +382,13 @@ paths: operationId: deleteOrder parameters: - description: ID of the order that needs to be deleted + explode: false in: path name: order_id required: true schema: type: string + style: simple responses: "400": content: {} @@ -395,6 +408,7 @@ paths: operationId: getOrderById parameters: - description: ID of pet that needs to be fetched + explode: false in: path name: order_id required: true @@ -403,6 +417,7 @@ paths: maximum: 5 minimum: 1 type: integer + style: simple responses: "200": content: @@ -501,17 +516,21 @@ paths: operationId: loginUser parameters: - description: The user name for login + explode: true in: query name: username required: true schema: type: string + style: form - description: The password for login in clear text + explode: true in: query name: password required: true schema: type: string + style: form responses: "200": content: @@ -525,14 +544,18 @@ paths: headers: X-Rate-Limit: description: calls per hour allowed by the user + explode: false schema: format: int32 type: integer + style: simple X-Expires-After: description: date in UTC when token expires + explode: false schema: format: date-time type: string + style: simple "400": content: {} description: Invalid username/password supplied @@ -561,11 +584,13 @@ paths: operationId: deleteUser parameters: - description: The name that needs to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple responses: "400": content: {} @@ -583,11 +608,13 @@ paths: operationId: getUserByName parameters: - description: The name that needs to be fetched. Use user1 for testing. + explode: false in: path name: username required: true schema: type: string + style: simple responses: "200": content: @@ -615,11 +642,13 @@ paths: operationId: updateUser parameters: - description: name that need to be deleted + explode: false in: path name: username required: true schema: type: string + style: simple requestBody: content: '*/*': @@ -676,40 +705,55 @@ paths: operationId: testGroupParameters parameters: - description: Required String in group parameters + explode: true in: query name: required_string_group required: true schema: type: integer + style: form - description: Required Boolean in group parameters + explode: false in: header name: required_boolean_group required: true schema: type: boolean + style: simple - description: Required Integer in group parameters + explode: true in: query name: required_int64_group required: true schema: format: int64 type: integer + style: form - description: String in group parameters + explode: true in: query name: string_group + required: false schema: type: integer + style: form - description: Boolean in group parameters + explode: false in: header name: boolean_group + required: false schema: type: boolean + style: simple - description: Integer in group parameters + explode: true in: query name: int64_group + required: false schema: format: int64 type: integer + style: form responses: "400": content: {} @@ -729,6 +773,7 @@ paths: explode: false in: header name: enum_header_string_array + required: false schema: items: default: $ @@ -739,8 +784,10 @@ paths: type: array style: simple - description: Header parameter enum test (string) + explode: false in: header name: enum_header_string + required: false schema: default: -efg enum: @@ -748,10 +795,12 @@ paths: - -efg - (xyz) type: string + style: simple - description: Query parameter enum test (string array) explode: false in: query name: enum_query_string_array + required: false schema: items: default: $ @@ -762,8 +811,10 @@ paths: type: array style: form - description: Query parameter enum test (string) + explode: true in: query name: enum_query_string + required: false schema: default: -efg enum: @@ -771,24 +822,31 @@ paths: - -efg - (xyz) type: string + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_integer + required: false schema: enum: - 1 - -2 format: int32 type: integer + style: form - description: Query parameter enum test (double) + explode: true in: query name: enum_query_double + required: false schema: enum: - 1.1 - -1.2 format: double type: number + style: form requestBody: content: application/x-www-form-urlencoded: @@ -1014,11 +1072,13 @@ paths: put: operationId: testBodyWithQueryParams parameters: - - in: query + - explode: true + in: query name: query required: true schema: type: string + style: form requestBody: content: application/json: @@ -1136,14 +1196,17 @@ paths: type: string type: array style: form - - in: query + - explode: true + in: query name: ioutil required: true schema: items: type: string type: array - - in: query + style: form + - explode: false + in: query name: http required: true schema: @@ -1183,12 +1246,14 @@ paths: operationId: uploadFileWithRequiredFile parameters: - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple requestBody: content: multipart/form-data: @@ -1217,28 +1282,34 @@ paths: post: operationId: versioningHeaders parameters: - - in: header + - explode: false + in: header name: VersionWithDefaultValue required: true schema: default: V1 type: string x-version-param: true + style: simple x-version-param: true - - in: header + - explode: false + in: header name: VersionNoDefaultValue required: true schema: type: string x-version-param: true + style: simple x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1255,28 +1326,34 @@ paths: post: operationId: versioningQueryParams parameters: - - in: query + - explode: true + in: query name: VersionWithDefaultValue required: true schema: default: V1 type: string x-version-param: true + style: form x-version-param: true - - in: query + - explode: true + in: query name: VersionNoDefaultValue required: true schema: type: string x-version-param: true + style: form x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1293,43 +1370,53 @@ paths: post: operationId: versioningMix parameters: - - in: query + - explode: true + in: query name: VersionWithDefaultValueQuery required: true schema: default: V1 type: string x-version-param: true + style: form x-version-param: true - - in: query + - explode: true + in: query name: VersionNoDefaultValueQuery required: true schema: type: string x-version-param: true + style: form x-version-param: true - - in: header + - explode: false + in: header name: VersionWithDefaultValueHeader required: true schema: default: V1 type: string x-version-param: true + style: simple x-version-param: true - - in: header + - explode: false + in: header name: VersionNoDefaultValueHeader required: true schema: type: string x-version-param: true + style: simple x-version-param: true - description: ID of pet to update + explode: false in: path name: petId required: true schema: format: int64 type: integer + style: simple responses: "200": content: @@ -1508,7 +1595,7 @@ components: message: type: string type: object - $special[model.name]: + _special_model_name_: properties: $special[property.name]: format: int64 @@ -1589,13 +1676,13 @@ components: format_test: properties: integer: - maximum: 100 - minimum: 10 + maximum: 100.0 + minimum: 10.0 type: integer int32: format: int32 - maximum: 200 - minimum: 20 + maximum: 200.0 + minimum: 20.0 type: integer int64: format: int64 @@ -2234,7 +2321,6 @@ components: status: description: Updated status of the pet type: string - type: object uploadFile_request: properties: additionalMetadata: @@ -2244,7 +2330,6 @@ components: description: file to upload format: binary type: string - type: object testEnumParameters_request: properties: enum_form_string_array: @@ -2264,7 +2349,6 @@ components: - -efg - (xyz) type: string - type: object testEndpointParameters_request: properties: integer: @@ -2337,7 +2421,6 @@ components: - double - number - pattern_without_delimiter - type: object testJsonFormData_request: properties: param: @@ -2349,7 +2432,6 @@ components: required: - param - param2 - type: object uploadFileWithRequiredFile_request: properties: additionalMetadata: @@ -2361,7 +2443,6 @@ components: type: string required: - requiredFile - type: object Dog_allOf: properties: breed: @@ -2394,4 +2475,3 @@ components: http_basic_test: scheme: basic type: http -x-original-swagger-version: "2.0" From aa066ab6fafef24713f31aeec9887161b17764eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kar=C3=A1sek?= Date: Sat, 18 Mar 2023 13:27:26 +0100 Subject: [PATCH 061/131] [python-nextgen] Fix validation of list of enums (#14809) * [python-nextgen] check enum arrady values better * [python-nextgen] re-generate exapmles for #14809 --- .../python-nextgen/model_generic.mustache | 10 ++++++++-- .../openapi_client/models/default_value.py | 6 +++--- .../python-nextgen/openapi_client/models/pet.py | 3 +-- .../python-nextgen/openapi_client/models/query.py | 6 +++--- .../petstore_api/models/enum_arrays.py | 9 ++++----- .../petstore_api/models/enum_test.py | 14 +++++--------- .../petstore_api/models/map_test.py | 3 +-- .../petstore_api/models/order.py | 3 +-- .../petstore_api/models/pet.py | 3 +-- .../petstore_api/models/special_name.py | 3 +-- .../python-nextgen-aiohttp/tests/test_model.py | 2 +- .../petstore_api/models/enum_arrays.py | 9 ++++----- .../petstore_api/models/enum_test.py | 14 +++++--------- .../python-nextgen/petstore_api/models/map_test.py | 3 +-- .../python-nextgen/petstore_api/models/order.py | 3 +-- .../python-nextgen/petstore_api/models/pet.py | 3 +-- .../petstore_api/models/special_name.py | 3 +-- .../petstore/python-nextgen/tests/test_model.py | 2 +- 18 files changed, 43 insertions(+), 56 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache index a503f6c6676..575e5940f5c 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache @@ -43,10 +43,16 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}} {{^required}} if v is None: return v - {{/required}} + {{#isArray}} + for i in v: + if i not in ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}): + raise ValueError("each list item must be one of ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})") + {{/isArray}} + {{^isArray}} if v not in ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}): - raise ValueError("must validate the enum values ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})") + raise ValueError("must be one of enum values ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})") + {{/isArray}} return v {{/isEnum}} {{/vars}} diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py b/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py index 92ecd2aba30..b4a7d1160c8 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py @@ -42,9 +42,9 @@ class DefaultValue(BaseModel): def array_string_enum_default_validate_enum(cls, v): if v is None: return v - - if v not in ('success', 'failure', 'unclassified'): - raise ValueError("must validate the enum values ('success', 'failure', 'unclassified')") + for i in v: + if i not in ('success', 'failure', 'unclassified'): + raise ValueError("each list item must be one of ('success', 'failure', 'unclassified')") return v class Config: diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/pet.py b/samples/client/echo_api/python-nextgen/openapi_client/models/pet.py index 00eb3d7be1f..d34df26fa5c 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/pet.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/pet.py @@ -41,9 +41,8 @@ class Pet(BaseModel): def status_validate_enum(cls, v): if v is None: return v - if v not in ('available', 'pending', 'sold'): - raise ValueError("must validate the enum values ('available', 'pending', 'sold')") + raise ValueError("must be one of enum values ('available', 'pending', 'sold')") return v class Config: diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/query.py b/samples/client/echo_api/python-nextgen/openapi_client/models/query.py index d52e87c6f50..531f366ed5c 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/query.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/query.py @@ -35,9 +35,9 @@ class Query(BaseModel): def outcomes_validate_enum(cls, v): if v is None: return v - - if v not in ('SUCCESS', 'FAILURE', 'SKIPPED'): - raise ValueError("must validate the enum values ('SUCCESS', 'FAILURE', 'SKIPPED')") + for i in v: + if i not in ('SUCCESS', 'FAILURE', 'SKIPPED'): + raise ValueError("each list item must be one of ('SUCCESS', 'FAILURE', 'SKIPPED')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py index ce596ea3491..a3665c53ded 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py @@ -34,18 +34,17 @@ class EnumArrays(BaseModel): def just_symbol_validate_enum(cls, v): if v is None: return v - if v not in ('>=', '$'): - raise ValueError("must validate the enum values ('>=', '$')") + raise ValueError("must be one of enum values ('>=', '$')") return v @validator('array_enum') def array_enum_validate_enum(cls, v): if v is None: return v - - if v not in ('fish', 'crab'): - raise ValueError("must validate the enum values ('fish', 'crab')") + for i in v: + if i not in ('fish', 'crab'): + raise ValueError("each list item must be one of ('fish', 'crab')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py index e610ed2c1a0..5f097942ba5 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py @@ -45,42 +45,38 @@ class EnumTest(BaseModel): def enum_string_validate_enum(cls, v): if v is None: return v - if v not in ('UPPER', 'lower', ''): - raise ValueError("must validate the enum values ('UPPER', 'lower', '')") + raise ValueError("must be one of enum values ('UPPER', 'lower', '')") return v @validator('enum_string_required') def enum_string_required_validate_enum(cls, v): if v not in ('UPPER', 'lower', ''): - raise ValueError("must validate the enum values ('UPPER', 'lower', '')") + raise ValueError("must be one of enum values ('UPPER', 'lower', '')") return v @validator('enum_integer_default') def enum_integer_default_validate_enum(cls, v): if v is None: return v - if v not in (1, 5, 14): - raise ValueError("must validate the enum values (1, 5, 14)") + raise ValueError("must be one of enum values (1, 5, 14)") return v @validator('enum_integer') def enum_integer_validate_enum(cls, v): if v is None: return v - if v not in (1, -1): - raise ValueError("must validate the enum values (1, -1)") + raise ValueError("must be one of enum values (1, -1)") return v @validator('enum_number') def enum_number_validate_enum(cls, v): if v is None: return v - if v not in (1.1, -1.2): - raise ValueError("must validate the enum values (1.1, -1.2)") + raise ValueError("must be one of enum values (1.1, -1.2)") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py index 14e866474e5..36d415ccbf6 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py @@ -36,9 +36,8 @@ class MapTest(BaseModel): def map_of_enum_string_validate_enum(cls, v): if v is None: return v - if v not in ('UPPER', 'lower'): - raise ValueError("must validate the enum values ('UPPER', 'lower')") + raise ValueError("must be one of enum values ('UPPER', 'lower')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py index cb8cb389940..c44c3a2eea9 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py @@ -38,9 +38,8 @@ class Order(BaseModel): def status_validate_enum(cls, v): if v is None: return v - if v not in ('placed', 'approved', 'delivered'): - raise ValueError("must validate the enum values ('placed', 'approved', 'delivered')") + raise ValueError("must be one of enum values ('placed', 'approved', 'delivered')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py index 9967660b383..f8bb0d46377 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py @@ -40,9 +40,8 @@ class Pet(BaseModel): def status_validate_enum(cls, v): if v is None: return v - if v not in ('available', 'pending', 'sold'): - raise ValueError("must validate the enum values ('available', 'pending', 'sold')") + raise ValueError("must be one of enum values ('available', 'pending', 'sold')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py index 372f43fe052..811569b1c98 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py @@ -36,9 +36,8 @@ class SpecialName(BaseModel): def var_schema_validate_enum(cls, v): if v is None: return v - if v not in ('available', 'pending', 'sold'): - raise ValueError("must validate the enum values ('available', 'pending', 'sold')") + raise ValueError("must be one of enum values ('available', 'pending', 'sold')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py index b2954d10e0a..b67782c7745 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py @@ -235,4 +235,4 @@ class ModelTests(unittest.TestCase): self.pet.status = "error" self.assertTrue(False) # this line shouldn't execute except ValueError as e: - self.assertTrue("must validate the enum values ('available', 'pending', 'sold')" in str(e)) + self.assertTrue("must be one of enum values ('available', 'pending', 'sold')" in str(e)) diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_arrays.py index 0c096aa0fc8..82b7bcfc92d 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_arrays.py @@ -35,18 +35,17 @@ class EnumArrays(BaseModel): def just_symbol_validate_enum(cls, v): if v is None: return v - if v not in ('>=', '$'): - raise ValueError("must validate the enum values ('>=', '$')") + raise ValueError("must be one of enum values ('>=', '$')") return v @validator('array_enum') def array_enum_validate_enum(cls, v): if v is None: return v - - if v not in ('fish', 'crab'): - raise ValueError("must validate the enum values ('fish', 'crab')") + for i in v: + if i not in ('fish', 'crab'): + raise ValueError("each list item must be one of ('fish', 'crab')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py index 8a562bd0941..560b95f7bb4 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py @@ -46,42 +46,38 @@ class EnumTest(BaseModel): def enum_string_validate_enum(cls, v): if v is None: return v - if v not in ('UPPER', 'lower', ''): - raise ValueError("must validate the enum values ('UPPER', 'lower', '')") + raise ValueError("must be one of enum values ('UPPER', 'lower', '')") return v @validator('enum_string_required') def enum_string_required_validate_enum(cls, v): if v not in ('UPPER', 'lower', ''): - raise ValueError("must validate the enum values ('UPPER', 'lower', '')") + raise ValueError("must be one of enum values ('UPPER', 'lower', '')") return v @validator('enum_integer_default') def enum_integer_default_validate_enum(cls, v): if v is None: return v - if v not in (1, 5, 14): - raise ValueError("must validate the enum values (1, 5, 14)") + raise ValueError("must be one of enum values (1, 5, 14)") return v @validator('enum_integer') def enum_integer_validate_enum(cls, v): if v is None: return v - if v not in (1, -1): - raise ValueError("must validate the enum values (1, -1)") + raise ValueError("must be one of enum values (1, -1)") return v @validator('enum_number') def enum_number_validate_enum(cls, v): if v is None: return v - if v not in (1.1, -1.2): - raise ValueError("must validate the enum values (1.1, -1.2)") + raise ValueError("must be one of enum values (1.1, -1.2)") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/map_test.py index 9d2d840b1f3..ac702eb0a7f 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/map_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/map_test.py @@ -37,9 +37,8 @@ class MapTest(BaseModel): def map_of_enum_string_validate_enum(cls, v): if v is None: return v - if v not in ('UPPER', 'lower'): - raise ValueError("must validate the enum values ('UPPER', 'lower')") + raise ValueError("must be one of enum values ('UPPER', 'lower')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/order.py index a6866f134eb..cdd825329e9 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/order.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/order.py @@ -39,9 +39,8 @@ class Order(BaseModel): def status_validate_enum(cls, v): if v is None: return v - if v not in ('placed', 'approved', 'delivered'): - raise ValueError("must validate the enum values ('placed', 'approved', 'delivered')") + raise ValueError("must be one of enum values ('placed', 'approved', 'delivered')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pet.py index a23db1e79b4..ae46c225407 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pet.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/pet.py @@ -41,9 +41,8 @@ class Pet(BaseModel): def status_validate_enum(cls, v): if v is None: return v - if v not in ('available', 'pending', 'sold'): - raise ValueError("must validate the enum values ('available', 'pending', 'sold')") + raise ValueError("must be one of enum values ('available', 'pending', 'sold')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_name.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_name.py index 58e7a590478..e0a6c30fa77 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_name.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/special_name.py @@ -37,9 +37,8 @@ class SpecialName(BaseModel): def var_schema_validate_enum(cls, v): if v is None: return v - if v not in ('available', 'pending', 'sold'): - raise ValueError("must validate the enum values ('available', 'pending', 'sold')") + raise ValueError("must be one of enum values ('available', 'pending', 'sold')") return v class Config: diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py index e437c7b6d80..3fbcbc493ac 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py @@ -319,7 +319,7 @@ class ModelTests(unittest.TestCase): self.pet.status = "error" self.assertTrue(False) # this line shouldn't execute except ValueError as e: - self.assertTrue("must validate the enum values ('available', 'pending', 'sold')" in str(e)) + self.assertTrue("must be one of enum values ('available', 'pending', 'sold')" in str(e)) def test_object_id(self): pet_ap = petstore_api.Pet(name="test name", photo_urls=["string"]) From 162623e49b3ad4329ae8e5b0b59217ea850f52a9 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 18 Mar 2023 21:10:23 +0800 Subject: [PATCH 062/131] increase timeout (#14991) --- .../client/petstore/typescript/tests/jquery/test-runner.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/test-runner.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/test-runner.ts index 7a08e997835..6f958ffbf65 100644 --- a/samples/openapi3/client/petstore/typescript/tests/jquery/test-runner.ts +++ b/samples/openapi3/client/petstore/typescript/tests/jquery/test-runner.ts @@ -7,7 +7,7 @@ const qunitArgs = { // Path to qunit tests suite targetUrl: `file://${path.join(__dirname, '../index.html')}`, // (optional, 30000 by default) global timeout for the tests suite - timeout: 10000, + timeout: 30000, // (optional, false by default) should the browser console be redirected or not redirectConsole: true, puppeteerArgs: [ '--disable-web-security'] @@ -26,4 +26,4 @@ runQunitPuppeteer(qunitArgs) .catch((ex: any) => { console.error(ex); process.exit(2) - }); \ No newline at end of file + }); From 6e649af9a7d6f12362f4a1ee7521aae4c865f765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Revert?= Date: Sun, 19 Mar 2023 12:59:48 +0100 Subject: [PATCH 063/131] [java-spring] Move JsonProperty annotation from field to getter (#13781) (fix #5705) * 5705: Move JsonProperty annotation to the getters * Regenerate samples * Add jackson check * Add test * Minor fix * Fix test * Fix version * [Java][Spring] update test & samples; add serialization/deserialization test --------- Co-authored-by: Oleh Kurpiak --- .../main/resources/JavaSpring/pojo.mustache | 4 +- .../assertions/AbstractAnnotationAssert.java | 7 + .../java/spring/SpringCodegenTest.java | 53 ++++++ ...ith-fake-endpoints-models-for-testing.yaml | 31 ++++ .../main/java/org/openapitools/model/Pet.java | 12 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/PetApi.java | 17 ++ .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 149 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/PetApi.java | 17 ++ .../model/AdditionalPropertiesAnyTypeDto.java | 2 +- .../model/AdditionalPropertiesArrayDto.java | 2 +- .../model/AdditionalPropertiesBooleanDto.java | 2 +- .../model/AdditionalPropertiesClassDto.java | 22 +-- .../model/AdditionalPropertiesIntegerDto.java | 2 +- .../model/AdditionalPropertiesNumberDto.java | 2 +- .../model/AdditionalPropertiesObjectDto.java | 2 +- .../model/AdditionalPropertiesStringDto.java | 2 +- .../org/openapitools/model/AnimalDto.java | 4 +- .../openapitools/model/ApiResponseDto.java | 6 +- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 6 +- .../openapitools/model/BigCatAllOfDto.java | 2 +- .../org/openapitools/model/BigCatDto.java | 2 +- .../openapitools/model/CapitalizationDto.java | 12 +- .../org/openapitools/model/CatAllOfDto.java | 2 +- .../java/org/openapitools/model/CatDto.java | 2 +- .../org/openapitools/model/CategoryDto.java | 4 +- .../org/openapitools/model/ClassModelDto.java | 2 +- .../org/openapitools/model/ClientDto.java | 2 +- .../model/ContainerDefaultValueDto.java | 8 +- .../org/openapitools/model/DogAllOfDto.java | 2 +- .../java/org/openapitools/model/DogDto.java | 2 +- .../org/openapitools/model/EnumArraysDto.java | 4 +- .../org/openapitools/model/EnumTestDto.java | 10 +- .../java/org/openapitools/model/FileDto.java | 2 +- .../model/FileSchemaTestClassDto.java | 4 +- .../org/openapitools/model/FormatTestDto.java | 28 ++-- .../model/HasOnlyReadOnlyDto.java | 4 +- .../java/org/openapitools/model/ListDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 8 +- ...ertiesAndAdditionalPropertiesClassDto.java | 6 +- .../model/Model200ResponseDto.java | 4 +- .../java/org/openapitools/model/NameDto.java | 8 +- .../org/openapitools/model/NumberOnlyDto.java | 2 +- .../java/org/openapitools/model/OrderDto.java | 12 +- .../openapitools/model/OuterCompositeDto.java | 6 +- .../java/org/openapitools/model/PetDto.java | 12 +- .../openapitools/model/ReadOnlyFirstDto.java | 4 +- ...ponseObjectWithDifferentFieldNamesDto.java | 151 +++++++++++++++++ .../org/openapitools/model/ReturnDto.java | 2 +- .../model/SpecialModelNameDto.java | 2 +- .../java/org/openapitools/model/TagDto.java | 4 +- .../model/TypeHolderDefaultDto.java | 10 +- .../model/TypeHolderExampleDto.java | 12 +- .../java/org/openapitools/model/UserDto.java | 16 +- .../org/openapitools/model/XmlItemDto.java | 58 +++---- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/PetApi.java | 26 +++ .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../org/openapitools/model/Addressable.java | 4 +- .../main/java/org/openapitools/model/Bar.java | 8 +- .../org/openapitools/model/BarCreate.java | 6 +- .../java/org/openapitools/model/Entity.java | 10 +- .../org/openapitools/model/EntityRef.java | 14 +- .../org/openapitools/model/Extensible.java | 6 +- .../main/java/org/openapitools/model/Foo.java | 4 +- .../java/org/openapitools/model/FooRef.java | 2 +- .../java/org/openapitools/model/Pasta.java | 2 +- .../java/org/openapitools/model/Pizza.java | 2 +- .../org/openapitools/model/PizzaSpeziale.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../.openapi-generator-ignore | 2 + .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 28 ++++ .../openapitools/api/FakeApiController.java | 1 + .../org/openapitools/api/FakeApiDelegate.java | 22 +++ .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ ...ferentFieldNamesJsonSerializationTest.java | 57 +++++++ .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 38 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 26 +++ .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../model/ObjectWithUniqueItems.java | 12 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 29 ++++ .../openapitools/api/FakeApiController.java | 1 + .../org/openapitools/api/FakeApiDelegate.java | 22 +++ .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 29 ++++ .../openapitools/api/FakeApiController.java | 1 + .../org/openapitools/api/FakeApiDelegate.java | 22 +++ .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../java/org/openapitools/model/Category.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../java/org/openapitools/model/Order.java | 12 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../java/org/openapitools/model/User.java | 16 +- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 30 ++++ .../openapitools/api/FakeApiController.java | 1 + .../org/openapitools/api/FakeApiDelegate.java | 23 +++ .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../org/openapitools/model/BigCatAllOf.java | 2 +- .../openapitools/model/Capitalization.java | 12 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/CatAllOf.java | 2 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../java/org/openapitools/model/DogAllOf.java | 2 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../java/org/openapitools/model/EnumTest.java | 10 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 28 ++-- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../openapitools/model/Model200Response.java | 4 +- .../openapitools/model/ModelApiResponse.java | 6 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 8 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 12 +- .../openapitools/model/OuterComposite.java | 6 +- .../main/java/org/openapitools/model/Pet.java | 12 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 156 +++++++++++++++++ .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 4 +- .../openapitools/model/TypeHolderDefault.java | 10 +- .../openapitools/model/TypeHolderExample.java | 12 +- .../java/org/openapitools/model/User.java | 16 +- .../java/org/openapitools/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../.openapi-generator/FILES | 1 + .../openapitools/virtualan/api/FakeApi.java | 39 +++++ .../virtualan/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +-- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../openapitools/virtualan/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayTest.java | 6 +- .../openapitools/virtualan/model/BigCat.java | 2 +- .../virtualan/model/BigCatAllOf.java | 2 +- .../virtualan/model/Capitalization.java | 12 +- .../org/openapitools/virtualan/model/Cat.java | 2 +- .../virtualan/model/CatAllOf.java | 2 +- .../virtualan/model/Category.java | 4 +- .../virtualan/model/ClassModel.java | 2 +- .../openapitools/virtualan/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 8 +- .../org/openapitools/virtualan/model/Dog.java | 2 +- .../virtualan/model/DogAllOf.java | 2 +- .../virtualan/model/EnumArrays.java | 4 +- .../virtualan/model/EnumTest.java | 10 +- .../openapitools/virtualan/model/File.java | 2 +- .../virtualan/model/FileSchemaTestClass.java | 4 +- .../virtualan/model/FormatTest.java | 28 ++-- .../virtualan/model/HasOnlyReadOnly.java | 4 +- .../openapitools/virtualan/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../virtualan/model/Model200Response.java | 4 +- .../virtualan/model/ModelApiResponse.java | 6 +- .../virtualan/model/ModelList.java | 2 +- .../virtualan/model/ModelReturn.java | 2 +- .../openapitools/virtualan/model/Name.java | 8 +- .../virtualan/model/NumberOnly.java | 2 +- .../openapitools/virtualan/model/Order.java | 12 +- .../virtualan/model/OuterComposite.java | 6 +- .../org/openapitools/virtualan/model/Pet.java | 12 +- .../virtualan/model/ReadOnlyFirst.java | 4 +- ...ResponseObjectWithDifferentFieldNames.java | 155 +++++++++++++++++ .../virtualan/model/SpecialModelName.java | 2 +- .../org/openapitools/virtualan/model/Tag.java | 4 +- .../virtualan/model/TypeHolderDefault.java | 10 +- .../virtualan/model/TypeHolderExample.java | 12 +- .../openapitools/virtualan/model/User.java | 16 +- .../openapitools/virtualan/model/XmlItem.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ .../springboot/.openapi-generator/FILES | 1 + .../java/org/openapitools/api/FakeApi.java | 39 +++++ .../openapitools/api/FakeApiController.java | 1 + .../model/AdditionalPropertiesAnyTypeDto.java | 2 +- .../model/AdditionalPropertiesArrayDto.java | 2 +- .../model/AdditionalPropertiesBooleanDto.java | 2 +- .../model/AdditionalPropertiesClassDto.java | 22 +-- .../model/AdditionalPropertiesIntegerDto.java | 2 +- .../model/AdditionalPropertiesNumberDto.java | 2 +- .../model/AdditionalPropertiesObjectDto.java | 2 +- .../model/AdditionalPropertiesStringDto.java | 2 +- .../org/openapitools/model/AnimalDto.java | 4 +- .../openapitools/model/ApiResponseDto.java | 6 +- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 6 +- .../openapitools/model/BigCatAllOfDto.java | 2 +- .../org/openapitools/model/BigCatDto.java | 2 +- .../openapitools/model/CapitalizationDto.java | 12 +- .../org/openapitools/model/CatAllOfDto.java | 2 +- .../java/org/openapitools/model/CatDto.java | 2 +- .../org/openapitools/model/CategoryDto.java | 4 +- .../org/openapitools/model/ClassModelDto.java | 2 +- .../org/openapitools/model/ClientDto.java | 2 +- .../model/ContainerDefaultValueDto.java | 8 +- .../org/openapitools/model/DogAllOfDto.java | 2 +- .../java/org/openapitools/model/DogDto.java | 2 +- .../org/openapitools/model/EnumArraysDto.java | 4 +- .../org/openapitools/model/EnumTestDto.java | 10 +- .../java/org/openapitools/model/FileDto.java | 2 +- .../model/FileSchemaTestClassDto.java | 4 +- .../org/openapitools/model/FormatTestDto.java | 28 ++-- .../model/HasOnlyReadOnlyDto.java | 4 +- .../java/org/openapitools/model/ListDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 8 +- ...ertiesAndAdditionalPropertiesClassDto.java | 6 +- .../model/Model200ResponseDto.java | 4 +- .../java/org/openapitools/model/NameDto.java | 8 +- .../org/openapitools/model/NumberOnlyDto.java | 2 +- .../java/org/openapitools/model/OrderDto.java | 12 +- .../openapitools/model/OuterCompositeDto.java | 6 +- .../java/org/openapitools/model/PetDto.java | 12 +- .../openapitools/model/ReadOnlyFirstDto.java | 4 +- ...ponseObjectWithDifferentFieldNamesDto.java | 158 ++++++++++++++++++ .../org/openapitools/model/ReturnDto.java | 2 +- .../model/SpecialModelNameDto.java | 2 +- .../java/org/openapitools/model/TagDto.java | 4 +- .../model/TypeHolderDefaultDto.java | 10 +- .../model/TypeHolderExampleDto.java | 12 +- .../java/org/openapitools/model/UserDto.java | 16 +- .../org/openapitools/model/XmlItemDto.java | 58 +++---- .../src/main/resources/openapi.yaml | 41 +++++ 1067 files changed, 6984 insertions(+), 3468 deletions(-) create mode 100644 samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java create mode 100644 samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java create mode 100644 samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java create mode 100644 samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 796178329b6..e7f8b62369e 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -45,7 +45,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/isContainer}} {{/isEnum}} {{#jackson}} - @JsonProperty("{{baseName}}") {{#withXml}} @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") {{/withXml}} @@ -185,6 +184,9 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{#swagger1AnnotationLibrary}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}") {{/swagger1AnnotationLibrary}} + {{#jackson}} + @JsonProperty("{{baseName}}") + {{/jackson}} public {{>nullableDataType}} {{getter}}() { return {{name}}; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java index 05b53d5fa09..5a9e6412618 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java @@ -35,6 +35,13 @@ public abstract class AbstractAnnotationAssert annotation.getNameAsString().equals(name)); + return myself(); + } + public ACTUAL containsWithNameAndAttributes(final String name, final Map attributes) { super .withFailMessage("Should have annotation with name: " + name + " and attributes: " + attributes + ", but was: " + actual) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index c5ffa396581..46cec50b1b3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -2144,4 +2144,57 @@ public class SpringCodegenTest { return generator.opts(input).generate().stream() .collect(Collectors.toMap(File::getName, Function.identity())); } + + @Test + public void shouldGenerateJsonPropertyAnnotationLocatedInGetters_issue5705() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); + SpringCodegen codegen = new SpringCodegen(); + codegen.setLibrary(SPRING_BOOT); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput() + .openAPI(openAPI) + .config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + Map files = generator.opts(input).generate().stream() + .collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("ResponseObjectWithDifferentFieldNames.java")) + .hasProperty("normalPropertyName") + .assertPropertyAnnotations() + .doesNotContainsWithName("JsonProperty") + .toProperty().toType() + .hasProperty("UPPER_CASE_PROPERTY_SNAKE") + .assertPropertyAnnotations() + .doesNotContainsWithName("JsonProperty") + .toProperty().toType() + .hasProperty("lowerCasePropertyDashes") + .assertPropertyAnnotations() + .doesNotContainsWithName("JsonProperty") + .toProperty().toType() + .hasProperty("propertyNameWithSpaces") + .assertPropertyAnnotations() + .doesNotContainsWithName("JsonProperty") + .toProperty().toType() + .assertMethod("getNormalPropertyName") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"normalPropertyName\"")) + .toMethod().toFileAssert() + .assertMethod("getUPPERCASEPROPERTYSNAKE") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"UPPER_CASE_PROPERTY_SNAKE\"")) + .toMethod().toFileAssert() + .assertMethod("getLowerCasePropertyDashes") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"lower-case-property-dashes\"")) + .toMethod().toFileAssert() + .assertMethod("getPropertyNameWithSpaces") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"property name with spaces\"")); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml index 7f51877150e..27c97636a18 100644 --- a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1091,6 +1091,26 @@ paths: - petstore_auth: - write:pets - read:pets + /fake/{petId}/response-object-different-names: + get: + tags: + - pet + operationId: responseObjectDifferentNames + 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/ResponseObjectWithDifferentFieldNames" servers: - url: http://petstore.swagger.io:80/v2 components: @@ -2006,3 +2026,14 @@ components: items: type: string default: ["foo", "bar"] + ResponseObjectWithDifferentFieldNames: + type: object + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java index b8d21304b6c..a8eed0033a8 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java @@ -26,23 +26,17 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("@type") private String atType = "Pet"; - @JsonProperty("age") private Integer age = 4; - @JsonProperty("happy") private Boolean happy = true; - @JsonProperty("price") private BigDecimal price = new BigDecimal("32000000000"); - @JsonProperty("lastFeed") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault())); - @JsonProperty("dateOfBirth") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate dateOfBirth = LocalDate.parse("2021-01-01"); @@ -73,6 +67,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("@type") public String getAtType() { return atType; } @@ -92,6 +87,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("age") public Integer getAge() { return age; } @@ -111,6 +107,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("happy") public Boolean getHappy() { return happy; } @@ -130,6 +127,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("price") public BigDecimal getPrice() { return price; } @@ -149,6 +147,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("lastFeed") public OffsetDateTime getLastFeed() { return lastFeed; } @@ -168,6 +167,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateOfBirth") public LocalDate getDateOfBirth() { return dateOfBirth; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java index 909b0aba4e3..4a167e1c112 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -40,6 +38,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -59,6 +58,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java index 52fb11fd3cf..a6a56521498 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -25,13 +25,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -45,6 +42,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -64,6 +62,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -83,6 +82,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java index 66d9df6dfd9..45802212a9d 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java @@ -26,16 +26,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -76,10 +72,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -93,6 +87,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -112,6 +107,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -131,6 +127,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -150,6 +147,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -169,6 +167,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -188,6 +187,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java index ce02f3c7d4e..086df08a3ed 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -82,7 +77,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -113,6 +107,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -132,6 +127,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -151,6 +147,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -178,6 +175,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -205,6 +203,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -224,6 +223,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java index b30aa3fd9a2..b6d3df29573 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -40,6 +38,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -59,6 +58,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java index 8d71f0fcc04..a5233b08ae5 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java @@ -23,28 +23,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -58,6 +50,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -77,6 +70,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -96,6 +90,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -115,6 +110,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -134,6 +130,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -153,6 +150,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -172,6 +170,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -191,6 +190,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java index 909b0aba4e3..4a167e1c112 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -40,6 +38,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -59,6 +58,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java index 52fb11fd3cf..a6a56521498 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -25,13 +25,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -45,6 +42,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -64,6 +62,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -83,6 +82,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java index 66d9df6dfd9..45802212a9d 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java @@ -26,16 +26,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -76,10 +72,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -93,6 +87,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -112,6 +107,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -131,6 +127,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -150,6 +147,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -169,6 +167,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -188,6 +187,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index ce02f3c7d4e..086df08a3ed 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -82,7 +77,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -113,6 +107,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -132,6 +127,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -151,6 +147,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -178,6 +175,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -205,6 +203,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -224,6 +223,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index b30aa3fd9a2..b6d3df29573 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -40,6 +38,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -59,6 +58,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java index 8d71f0fcc04..a5233b08ae5 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java @@ -23,28 +23,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -58,6 +50,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -77,6 +70,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -96,6 +90,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -115,6 +110,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -134,6 +130,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -153,6 +150,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -172,6 +170,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -191,6 +190,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES index 8f0d232df2e..4507343d0db 100644 --- a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES +++ b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES @@ -50,6 +50,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java index 9e4acf4039d..86811e2f6b0 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -7,6 +7,7 @@ package org.openapitools.api; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import java.util.Set; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -122,6 +123,22 @@ public interface PetApi { ); + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @HttpExchange( + method = "GET", + value = "/fake/{petId}/response-object-different-names", + accept = "application/json" + ) + Mono> responseObjectDifferentNames( + @PathVariable("petId") Long petId + ); + + /** * PUT /pet : Update an existing pet * diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 83b1c4518de..f9f724ee2d5 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -34,6 +33,7 @@ public class AdditionalPropertiesAnyType extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index e26bc092550..a33e9dba812 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -22,7 +22,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -35,6 +34,7 @@ public class AdditionalPropertiesArray extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 5f3960d561d..c48df238f91 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -34,6 +33,7 @@ public class AdditionalPropertiesBoolean extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 446381cac9d..a70c6615754 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") private Map mapString = new HashMap<>(); - @JsonProperty("map_number") private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -85,6 +74,7 @@ public class AdditionalPropertiesClass { * @return mapString */ + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -111,6 +101,7 @@ public class AdditionalPropertiesClass { * @return mapNumber */ + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -137,6 +128,7 @@ public class AdditionalPropertiesClass { * @return mapInteger */ + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -163,6 +155,7 @@ public class AdditionalPropertiesClass { * @return mapBoolean */ + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -189,6 +182,7 @@ public class AdditionalPropertiesClass { * @return mapArrayInteger */ + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -215,6 +209,7 @@ public class AdditionalPropertiesClass { * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -241,6 +236,7 @@ public class AdditionalPropertiesClass { * @return mapMapString */ + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -267,6 +263,7 @@ public class AdditionalPropertiesClass { * @return mapMapAnytype */ + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -285,6 +282,7 @@ public class AdditionalPropertiesClass { * @return anytype1 */ + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -303,6 +301,7 @@ public class AdditionalPropertiesClass { * @return anytype2 */ + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -321,6 +320,7 @@ public class AdditionalPropertiesClass { * @return anytype3 */ + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 6c0650b76c5..8e2100e5ab1 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -34,6 +33,7 @@ public class AdditionalPropertiesInteger extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 2ad29c75e7d..fb86e5c04d4 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -22,7 +22,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -35,6 +34,7 @@ public class AdditionalPropertiesNumber extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index af2d1826f1c..b060bec7340 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -34,6 +33,7 @@ public class AdditionalPropertiesObject extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 1cb12bed916..a25c047d621 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -34,6 +33,7 @@ public class AdditionalPropertiesString extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java index babc11283a2..9b842e16448 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java @@ -36,10 +36,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -68,6 +66,7 @@ public class Animal { * @return className */ @NotNull + @JsonProperty("className") public String getClassName() { return className; } @@ -86,6 +85,7 @@ public class Animal { * @return color */ + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 3c67eaef5c5..fce10900269 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -22,7 +22,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") private List> arrayArrayNumber; @@ -44,6 +43,7 @@ public class ArrayOfArrayOfNumberOnly { * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index faa58324e8c..543e76c186e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -22,7 +22,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") private List arrayNumber; @@ -44,6 +43,7 @@ public class ArrayOfNumberOnly { * @return arrayNumber */ + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 976ff46bf45..c13565386f5 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -22,15 +22,12 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") private List arrayOfString; - @JsonProperty("array_array_of_integer") private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") private List> arrayArrayOfModel; @@ -52,6 +49,7 @@ public class ArrayTest { * @return arrayOfString */ + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -78,6 +76,7 @@ public class ArrayTest { * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -104,6 +103,7 @@ public class ArrayTest { * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java index d965e16521b..b13e3d40559 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -64,7 +64,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -93,6 +92,7 @@ public class BigCat extends Cat { * @return kind */ + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java index 37e401dfd52..017c44034ae 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -61,7 +61,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -74,6 +73,7 @@ public class BigCatAllOf { * @return kind */ + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java index 2e4f6745fa5..7e51263a3e0 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java @@ -19,22 +19,16 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -47,6 +41,7 @@ public class Capitalization { * @return smallCamel */ + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -65,6 +60,7 @@ public class Capitalization { * @return capitalCamel */ + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -83,6 +79,7 @@ public class Capitalization { * @return smallSnake */ + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -101,6 +98,7 @@ public class Capitalization { * @return capitalSnake */ + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -119,6 +117,7 @@ public class Capitalization { * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -137,6 +136,7 @@ public class Capitalization { * @return ATT_NAME */ + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java index 3e54e9eb258..53a04191db4 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java @@ -33,7 +33,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -62,6 +61,7 @@ public class Cat extends Animal { * @return declawed */ + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java index c95d2391d81..2ea1a62e728 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -34,6 +33,7 @@ public class CatAllOf { * @return declawed */ + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java index dcbbaf3e1e3..ad92aa2ac55 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java @@ -19,10 +19,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -51,6 +49,7 @@ public class Category { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -69,6 +68,7 @@ public class Category { * @return name */ @NotNull + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java index b943a1fb706..6f77dbccad1 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java @@ -19,7 +19,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -32,6 +31,7 @@ public class ClassModel { * @return propertyClass */ + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java index b4d2844d1a7..795dd87d179 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java @@ -19,7 +19,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -32,6 +31,7 @@ public class Client { * @return client */ + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 22b58754add..00d8190f7d4 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -24,19 +24,15 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -75,6 +71,7 @@ public class ContainerDefaultValue { * @return nullableArray */ + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -101,6 +98,7 @@ public class ContainerDefaultValue { * @return nullableRequiredArray */ @NotNull + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -127,6 +125,7 @@ public class ContainerDefaultValue { * @return requiredArray */ @NotNull + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -153,6 +152,7 @@ public class ContainerDefaultValue { * @return nullableArrayWithDefault */ + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java index c23c2b8c3d6..35620441ea9 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java @@ -24,7 +24,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -53,6 +52,7 @@ public class Dog extends Animal { * @return breed */ + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java index 99edfab4008..e95125f5988 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -34,6 +33,7 @@ public class DogAllOf { * @return breed */ + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java index 373b363378b..5171f2ef55a 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -57,7 +57,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -95,7 +94,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") private List arrayEnum; @@ -109,6 +107,7 @@ public class EnumArrays { * @return justSymbol */ + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -135,6 +134,7 @@ public class EnumArrays { * @return arrayEnum */ + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java index c3d6f8740be..029db62632d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -60,7 +60,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -100,7 +99,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -138,7 +136,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -176,10 +173,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -208,6 +203,7 @@ public class EnumTest { * @return enumString */ + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -226,6 +222,7 @@ public class EnumTest { * @return enumStringRequired */ @NotNull + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -244,6 +241,7 @@ public class EnumTest { * @return enumInteger */ + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -262,6 +260,7 @@ public class EnumTest { * @return enumNumber */ + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -280,6 +279,7 @@ public class EnumTest { * @return outerEnum */ + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java index 379835e7997..e26d5254d17 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java @@ -19,7 +19,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -32,6 +31,7 @@ public class File { * @return sourceURI */ + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 8baddab3db9..9db7d300466 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,10 +22,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") private List files; @@ -39,6 +37,7 @@ public class FileSchemaTestClass { * @return file */ + @JsonProperty("file") public File getFile() { return file; } @@ -65,6 +64,7 @@ public class FileSchemaTestClass { * @return files */ + @JsonProperty("files") public List getFiles() { return files; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java index ea6488d76b1..33e8057b49e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java @@ -27,48 +27,34 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -102,6 +88,7 @@ public class FormatTest { * @return integer */ + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -122,6 +109,7 @@ public class FormatTest { * @return int32 */ + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -140,6 +128,7 @@ public class FormatTest { * @return int64 */ + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -160,6 +149,7 @@ public class FormatTest { * @return number */ @NotNull + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -180,6 +170,7 @@ public class FormatTest { * @return _float */ + @JsonProperty("float") public Float getFloat() { return _float; } @@ -200,6 +191,7 @@ public class FormatTest { * @return _double */ + @JsonProperty("double") public Double getDouble() { return _double; } @@ -218,6 +210,7 @@ public class FormatTest { * @return string */ + @JsonProperty("string") public String getString() { return string; } @@ -236,6 +229,7 @@ public class FormatTest { * @return _byte */ @NotNull + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -254,6 +248,7 @@ public class FormatTest { * @return binary */ + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -272,6 +267,7 @@ public class FormatTest { * @return date */ @NotNull + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -290,6 +286,7 @@ public class FormatTest { * @return dateTime */ + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -308,6 +305,7 @@ public class FormatTest { * @return uuid */ + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -326,6 +324,7 @@ public class FormatTest { * @return password */ @NotNull + @JsonProperty("password") public String getPassword() { return password; } @@ -344,6 +343,7 @@ public class FormatTest { * @return bigDecimal */ + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 9d186aad54e..7fbc4d282cc 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -21,10 +21,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -37,6 +35,7 @@ public class HasOnlyReadOnly { * @return bar */ + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,6 +54,7 @@ public class HasOnlyReadOnly { * @return foo */ + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java index 1b90373038e..db3d89f780a 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -22,7 +22,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") private Map> mapMapOfString = new HashMap<>(); @@ -61,15 +60,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") private Map indirectMap = new HashMap<>(); @@ -91,6 +87,7 @@ public class MapTest { * @return mapMapOfString */ + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -117,6 +114,7 @@ public class MapTest { * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -143,6 +141,7 @@ public class MapTest { * @return directMap */ + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -169,6 +168,7 @@ public class MapTest { * @return indirectMap */ + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index efa8052677e..8ff1a06c7eb 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -25,14 +25,11 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") private Map map = new HashMap<>(); @@ -46,6 +43,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * @return uuid */ + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -64,6 +62,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * @return dateTime */ + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -90,6 +89,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * @return map */ + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java index 5fb76af8284..f88cd1000c9 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java @@ -21,10 +21,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -37,6 +35,7 @@ public class Model200Response { * @return name */ + @JsonProperty("name") public Integer getName() { return name; } @@ -55,6 +54,7 @@ public class Model200Response { * @return propertyClass */ + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java index 2d95cc265e9..0de21a2fc4b 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -21,13 +21,10 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -40,6 +37,7 @@ public class ModelApiResponse { * @return code */ + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,6 +56,7 @@ public class ModelApiResponse { * @return type */ + @JsonProperty("type") public String getType() { return type; } @@ -76,6 +75,7 @@ public class ModelApiResponse { * @return message */ + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java index 959f91cdfd3..e7dc4ac59a3 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -34,6 +33,7 @@ public class ModelList { * @return _123list */ + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java index 1dc48b70a7f..4fc7c0bf464 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -34,6 +33,7 @@ public class ModelReturn { * @return _return */ + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java index b67fffabe9f..3934b5a3c54 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java @@ -19,16 +19,12 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -57,6 +53,7 @@ public class Name { * @return name */ @NotNull + @JsonProperty("name") public Integer getName() { return name; } @@ -75,6 +72,7 @@ public class Name { * @return snakeCase */ + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -93,6 +91,7 @@ public class Name { * @return property */ + @JsonProperty("property") public String getProperty() { return property; } @@ -111,6 +110,7 @@ public class Name { * @return _123number */ + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java index a634326a1f8..15ead14ac72 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java @@ -20,7 +20,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -33,6 +32,7 @@ public class NumberOnly { * @return justNumber */ + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java index 3eb6bc62e11..ef449034399 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java @@ -22,16 +22,12 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -72,10 +68,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -88,6 +82,7 @@ public class Order { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -106,6 +101,7 @@ public class Order { * @return petId */ + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -124,6 +120,7 @@ public class Order { * @return quantity */ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -142,6 +139,7 @@ public class Order { * @return shipDate */ + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -160,6 +158,7 @@ public class Order { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -178,6 +177,7 @@ public class Order { * @return complete */ + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java index ddc31ebfb44..342a177ec6e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java @@ -20,13 +20,10 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -39,6 +36,7 @@ public class OuterComposite { * @return myNumber */ + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -57,6 +55,7 @@ public class OuterComposite { * @return myString */ + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -75,6 +74,7 @@ public class OuterComposite { * @return myBoolean */ + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java index a9cbcde9787..91d62344c07 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") private List tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -111,6 +105,7 @@ public class Pet { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -129,6 +124,7 @@ public class Pet { * @return category */ + @JsonProperty("category") public Category getCategory() { return category; } @@ -147,6 +143,7 @@ public class Pet { * @return name */ @NotNull + @JsonProperty("name") public String getName() { return name; } @@ -173,6 +170,7 @@ public class Pet { * @return photoUrls */ @NotNull + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -200,6 +198,7 @@ public class Pet { * @return tags */ + @JsonProperty("tags") public List getTags() { return tags; } @@ -218,6 +217,7 @@ public class Pet { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 9c1b537ab92..ab06c3aaa78 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -19,10 +19,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -35,6 +33,7 @@ public class ReadOnlyFirst { * @return bar */ + @JsonProperty("bar") public String getBar() { return bar; } @@ -53,6 +52,7 @@ public class ReadOnlyFirst { * @return baz */ + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..5d6f48d1f5f --- /dev/null +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,149 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import jakarta.validation.constraints.NotNull; + + +import java.util.*; +import jakarta.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index d99aa571dcc..28d60b6af6b 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -34,6 +33,7 @@ public class SpecialModelName { * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java index f2fb6ae6006..d9e14881910 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java @@ -19,10 +19,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -35,6 +33,7 @@ public class Tag { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -53,6 +52,7 @@ public class Tag { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 799aa25fccd..41daada064f 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -22,19 +22,14 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -68,6 +63,7 @@ public class TypeHolderDefault { * @return stringItem */ @NotNull + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -86,6 +82,7 @@ public class TypeHolderDefault { * @return numberItem */ @NotNull + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -104,6 +101,7 @@ public class TypeHolderDefault { * @return integerItem */ @NotNull + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -122,6 +120,7 @@ public class TypeHolderDefault { * @return boolItem */ @NotNull + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -148,6 +147,7 @@ public class TypeHolderDefault { * @return arrayItem */ @NotNull + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index ef2f61f81be..1df30cf80c3 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -22,22 +22,16 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") private List arrayItem = new ArrayList<>(); @@ -72,6 +66,7 @@ public class TypeHolderExample { * @return stringItem */ @NotNull + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +85,7 @@ public class TypeHolderExample { * @return numberItem */ @NotNull + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -108,6 +104,7 @@ public class TypeHolderExample { * @return floatItem */ @NotNull + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -126,6 +123,7 @@ public class TypeHolderExample { * @return integerItem */ @NotNull + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -144,6 +142,7 @@ public class TypeHolderExample { * @return boolItem */ @NotNull + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -170,6 +169,7 @@ public class TypeHolderExample { * @return arrayItem */ @NotNull + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java index 95d28312456..a1975bef3e6 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java @@ -19,28 +19,20 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -53,6 +45,7 @@ public class User { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -71,6 +64,7 @@ public class User { * @return username */ + @JsonProperty("username") public String getUsername() { return username; } @@ -89,6 +83,7 @@ public class User { * @return firstName */ + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -107,6 +102,7 @@ public class User { * @return lastName */ + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -125,6 +121,7 @@ public class User { * @return email */ + @JsonProperty("email") public String getEmail() { return email; } @@ -143,6 +140,7 @@ public class User { * @return password */ + @JsonProperty("password") public String getPassword() { return password; } @@ -161,6 +159,7 @@ public class User { * @return phone */ + @JsonProperty("phone") public String getPhone() { return phone; } @@ -179,6 +178,7 @@ public class User { * @return userStatus */ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java index 89ecd47ea2c..cb4fc73bcb6 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -22,99 +22,70 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") private List nameArray; - @JsonProperty("name_wrapped_array") private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") private List prefixArray; - @JsonProperty("prefix_wrapped_array") private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") private List namespaceArray; - @JsonProperty("namespace_wrapped_array") private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") private List prefixNsWrappedArray; @@ -128,6 +99,7 @@ public class XmlItem { * @return attributeString */ + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -146,6 +118,7 @@ public class XmlItem { * @return attributeNumber */ + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -164,6 +137,7 @@ public class XmlItem { * @return attributeInteger */ + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -182,6 +156,7 @@ public class XmlItem { * @return attributeBoolean */ + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -208,6 +183,7 @@ public class XmlItem { * @return wrappedArray */ + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -226,6 +202,7 @@ public class XmlItem { * @return nameString */ + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -244,6 +221,7 @@ public class XmlItem { * @return nameNumber */ + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -262,6 +240,7 @@ public class XmlItem { * @return nameInteger */ + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -280,6 +259,7 @@ public class XmlItem { * @return nameBoolean */ + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -306,6 +286,7 @@ public class XmlItem { * @return nameArray */ + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -332,6 +313,7 @@ public class XmlItem { * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -350,6 +332,7 @@ public class XmlItem { * @return prefixString */ + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -368,6 +351,7 @@ public class XmlItem { * @return prefixNumber */ + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -386,6 +370,7 @@ public class XmlItem { * @return prefixInteger */ + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -404,6 +389,7 @@ public class XmlItem { * @return prefixBoolean */ + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -430,6 +416,7 @@ public class XmlItem { * @return prefixArray */ + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -456,6 +443,7 @@ public class XmlItem { * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -474,6 +462,7 @@ public class XmlItem { * @return namespaceString */ + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -492,6 +481,7 @@ public class XmlItem { * @return namespaceNumber */ + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -510,6 +500,7 @@ public class XmlItem { * @return namespaceInteger */ + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -528,6 +519,7 @@ public class XmlItem { * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -554,6 +546,7 @@ public class XmlItem { * @return namespaceArray */ + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -580,6 +573,7 @@ public class XmlItem { * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -598,6 +592,7 @@ public class XmlItem { * @return prefixNsString */ + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -616,6 +611,7 @@ public class XmlItem { * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -634,6 +630,7 @@ public class XmlItem { * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -652,6 +649,7 @@ public class XmlItem { * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -678,6 +676,7 @@ public class XmlItem { * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -704,6 +703,7 @@ public class XmlItem { * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/client/petstore/spring-http-interface/.openapi-generator/FILES b/samples/client/petstore/spring-http-interface/.openapi-generator/FILES index 057a6b03c61..12b7506e673 100644 --- a/samples/client/petstore/spring-http-interface/.openapi-generator/FILES +++ b/samples/client/petstore/spring-http-interface/.openapi-generator/FILES @@ -49,6 +49,7 @@ src/main/java/org/openapitools/model/OuterCompositeDto.java src/main/java/org/openapitools/model/OuterEnumDto.java src/main/java/org/openapitools/model/PetDto.java src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java src/main/java/org/openapitools/model/ReturnDto.java src/main/java/org/openapitools/model/SpecialModelNameDto.java src/main/java/org/openapitools/model/TagDto.java diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java index 4cdaa75682a..a685526d90a 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java @@ -7,6 +7,7 @@ package org.openapitools.api; import org.openapitools.model.ApiResponseDto; import org.openapitools.model.PetDto; +import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto; import java.util.Set; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -118,6 +119,22 @@ public interface PetApi { ); + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @HttpExchange( + method = "GET", + value = "/fake/{petId}/response-object-different-names", + accept = "application/json" + ) + ResponseEntity responseObjectDifferentNames( + @PathVariable("petId") Long petId + ); + + /** * PUT /pet : Update an existing pet * diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index 866c0c9d89b..966547c80da 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -23,7 +23,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyTypeDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyTypeDto name(String name) { @@ -36,6 +35,7 @@ public class AdditionalPropertiesAnyTypeDto extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index 67d06814cb3..41bf9effe53 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -24,7 +24,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArrayDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArrayDto name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesArrayDto extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index 53d996e4e84..8335c2ba832 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -23,7 +23,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBooleanDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBooleanDto name(String name) { @@ -36,6 +35,7 @@ public class AdditionalPropertiesBooleanDto extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index e2aa343d20f..7267a4621a5 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -28,45 +28,34 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClassDto { - @JsonProperty("map_string") private Map mapString = new HashMap<>(); - @JsonProperty("map_number") private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { @@ -87,6 +76,7 @@ public class AdditionalPropertiesClassDto { * @return mapString */ + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -113,6 +103,7 @@ public class AdditionalPropertiesClassDto { * @return mapNumber */ + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -139,6 +130,7 @@ public class AdditionalPropertiesClassDto { * @return mapInteger */ + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -165,6 +157,7 @@ public class AdditionalPropertiesClassDto { * @return mapBoolean */ + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -191,6 +184,7 @@ public class AdditionalPropertiesClassDto { * @return mapArrayInteger */ + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -217,6 +211,7 @@ public class AdditionalPropertiesClassDto { * @return mapArrayAnytype */ + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -243,6 +238,7 @@ public class AdditionalPropertiesClassDto { * @return mapMapString */ + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -269,6 +265,7 @@ public class AdditionalPropertiesClassDto { * @return mapMapAnytype */ + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -287,6 +284,7 @@ public class AdditionalPropertiesClassDto { * @return anytype1 */ + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -305,6 +303,7 @@ public class AdditionalPropertiesClassDto { * @return anytype2 */ + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -323,6 +322,7 @@ public class AdditionalPropertiesClassDto { * @return anytype3 */ + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index a1bdab5d351..a7b0f41e864 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -23,7 +23,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesIntegerDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesIntegerDto name(String name) { @@ -36,6 +35,7 @@ public class AdditionalPropertiesIntegerDto extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index 2d449dc7771..955cd7c3aac 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -24,7 +24,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumberDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumberDto name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesNumberDto extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 9ac0fac53cf..eac3c186356 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -23,7 +23,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObjectDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObjectDto name(String name) { @@ -36,6 +35,7 @@ public class AdditionalPropertiesObjectDto extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index 3752cc2f31c..fd8f19f618e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -23,7 +23,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesStringDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesStringDto name(String name) { @@ -36,6 +35,7 @@ public class AdditionalPropertiesStringDto extends HashMap { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java index c17b0385407..8d900cefd09 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java @@ -37,10 +37,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AnimalDto { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public AnimalDto className(String className) { @@ -53,6 +51,7 @@ public class AnimalDto { * @return className */ @NotNull + @JsonProperty("className") public String getClassName() { return className; } @@ -71,6 +70,7 @@ public class AnimalDto { * @return color */ + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java index 5bb9b181174..42c035a52e0 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -21,13 +21,10 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ApiResponseDto { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ApiResponseDto code(Integer code) { @@ -40,6 +37,7 @@ public class ApiResponseDto { * @return code */ + @JsonProperty("code") public Integer getCode() { return code; } @@ -58,6 +56,7 @@ public class ApiResponseDto { * @return type */ + @JsonProperty("type") public String getType() { return type; } @@ -76,6 +75,7 @@ public class ApiResponseDto { * @return message */ + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 2c2b8329de4..da1319e9448 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -24,7 +24,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnlyDto { - @JsonProperty("ArrayArrayNumber") private List> arrayArrayNumber; @@ -46,6 +45,7 @@ public class ArrayOfArrayOfNumberOnlyDto { * @return arrayArrayNumber */ + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index c971a0fbb1e..7c60e613a26 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -24,7 +24,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnlyDto { - @JsonProperty("ArrayNumber") private List arrayNumber; @@ -46,6 +45,7 @@ public class ArrayOfNumberOnlyDto { * @return arrayNumber */ + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java index d5676cf3302..202e9497ccd 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -24,15 +24,12 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTestDto { - @JsonProperty("array_of_string") private List arrayOfString; - @JsonProperty("array_array_of_integer") private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") private List> arrayArrayOfModel; @@ -54,6 +51,7 @@ public class ArrayTestDto { * @return arrayOfString */ + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -80,6 +78,7 @@ public class ArrayTestDto { * @return arrayArrayOfInteger */ + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -106,6 +105,7 @@ public class ArrayTestDto { * @return arrayArrayOfModel */ + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java index 46a31a13a9c..34759c89187 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java @@ -61,7 +61,6 @@ public class BigCatAllOfDto { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOfDto kind(KindEnum kind) { @@ -74,6 +73,7 @@ public class BigCatAllOfDto { * @return kind */ + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java index 4277020c8dc..b30873ccfde 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java @@ -66,7 +66,6 @@ public class BigCatDto extends CatDto { } } - @JsonProperty("kind") private KindEnum kind; public BigCatDto kind(KindEnum kind) { @@ -79,6 +78,7 @@ public class BigCatDto extends CatDto { * @return kind */ + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java index 3f041a318d2..05c0616d28e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -21,22 +21,16 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CapitalizationDto { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public CapitalizationDto smallCamel(String smallCamel) { @@ -49,6 +43,7 @@ public class CapitalizationDto { * @return smallCamel */ + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -67,6 +62,7 @@ public class CapitalizationDto { * @return capitalCamel */ + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -85,6 +81,7 @@ public class CapitalizationDto { * @return smallSnake */ + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -103,6 +100,7 @@ public class CapitalizationDto { * @return capitalSnake */ + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -121,6 +119,7 @@ public class CapitalizationDto { * @return scAETHFlowPoints */ + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -139,6 +138,7 @@ public class CapitalizationDto { * @return ATT_NAME */ + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java index 9e6af0303ba..4a89e033886 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOfDto { - @JsonProperty("declawed") private Boolean declawed; public CatAllOfDto declawed(Boolean declawed) { @@ -34,6 +33,7 @@ public class CatAllOfDto { * @return declawed */ + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java index 61f8bc958e6..ffa90838488 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java @@ -34,7 +34,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatDto extends AnimalDto { - @JsonProperty("declawed") private Boolean declawed; public CatDto declawed(Boolean declawed) { @@ -47,6 +46,7 @@ public class CatDto extends AnimalDto { * @return declawed */ + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java index b3aebedbe87..86a70d003fe 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java @@ -21,10 +21,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CategoryDto { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public CategoryDto id(Long id) { @@ -37,6 +35,7 @@ public class CategoryDto { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -55,6 +54,7 @@ public class CategoryDto { * @return name */ @NotNull + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java index 8a4fc71e614..e32c199f912 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModelDto { - @JsonProperty("_class") private String propertyClass; public ClassModelDto propertyClass(String propertyClass) { @@ -34,6 +33,7 @@ public class ClassModelDto { * @return propertyClass */ + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java index 9185bd7de97..807f0684770 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClientDto { - @JsonProperty("client") private String client; public ClientDto client(String client) { @@ -34,6 +33,7 @@ public class ClientDto { * @return client */ + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 9d13d762de9..8e89bf7bcd4 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -26,19 +26,15 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValueDto { - @JsonProperty("nullable_array") private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -60,6 +56,7 @@ public class ContainerDefaultValueDto { * @return nullableArray */ + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -86,6 +83,7 @@ public class ContainerDefaultValueDto { * @return nullableRequiredArray */ @NotNull + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -112,6 +110,7 @@ public class ContainerDefaultValueDto { * @return requiredArray */ @NotNull + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -138,6 +137,7 @@ public class ContainerDefaultValueDto { * @return nullableArrayWithDefault */ + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java index 13ca9db43a5..59e98fa8c70 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOfDto { - @JsonProperty("breed") private String breed; public DogAllOfDto breed(String breed) { @@ -34,6 +33,7 @@ public class DogAllOfDto { * @return breed */ + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java index 3cd4ba41e44..878670e1812 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java @@ -26,7 +26,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogDto extends AnimalDto { - @JsonProperty("breed") private String breed; public DogDto breed(String breed) { @@ -39,6 +38,7 @@ public class DogDto extends AnimalDto { * @return breed */ + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java index fc87a8026c8..1c1c01d8f68 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -59,7 +59,6 @@ public class EnumArraysDto { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public class EnumArraysDto { } } - @JsonProperty("array_enum") private List arrayEnum; @@ -111,6 +109,7 @@ public class EnumArraysDto { * @return justSymbol */ + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -137,6 +136,7 @@ public class EnumArraysDto { * @return arrayEnum */ + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java index f799473c14f..2153d6b4cc9 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java @@ -60,7 +60,6 @@ public class EnumTestDto { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -100,7 +99,6 @@ public class EnumTestDto { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -138,7 +136,6 @@ public class EnumTestDto { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -176,10 +173,8 @@ public class EnumTestDto { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnumDto outerEnum; public EnumTestDto enumString(EnumStringEnum enumString) { @@ -192,6 +187,7 @@ public class EnumTestDto { * @return enumString */ + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -210,6 +206,7 @@ public class EnumTestDto { * @return enumStringRequired */ @NotNull + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -228,6 +225,7 @@ public class EnumTestDto { * @return enumInteger */ + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -246,6 +244,7 @@ public class EnumTestDto { * @return enumNumber */ + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -264,6 +263,7 @@ public class EnumTestDto { * @return outerEnum */ + @JsonProperty("outerEnum") public OuterEnumDto getOuterEnum() { return outerEnum; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java index c2a46710955..de6980c4ae2 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileDto { - @JsonProperty("sourceURI") private String sourceURI; public FileDto sourceURI(String sourceURI) { @@ -34,6 +33,7 @@ public class FileDto { * @return sourceURI */ + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 1d3e103819a..dfd2796c531 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -24,10 +24,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClassDto { - @JsonProperty("file") private FileDto file; - @JsonProperty("files") private List files; @@ -41,6 +39,7 @@ public class FileSchemaTestClassDto { * @return file */ + @JsonProperty("file") public FileDto getFile() { return file; } @@ -67,6 +66,7 @@ public class FileSchemaTestClassDto { * @return files */ + @JsonProperty("files") public List getFiles() { return files; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java index c3f24d344c5..68f17b1f1f2 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java @@ -27,48 +27,34 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTestDto { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTestDto integer(Integer integer) { @@ -83,6 +69,7 @@ public class FormatTestDto { * @return integer */ + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -103,6 +90,7 @@ public class FormatTestDto { * @return int32 */ + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -121,6 +109,7 @@ public class FormatTestDto { * @return int64 */ + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -141,6 +130,7 @@ public class FormatTestDto { * @return number */ @NotNull + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -161,6 +151,7 @@ public class FormatTestDto { * @return _float */ + @JsonProperty("float") public Float getFloat() { return _float; } @@ -181,6 +172,7 @@ public class FormatTestDto { * @return _double */ + @JsonProperty("double") public Double getDouble() { return _double; } @@ -199,6 +191,7 @@ public class FormatTestDto { * @return string */ + @JsonProperty("string") public String getString() { return string; } @@ -217,6 +210,7 @@ public class FormatTestDto { * @return _byte */ @NotNull + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -235,6 +229,7 @@ public class FormatTestDto { * @return binary */ + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -253,6 +248,7 @@ public class FormatTestDto { * @return date */ @NotNull + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -271,6 +267,7 @@ public class FormatTestDto { * @return dateTime */ + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -289,6 +286,7 @@ public class FormatTestDto { * @return uuid */ + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -307,6 +305,7 @@ public class FormatTestDto { * @return password */ @NotNull + @JsonProperty("password") public String getPassword() { return password; } @@ -325,6 +324,7 @@ public class FormatTestDto { * @return bigDecimal */ + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index 3c361299744..1c311a43247 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -21,10 +21,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnlyDto { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnlyDto bar(String bar) { @@ -37,6 +35,7 @@ public class HasOnlyReadOnlyDto { * @return bar */ + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,6 +54,7 @@ public class HasOnlyReadOnlyDto { * @return foo */ + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java index 733fa698453..2c7f5040a16 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ListDto { - @JsonProperty("123-list") private String _123list; public ListDto _123list(String _123list) { @@ -34,6 +33,7 @@ public class ListDto { * @return _123list */ + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java index 82a99c07ad9..e74eafef2e9 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java @@ -24,7 +24,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTestDto { - @JsonProperty("map_map_of_string") private Map> mapMapOfString = new HashMap<>(); @@ -63,15 +62,12 @@ public class MapTestDto { } } - @JsonProperty("map_of_enum_string") private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") private Map indirectMap = new HashMap<>(); @@ -93,6 +89,7 @@ public class MapTestDto { * @return mapMapOfString */ + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -119,6 +116,7 @@ public class MapTestDto { * @return mapOfEnumString */ + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -145,6 +143,7 @@ public class MapTestDto { * @return directMap */ + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -171,6 +170,7 @@ public class MapTestDto { * @return indirectMap */ + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index c5a17c21d44..499c5540a5f 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -27,14 +27,11 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClassDto { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") private Map map = new HashMap<>(); @@ -48,6 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { * @return uuid */ + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -66,6 +64,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { * @return dateTime */ + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -92,6 +91,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { * @return map */ + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java index f2e1a7ae060..0c0c986a0f9 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -21,10 +21,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200ResponseDto { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200ResponseDto name(Integer name) { @@ -37,6 +35,7 @@ public class Model200ResponseDto { * @return name */ + @JsonProperty("name") public Integer getName() { return name; } @@ -55,6 +54,7 @@ public class Model200ResponseDto { * @return propertyClass */ + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java index d560dd759ec..e8a5563cabb 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java @@ -21,16 +21,12 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NameDto { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public NameDto name(Integer name) { @@ -43,6 +39,7 @@ public class NameDto { * @return name */ @NotNull + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +58,7 @@ public class NameDto { * @return snakeCase */ + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -79,6 +77,7 @@ public class NameDto { * @return property */ + @JsonProperty("property") public String getProperty() { return property; } @@ -97,6 +96,7 @@ public class NameDto { * @return _123number */ + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java index e449f9cf036..36659acdd2d 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -22,7 +22,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnlyDto { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnlyDto justNumber(BigDecimal justNumber) { @@ -35,6 +34,7 @@ public class NumberOnlyDto { * @return justNumber */ + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java index 57896816729..83aaefccc2a 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java @@ -24,16 +24,12 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OrderDto { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public class OrderDto { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public OrderDto id(Long id) { @@ -90,6 +84,7 @@ public class OrderDto { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -108,6 +103,7 @@ public class OrderDto { * @return petId */ + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -126,6 +122,7 @@ public class OrderDto { * @return quantity */ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -144,6 +141,7 @@ public class OrderDto { * @return shipDate */ + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -162,6 +160,7 @@ public class OrderDto { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -180,6 +179,7 @@ public class OrderDto { * @return complete */ + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java index 19cdb62012c..aa8b26075f8 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -22,13 +22,10 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterCompositeDto { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterCompositeDto myNumber(BigDecimal myNumber) { @@ -41,6 +38,7 @@ public class OuterCompositeDto { * @return myNumber */ + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -59,6 +57,7 @@ public class OuterCompositeDto { * @return myString */ + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -77,6 +76,7 @@ public class OuterCompositeDto { * @return myBoolean */ + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java index 65c15dde159..a4a33e8e3b9 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java @@ -29,20 +29,15 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class PetDto { - @JsonProperty("id") private Long id; - @JsonProperty("category") private CategoryDto category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") private List tags; @@ -83,7 +78,6 @@ public class PetDto { } } - @JsonProperty("status") private StatusEnum status; public PetDto id(Long id) { @@ -96,6 +90,7 @@ public class PetDto { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -114,6 +109,7 @@ public class PetDto { * @return category */ + @JsonProperty("category") public CategoryDto getCategory() { return category; } @@ -132,6 +128,7 @@ public class PetDto { * @return name */ @NotNull + @JsonProperty("name") public String getName() { return name; } @@ -158,6 +155,7 @@ public class PetDto { * @return photoUrls */ @NotNull + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -185,6 +183,7 @@ public class PetDto { * @return tags */ + @JsonProperty("tags") public List getTags() { return tags; } @@ -203,6 +202,7 @@ public class PetDto { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index 7ab8278a698..a7557dfd7aa 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -21,10 +21,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirstDto { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirstDto bar(String bar) { @@ -37,6 +35,7 @@ public class ReadOnlyFirstDto { * @return bar */ + @JsonProperty("bar") public String getBar() { return bar; } @@ -55,6 +54,7 @@ public class ReadOnlyFirstDto { * @return baz */ + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java new file mode 100644 index 00000000000..550a49f8bf1 --- /dev/null +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -0,0 +1,151 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import jakarta.validation.constraints.NotNull; + + +import java.util.*; +import jakarta.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNamesDto + */ + +@JsonTypeName("ResponseObjectWithDifferentFieldNames") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNamesDto { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNamesDto responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNamesDto) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNamesDto {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java index 99bdea143ef..8fcbd415e28 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReturnDto { - @JsonProperty("return") private Integer _return; public ReturnDto _return(Integer _return) { @@ -34,6 +33,7 @@ public class ReturnDto { * @return _return */ + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java index 1818d96452c..009a9f9e423 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -21,7 +21,6 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelNameDto { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelNameDto $specialPropertyName(Long $specialPropertyName) { @@ -34,6 +33,7 @@ public class SpecialModelNameDto { * @return $specialPropertyName */ + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java index f3381428ec1..b9c8195bfa6 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java @@ -21,10 +21,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TagDto { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public TagDto id(Long id) { @@ -37,6 +35,7 @@ public class TagDto { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -55,6 +54,7 @@ public class TagDto { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 989330c9165..2b6d79d2e11 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -24,19 +24,14 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefaultDto { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -50,6 +45,7 @@ public class TypeHolderDefaultDto { * @return stringItem */ @NotNull + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -68,6 +64,7 @@ public class TypeHolderDefaultDto { * @return numberItem */ @NotNull + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -86,6 +83,7 @@ public class TypeHolderDefaultDto { * @return integerItem */ @NotNull + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -104,6 +102,7 @@ public class TypeHolderDefaultDto { * @return boolItem */ @NotNull + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -130,6 +129,7 @@ public class TypeHolderDefaultDto { * @return arrayItem */ @NotNull + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index dc6721ab240..85c6a38798f 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -24,22 +24,16 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExampleDto { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") private List arrayItem = new ArrayList<>(); @@ -53,6 +47,7 @@ public class TypeHolderExampleDto { * @return stringItem */ @NotNull + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -71,6 +66,7 @@ public class TypeHolderExampleDto { * @return numberItem */ @NotNull + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -89,6 +85,7 @@ public class TypeHolderExampleDto { * @return floatItem */ @NotNull + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -107,6 +104,7 @@ public class TypeHolderExampleDto { * @return integerItem */ @NotNull + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -125,6 +123,7 @@ public class TypeHolderExampleDto { * @return boolItem */ @NotNull + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -151,6 +150,7 @@ public class TypeHolderExampleDto { * @return arrayItem */ @NotNull + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java index 01b2b3abce9..3cec69778ea 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java @@ -21,28 +21,20 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class UserDto { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public UserDto id(Long id) { @@ -55,6 +47,7 @@ public class UserDto { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -73,6 +66,7 @@ public class UserDto { * @return username */ + @JsonProperty("username") public String getUsername() { return username; } @@ -91,6 +85,7 @@ public class UserDto { * @return firstName */ + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -109,6 +104,7 @@ public class UserDto { * @return lastName */ + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -127,6 +123,7 @@ public class UserDto { * @return email */ + @JsonProperty("email") public String getEmail() { return email; } @@ -145,6 +142,7 @@ public class UserDto { * @return password */ + @JsonProperty("password") public String getPassword() { return password; } @@ -163,6 +161,7 @@ public class UserDto { * @return phone */ + @JsonProperty("phone") public String getPhone() { return phone; } @@ -181,6 +180,7 @@ public class UserDto { * @return userStatus */ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java index c7c50eb4b4a..fccde590190 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java @@ -24,99 +24,70 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItemDto { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") private List nameArray; - @JsonProperty("name_wrapped_array") private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") private List prefixArray; - @JsonProperty("prefix_wrapped_array") private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") private List namespaceArray; - @JsonProperty("namespace_wrapped_array") private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") private List prefixNsWrappedArray; @@ -130,6 +101,7 @@ public class XmlItemDto { * @return attributeString */ + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -148,6 +120,7 @@ public class XmlItemDto { * @return attributeNumber */ + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -166,6 +139,7 @@ public class XmlItemDto { * @return attributeInteger */ + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -184,6 +158,7 @@ public class XmlItemDto { * @return attributeBoolean */ + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -210,6 +185,7 @@ public class XmlItemDto { * @return wrappedArray */ + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -228,6 +204,7 @@ public class XmlItemDto { * @return nameString */ + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -246,6 +223,7 @@ public class XmlItemDto { * @return nameNumber */ + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -264,6 +242,7 @@ public class XmlItemDto { * @return nameInteger */ + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -282,6 +261,7 @@ public class XmlItemDto { * @return nameBoolean */ + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -308,6 +288,7 @@ public class XmlItemDto { * @return nameArray */ + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -334,6 +315,7 @@ public class XmlItemDto { * @return nameWrappedArray */ + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -352,6 +334,7 @@ public class XmlItemDto { * @return prefixString */ + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -370,6 +353,7 @@ public class XmlItemDto { * @return prefixNumber */ + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -388,6 +372,7 @@ public class XmlItemDto { * @return prefixInteger */ + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -406,6 +391,7 @@ public class XmlItemDto { * @return prefixBoolean */ + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -432,6 +418,7 @@ public class XmlItemDto { * @return prefixArray */ + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -458,6 +445,7 @@ public class XmlItemDto { * @return prefixWrappedArray */ + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -476,6 +464,7 @@ public class XmlItemDto { * @return namespaceString */ + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -494,6 +483,7 @@ public class XmlItemDto { * @return namespaceNumber */ + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -512,6 +502,7 @@ public class XmlItemDto { * @return namespaceInteger */ + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -530,6 +521,7 @@ public class XmlItemDto { * @return namespaceBoolean */ + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -556,6 +548,7 @@ public class XmlItemDto { * @return namespaceArray */ + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -582,6 +575,7 @@ public class XmlItemDto { * @return namespaceWrappedArray */ + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -600,6 +594,7 @@ public class XmlItemDto { * @return prefixNsString */ + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -618,6 +613,7 @@ public class XmlItemDto { * @return prefixNsNumber */ + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -636,6 +632,7 @@ public class XmlItemDto { * @return prefixNsInteger */ + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -654,6 +651,7 @@ public class XmlItemDto { * @return prefixNsBoolean */ + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -680,6 +678,7 @@ public class XmlItemDto { * @return prefixNsArray */ + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -706,6 +705,7 @@ public class XmlItemDto { * @return prefixNsWrappedArray */ + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java index e2206012211..f288a0edde9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java index 6f12dac83ae..369df105a62 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java index 8e9325fbea4..906d04ddd72 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java index f18b714d61c..52bb7a983b1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java index 98c023bf698..2f0f6cb4760 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java index 753145eb0b3..55f1824b941 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java index 18b55b13d16..0c0e8e8e72a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java index e18ac769bd2..00924b168ab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java index 317082440c6..4c1bb184a39 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6b..7ed29b5a5c0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java index b748650e3c0..adea27d0193 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java index ac6ddb97bbc..9ec0b712b14 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java index d4de6f24409..004fa56cd11 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java @@ -25,23 +25,17 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("@type") private String atType = "Pet"; - @JsonProperty("age") private Integer age = 4; - @JsonProperty("happy") private Boolean happy = true; - @JsonProperty("price") private BigDecimal price = new BigDecimal("32000000000"); - @JsonProperty("lastFeed") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault())); - @JsonProperty("dateOfBirth") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate dateOfBirth = LocalDate.parse("2021-01-01"); @@ -72,6 +66,7 @@ public class Pet { */ @NotNull @Schema(name = "@type", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("@type") public String getAtType() { return atType; } @@ -91,6 +86,7 @@ public class Pet { */ @Schema(name = "age", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("age") public Integer getAge() { return age; } @@ -110,6 +106,7 @@ public class Pet { */ @Schema(name = "happy", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("happy") public Boolean getHappy() { return happy; } @@ -129,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "price", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("price") public BigDecimal getPrice() { return price; } @@ -148,6 +146,7 @@ public class Pet { */ @Valid @Schema(name = "lastFeed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastFeed") public OffsetDateTime getLastFeed() { return lastFeed; } @@ -167,6 +166,7 @@ public class Pet { */ @Valid @Schema(name = "dateOfBirth", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateOfBirth") public LocalDate getDateOfBirth() { return dateOfBirth; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES index bdc0d268f43..5ebc7f2a19f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES @@ -49,6 +49,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java index 52b514af35a..d093b19bbcb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java @@ -7,6 +7,7 @@ package org.openapitools.api; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import java.util.Set; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -208,6 +209,31 @@ public interface PetApi { ); + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = "application/json" + ) + ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ); + + /** * PUT /pet : Update an existing pet * diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0661c1a9a8d..690bd609d23 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a3f9c905789..db5353d2d35 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index db5f8d3ce35..5beed6563d9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 66e0aed61c6..eff5bd5fa4b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ff0d6d7241e..e3d835a5124 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index cc212be855d..6cde3b272d2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 7c74b7de08d..948a430c814 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 6087e70dba7..d59141c231c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesString extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java index 079192f597a..01e303621e4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; public Animal className(String className) { @@ -55,6 +53,7 @@ public class Animal { */ @NotNull @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("className") public String getClassName() { return className; } @@ -74,6 +73,7 @@ public class Animal { */ @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 5b6c415bd66..d7f3b9f37fa 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 4e84838be3b..6215ba771a0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java index f7c9710a1ee..d53a9e07ad8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -55,6 +52,7 @@ public class ArrayTest { */ @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -82,6 +80,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -109,6 +108,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java index 1b367854915..1185161d530 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; public BigCat kind(KindEnum kind) { @@ -80,6 +79,7 @@ public class BigCat extends Cat { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java index 741de9f41a3..bff7b148aa2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -77,6 +76,7 @@ public class BigCatAllOf { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java index 0c56400050b..31142a864ec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -50,6 +44,7 @@ public class Capitalization { */ @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -69,6 +64,7 @@ public class Capitalization { */ @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -88,6 +84,7 @@ public class Capitalization { */ @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -107,6 +104,7 @@ public class Capitalization { */ @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -126,6 +124,7 @@ public class Capitalization { */ @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -145,6 +144,7 @@ public class Capitalization { */ @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java index 41d9863046f..2a6ad16814c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; public Cat declawed(Boolean declawed) { @@ -49,6 +48,7 @@ public class Cat extends Animal { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java index 50a9c2cdce9..0bd8697513e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -37,6 +36,7 @@ public class CatAllOf { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java index 980faf6cbc2..89a67825e64 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; public Category id(Long id) { @@ -38,6 +36,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -57,6 +56,7 @@ public class Category { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java index a1942e9c404..95bad44f680 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -36,6 +35,7 @@ public class ClassModel { */ @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java index c38b26829be..c070bc9214b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -35,6 +34,7 @@ public class Client { */ @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java index ae4b8d558ca..6c5b41d66d4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -61,6 +57,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -88,6 +85,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -115,6 +113,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -142,6 +141,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java index e39fe3fdab2..9c16eaab598 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; public Dog breed(String breed) { @@ -40,6 +39,7 @@ public class Dog extends Animal { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java index 256925a7841..6b11905f99a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -37,6 +36,7 @@ public class DogAllOf { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java index a96e0290b0b..3d3280a42dc 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -112,6 +110,7 @@ public class EnumArrays { */ @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -139,6 +138,7 @@ public class EnumArrays { */ @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java index a92050b09f5..3b9b41f5acf 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; public EnumTest enumString(EnumStringEnum enumString) { @@ -195,6 +190,7 @@ public class EnumTest { */ @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -214,6 +210,7 @@ public class EnumTest { */ @NotNull @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -233,6 +230,7 @@ public class EnumTest { */ @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -252,6 +250,7 @@ public class EnumTest { */ @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -271,6 +270,7 @@ public class EnumTest { */ @Valid @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java index bf750ccdcb7..7b04101a36a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -36,6 +35,7 @@ public class File { */ @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dae9b27f93a..be6e37a7aba 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java index 23130acbb76..81c7dcc4e28 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java @@ -29,48 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; public FormatTest integer(Integer integer) { @@ -86,6 +72,7 @@ public class FormatTest { */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -107,6 +94,7 @@ public class FormatTest { */ @Min(20) @Max(200) @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -126,6 +114,7 @@ public class FormatTest { */ @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -147,6 +136,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -168,6 +158,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -189,6 +180,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -208,6 +200,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("string") public String getString() { return string; } @@ -227,6 +220,7 @@ public class FormatTest { */ @NotNull @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -246,6 +240,7 @@ public class FormatTest { */ @Valid @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -265,6 +260,7 @@ public class FormatTest { */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -284,6 +280,7 @@ public class FormatTest { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -303,6 +300,7 @@ public class FormatTest { */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -322,6 +320,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -341,6 +340,7 @@ public class FormatTest { */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index c218d0e02b8..196214695a1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -40,6 +38,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -59,6 +58,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java index 74cab2e2f8c..7215fd65d7a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -63,15 +62,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -94,6 +90,7 @@ public class MapTest { */ @Valid @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -121,6 +118,7 @@ public class MapTest { */ @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -148,6 +146,7 @@ public class MapTest { */ @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -175,6 +174,7 @@ public class MapTest { */ @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d6b45daabd7..7dd078dbaa8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -49,6 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -68,6 +66,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -95,6 +94,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java index 9ca96d114aa..32198c000f1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -41,6 +39,7 @@ public class Model200Response { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -60,6 +59,7 @@ public class Model200Response { */ @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java index 06c806057b5..0a803038551 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -62,6 +60,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -81,6 +80,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java index f168748f6a2..c2ac56a57a7 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -37,6 +36,7 @@ public class ModelList { */ @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java index 641c56cd81c..83da161c83f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -38,6 +37,7 @@ public class ModelReturn { */ @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java index 708b0b90b01..85808ddbaa4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; public Name name(Integer name) { @@ -45,6 +41,7 @@ public class Name { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -64,6 +61,7 @@ public class Name { */ @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -83,6 +81,7 @@ public class Name { */ @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property") public String getProperty() { return property; } @@ -102,6 +101,7 @@ public class Name { */ @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java index 4a3b6beffa2..1ec233732c3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -36,6 +35,7 @@ public class NumberOnly { */ @Valid @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java index 9a5b61bad43..9566edcbed8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -110,6 +105,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -129,6 +125,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -148,6 +145,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -167,6 +165,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -186,6 +185,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java index b66d6d38afb..6b611504866 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -42,6 +39,7 @@ public class OuterComposite { */ @Valid @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -61,6 +59,7 @@ public class OuterComposite { */ @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -80,6 +79,7 @@ public class OuterComposite { */ @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java index fbbb929632c..b313f7bb7e2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; public Pet id(Long id) { @@ -97,6 +91,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -116,6 +111,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -135,6 +131,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -162,6 +159,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -190,6 +188,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -209,6 +208,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 8c43e7e8c30..8891d8dac55 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -38,6 +36,7 @@ public class ReadOnlyFirst { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,6 +56,7 @@ public class ReadOnlyFirst { */ @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..c681122f5f8 --- /dev/null +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java index e0a16a7b89a..51dfdf9de43 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -37,6 +36,7 @@ public class SpecialModelName { */ @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java index 03d5607e29b..b6dd153652a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -57,6 +56,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java index 76919cfbaaf..eda3e4f43d3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -51,6 +46,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -70,6 +66,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -89,6 +86,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -108,6 +106,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -135,6 +134,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java index 6bcf2fdb5ef..fe3412f3358 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -54,6 +48,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -73,6 +68,7 @@ public class TypeHolderExample { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -92,6 +88,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -111,6 +108,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -130,6 +128,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -157,6 +156,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java index e09df9be7b7..cf6f9233680 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -75,6 +68,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -94,6 +88,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -113,6 +108,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -132,6 +128,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -151,6 +148,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -170,6 +168,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -189,6 +188,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java index 280941921cd..cf49606e181 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -131,6 +102,7 @@ public class XmlItem { */ @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -150,6 +122,7 @@ public class XmlItem { */ @Valid @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -169,6 +142,7 @@ public class XmlItem { */ @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -188,6 +162,7 @@ public class XmlItem { */ @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -215,6 +190,7 @@ public class XmlItem { */ @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -234,6 +210,7 @@ public class XmlItem { */ @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -253,6 +230,7 @@ public class XmlItem { */ @Valid @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -272,6 +250,7 @@ public class XmlItem { */ @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -291,6 +270,7 @@ public class XmlItem { */ @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -318,6 +298,7 @@ public class XmlItem { */ @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -345,6 +326,7 @@ public class XmlItem { */ @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -364,6 +346,7 @@ public class XmlItem { */ @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -383,6 +366,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -402,6 +386,7 @@ public class XmlItem { */ @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -421,6 +406,7 @@ public class XmlItem { */ @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -448,6 +434,7 @@ public class XmlItem { */ @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -475,6 +462,7 @@ public class XmlItem { */ @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -494,6 +482,7 @@ public class XmlItem { */ @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -513,6 +502,7 @@ public class XmlItem { */ @Valid @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -532,6 +522,7 @@ public class XmlItem { */ @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -551,6 +542,7 @@ public class XmlItem { */ @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -578,6 +570,7 @@ public class XmlItem { */ @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -605,6 +598,7 @@ public class XmlItem { */ @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -624,6 +618,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -643,6 +638,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -662,6 +658,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -681,6 +678,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -708,6 +706,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -735,6 +734,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java index 2a90a2f0a4f..43a8c980585 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index e18ac769bd2..00924b168ab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java index 317082440c6..4c1bb184a39 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6b..7ed29b5a5c0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java index b748650e3c0..adea27d0193 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java index ac6ddb97bbc..9ec0b712b14 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java index 18b55b13d16..0c0e8e8e72a 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java index e18ac769bd2..00924b168ab 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java index 317082440c6..4c1bb184a39 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6b..7ed29b5a5c0 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index b748650e3c0..adea27d0193 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java index ac6ddb97bbc..9ec0b712b14 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java index 18b55b13d16..0c0e8e8e72a 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java index e18ac769bd2..00924b168ab 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java index 317082440c6..4c1bb184a39 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6b..7ed29b5a5c0 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java index b748650e3c0..adea27d0193 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java index ac6ddb97bbc..9ec0b712b14 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java index 18b55b13d16..0c0e8e8e72a 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java index e18ac769bd2..00924b168ab 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java index 317082440c6..4c1bb184a39 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6b..7ed29b5a5c0 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java index b748650e3c0..adea27d0193 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java index ac6ddb97bbc..9ec0b712b14 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java index 0feef057e32..fd5cd5a64ce 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Addressable { - @JsonProperty("href") private String href; - @JsonProperty("id") private String id; public Addressable href(String href) { @@ -39,6 +37,7 @@ public class Addressable { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("href") public String getHref() { return href; } @@ -58,6 +57,7 @@ public class Addressable { */ @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public String getId() { return id; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java index 39979e84ce8..803778570b2 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java @@ -27,16 +27,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Bar extends Entity implements BarRefOrValue { - @JsonProperty("id") private String id; - @JsonProperty("barPropA") private String barPropA; - @JsonProperty("fooPropB") private String fooPropB; - @JsonProperty("foo") private FooRefOrValue foo; /** @@ -67,6 +63,7 @@ public class Bar extends Entity implements BarRefOrValue { */ @NotNull @Schema(name = "id", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("id") public String getId() { return id; } @@ -86,6 +83,7 @@ public class Bar extends Entity implements BarRefOrValue { */ @Schema(name = "barPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("barPropA") public String getBarPropA() { return barPropA; } @@ -105,6 +103,7 @@ public class Bar extends Entity implements BarRefOrValue { */ @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("fooPropB") public String getFooPropB() { return fooPropB; } @@ -124,6 +123,7 @@ public class Bar extends Entity implements BarRefOrValue { */ @Valid @Schema(name = "foo", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("foo") public FooRefOrValue getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java index 2e54e090ba2..7d81d917f19 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java @@ -29,13 +29,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class BarCreate extends Entity { - @JsonProperty("barPropA") private String barPropA; - @JsonProperty("fooPropB") private String fooPropB; - @JsonProperty("foo") private FooRefOrValue foo; /** @@ -65,6 +62,7 @@ public class BarCreate extends Entity { */ @Schema(name = "barPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("barPropA") public String getBarPropA() { return barPropA; } @@ -84,6 +82,7 @@ public class BarCreate extends Entity { */ @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("fooPropB") public String getFooPropB() { return fooPropB; } @@ -103,6 +102,7 @@ public class BarCreate extends Entity { */ @Valid @Schema(name = "foo", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("foo") public FooRefOrValue getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java index f562753ad8a..064c16eafbb 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java @@ -44,19 +44,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Entity { - @JsonProperty("href") private String href; - @JsonProperty("id") private String id; - @JsonProperty("@schemaLocation") private String atSchemaLocation; - @JsonProperty("@baseType") private String atBaseType; - @JsonProperty("@type") private String atType; /** @@ -86,6 +81,7 @@ public class Entity { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("href") public String getHref() { return href; } @@ -105,6 +101,7 @@ public class Entity { */ @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public String getId() { return id; } @@ -124,6 +121,7 @@ public class Entity { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("@schemaLocation") public String getAtSchemaLocation() { return atSchemaLocation; } @@ -143,6 +141,7 @@ public class Entity { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("@baseType") public String getAtBaseType() { return atBaseType; } @@ -162,6 +161,7 @@ public class Entity { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("@type") public String getAtType() { return atType; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java index aa5d638da28..22ae8438363 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java @@ -37,25 +37,18 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class EntityRef { - @JsonProperty("name") private String name; - @JsonProperty("@referredType") private String atReferredType; - @JsonProperty("href") private String href; - @JsonProperty("id") private String id; - @JsonProperty("@schemaLocation") private String atSchemaLocation; - @JsonProperty("@baseType") private String atBaseType; - @JsonProperty("@type") private String atType; /** @@ -85,6 +78,7 @@ public class EntityRef { */ @Schema(name = "name", description = "Name of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -104,6 +98,7 @@ public class EntityRef { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("@referredType") public String getAtReferredType() { return atReferredType; } @@ -123,6 +118,7 @@ public class EntityRef { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("href") public String getHref() { return href; } @@ -142,6 +138,7 @@ public class EntityRef { */ @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public String getId() { return id; } @@ -161,6 +158,7 @@ public class EntityRef { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("@schemaLocation") public String getAtSchemaLocation() { return atSchemaLocation; } @@ -180,6 +178,7 @@ public class EntityRef { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("@baseType") public String getAtBaseType() { return atBaseType; } @@ -199,6 +198,7 @@ public class EntityRef { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("@type") public String getAtType() { return atType; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java index 1a441eee6e8..f62ccc5c6a0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java @@ -21,13 +21,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Extensible { - @JsonProperty("@schemaLocation") private String atSchemaLocation; - @JsonProperty("@baseType") private String atBaseType; - @JsonProperty("@type") private String atType; /** @@ -57,6 +54,7 @@ public class Extensible { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("@schemaLocation") public String getAtSchemaLocation() { return atSchemaLocation; } @@ -76,6 +74,7 @@ public class Extensible { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("@baseType") public String getAtBaseType() { return atBaseType; } @@ -95,6 +94,7 @@ public class Extensible { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("@type") public String getAtType() { return atType; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java index 2a62b82f81d..76ef9bac7f4 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java @@ -26,10 +26,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Foo extends Entity implements FooRefOrValue { - @JsonProperty("fooPropA") private String fooPropA; - @JsonProperty("fooPropB") private String fooPropB; /** @@ -59,6 +57,7 @@ public class Foo extends Entity implements FooRefOrValue { */ @Schema(name = "fooPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("fooPropA") public String getFooPropA() { return fooPropA; } @@ -78,6 +77,7 @@ public class Foo extends Entity implements FooRefOrValue { */ @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("fooPropB") public String getFooPropB() { return fooPropB; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java index f0386a82498..b62f240056d 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FooRef extends EntityRef implements FooRefOrValue { - @JsonProperty("foorefPropA") private String foorefPropA; /** @@ -56,6 +55,7 @@ public class FooRef extends EntityRef implements FooRefOrValue { */ @Schema(name = "foorefPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("foorefPropA") public String getFoorefPropA() { return foorefPropA; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java index ad530678535..20611d5541b 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pasta extends Entity { - @JsonProperty("vendor") private String vendor; /** @@ -56,6 +55,7 @@ public class Pasta extends Entity { */ @Schema(name = "vendor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("vendor") public String getVendor() { return vendor; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java index a8710951406..9d58604106e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java @@ -36,7 +36,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pizza extends Entity { - @JsonProperty("pizzaSize") private BigDecimal pizzaSize; /** @@ -66,6 +65,7 @@ public class Pizza extends Entity { */ @Valid @Schema(name = "pizzaSize", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("pizzaSize") public BigDecimal getPizzaSize() { return pizzaSize; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java index a4c5f53565e..3109ecf660d 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class PizzaSpeziale extends Pizza { - @JsonProperty("toppings") private String toppings; /** @@ -57,6 +56,7 @@ public class PizzaSpeziale extends Pizza { */ @Schema(name = "toppings", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("toppings") public String getToppings() { return toppings; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java index 18b55b13d16..0c0e8e8e72a 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java index e18ac769bd2..00924b168ab 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java index 317082440c6..4c1bb184a39 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6b..7ed29b5a5c0 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java index b748650e3c0..adea27d0193 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java index ac6ddb97bbc..9ec0b712b14 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java index e2206012211..f288a0edde9 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java index 6f12dac83ae..369df105a62 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java index 8e9325fbea4..906d04ddd72 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java index f18b714d61c..52bb7a983b1 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java index 98c023bf698..2f0f6cb4760 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java index 753145eb0b3..55f1824b941 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import jakarta.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index dcd0fe59179..38c62f8a00e 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber = null; @@ -46,6 +45,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index d38ec8372a3..fb6a073750a 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber = null; @@ -46,6 +45,7 @@ public class ArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index 7bd997fdce4..54c8c21ef28 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -23,15 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString = null; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger = null; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel = null; @@ -54,6 +51,7 @@ public class ArrayTest { */ @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -81,6 +79,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -108,6 +107,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index 71b077585e2..88a67562412 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -58,7 +58,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -96,7 +95,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum = null; @@ -111,6 +109,7 @@ public class EnumArrays { */ @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -138,6 +137,7 @@ public class EnumArrays { */ @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index d84afd1cc53..bed4f577bd2 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -23,99 +23,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray = null; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray = null; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray = null; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray = null; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray = null; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray = null; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray = null; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray = null; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray = null; @@ -130,6 +101,7 @@ public class XmlItem { */ @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -149,6 +121,7 @@ public class XmlItem { */ @Valid @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -168,6 +141,7 @@ public class XmlItem { */ @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -187,6 +161,7 @@ public class XmlItem { */ @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -214,6 +189,7 @@ public class XmlItem { */ @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -233,6 +209,7 @@ public class XmlItem { */ @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -252,6 +229,7 @@ public class XmlItem { */ @Valid @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -271,6 +249,7 @@ public class XmlItem { */ @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -290,6 +269,7 @@ public class XmlItem { */ @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -317,6 +297,7 @@ public class XmlItem { */ @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -344,6 +325,7 @@ public class XmlItem { */ @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -363,6 +345,7 @@ public class XmlItem { */ @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -382,6 +365,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -401,6 +385,7 @@ public class XmlItem { */ @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -420,6 +405,7 @@ public class XmlItem { */ @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -447,6 +433,7 @@ public class XmlItem { */ @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -474,6 +461,7 @@ public class XmlItem { */ @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -493,6 +481,7 @@ public class XmlItem { */ @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -512,6 +501,7 @@ public class XmlItem { */ @Valid @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -531,6 +521,7 @@ public class XmlItem { */ @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -550,6 +541,7 @@ public class XmlItem { */ @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -577,6 +569,7 @@ public class XmlItem { */ @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -604,6 +597,7 @@ public class XmlItem { */ @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -623,6 +617,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -642,6 +637,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -661,6 +657,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -680,6 +677,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -707,6 +705,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -734,6 +733,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore index 7484ee590a3..b7d19e03b54 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore @@ -21,3 +21,5 @@ #docs/*.md # Then explicitly reverse the ignore rule for a single file: #!docs/README.md + +src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES index 16d8f2a6323..50815c779dc 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index d047a0540c6..9f2e5b2da3e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -195,6 +196,33 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { + return getDelegate().responseObjectDifferentNames(petId); + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f1..b88f6171955 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index d1a650378e6..65ea3c13eae 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; @@ -107,6 +108,27 @@ public interface FakeApiDelegate { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + * @see FakeApi#responseObjectDifferentNames + */ + default ResponseEntity responseObjectDifferentNames(Long petId) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0661c1a9a8d..690bd609d23 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a3f9c905789..db5353d2d35 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index db5f8d3ce35..5beed6563d9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 66e0aed61c6..eff5bd5fa4b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ff0d6d7241e..e3d835a5124 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index cc212be855d..6cde3b272d2 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 7c74b7de08d..948a430c814 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 6087e70dba7..d59141c231c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesString extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index 1ecf10efc5c..51d21426e8f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -71,6 +69,7 @@ public class Animal { */ @NotNull @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("className") public String getClassName() { return className; } @@ -90,6 +89,7 @@ public class Animal { */ @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 5b6c415bd66..d7f3b9f37fa 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 4e84838be3b..6215ba771a0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index f7c9710a1ee..d53a9e07ad8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -55,6 +52,7 @@ public class ArrayTest { */ @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -82,6 +80,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -109,6 +108,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index 8c5453c4a5b..52359888607 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -96,6 +95,7 @@ public class BigCat extends Cat { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java index 741de9f41a3..bff7b148aa2 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -77,6 +76,7 @@ public class BigCatAllOf { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java index 0c56400050b..31142a864ec 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -50,6 +44,7 @@ public class Capitalization { */ @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -69,6 +64,7 @@ public class Capitalization { */ @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -88,6 +84,7 @@ public class Capitalization { */ @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -107,6 +104,7 @@ public class Capitalization { */ @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -126,6 +124,7 @@ public class Capitalization { */ @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -145,6 +144,7 @@ public class Capitalization { */ @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index a2feece8de8..7fe1ed5d2b8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -65,6 +64,7 @@ public class Cat extends Animal { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java index 50a9c2cdce9..0bd8697513e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -37,6 +36,7 @@ public class CatAllOf { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java index 7ee1fde0646..745935143d1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -54,6 +52,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -73,6 +72,7 @@ public class Category { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java index a1942e9c404..95bad44f680 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -36,6 +35,7 @@ public class ClassModel { */ @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java index c38b26829be..c070bc9214b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -35,6 +34,7 @@ public class Client { */ @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 55d20539817..ebcd1eede94 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -78,6 +74,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -105,6 +102,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -132,6 +130,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -159,6 +158,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index 1bb3d6b5102..b339978e542 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -56,6 +55,7 @@ public class Dog extends Animal { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java index 256925a7841..6b11905f99a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -37,6 +36,7 @@ public class DogAllOf { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index a96e0290b0b..3d3280a42dc 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -112,6 +110,7 @@ public class EnumArrays { */ @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -139,6 +138,7 @@ public class EnumArrays { */ @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index 6f08d4ee9fb..e785606f0e1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -211,6 +206,7 @@ public class EnumTest { */ @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -230,6 +226,7 @@ public class EnumTest { */ @NotNull @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -249,6 +246,7 @@ public class EnumTest { */ @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -268,6 +266,7 @@ public class EnumTest { */ @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -287,6 +286,7 @@ public class EnumTest { */ @Valid @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java index bf750ccdcb7..7b04101a36a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -36,6 +35,7 @@ public class File { */ @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dae9b27f93a..be6e37a7aba 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java index 06e9dde8e89..bc4f1de88e6 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java @@ -29,48 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -105,6 +91,7 @@ public class FormatTest { */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -126,6 +113,7 @@ public class FormatTest { */ @Min(20) @Max(200) @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -145,6 +133,7 @@ public class FormatTest { */ @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -166,6 +155,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -187,6 +177,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -208,6 +199,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -227,6 +219,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("string") public String getString() { return string; } @@ -246,6 +239,7 @@ public class FormatTest { */ @NotNull @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -265,6 +259,7 @@ public class FormatTest { */ @Valid @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -284,6 +279,7 @@ public class FormatTest { */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -303,6 +299,7 @@ public class FormatTest { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -322,6 +319,7 @@ public class FormatTest { */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -341,6 +339,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -360,6 +359,7 @@ public class FormatTest { */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index c218d0e02b8..196214695a1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -40,6 +38,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -59,6 +58,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index 74cab2e2f8c..7215fd65d7a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -63,15 +62,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -94,6 +90,7 @@ public class MapTest { */ @Valid @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -121,6 +118,7 @@ public class MapTest { */ @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -148,6 +146,7 @@ public class MapTest { */ @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -175,6 +174,7 @@ public class MapTest { */ @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d6b45daabd7..7dd078dbaa8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -49,6 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -68,6 +66,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -95,6 +94,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java index 9ca96d114aa..32198c000f1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -41,6 +39,7 @@ public class Model200Response { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -60,6 +59,7 @@ public class Model200Response { */ @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java index 06c806057b5..0a803038551 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -62,6 +60,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -81,6 +80,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java index f168748f6a2..c2ac56a57a7 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -37,6 +36,7 @@ public class ModelList { */ @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java index 641c56cd81c..83da161c83f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -38,6 +37,7 @@ public class ModelReturn { */ @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java index d6dcb665651..ed42396e815 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -61,6 +57,7 @@ public class Name { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -80,6 +77,7 @@ public class Name { */ @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -99,6 +97,7 @@ public class Name { */ @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property") public String getProperty() { return property; } @@ -118,6 +117,7 @@ public class Name { */ @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java index 4a3b6beffa2..1ec233732c3 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -36,6 +35,7 @@ public class NumberOnly { */ @Valid @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java index 9a5b61bad43..9566edcbed8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -110,6 +105,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -129,6 +125,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -148,6 +145,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -167,6 +165,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -186,6 +185,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java index b66d6d38afb..6b611504866 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -42,6 +39,7 @@ public class OuterComposite { */ @Valid @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -61,6 +59,7 @@ public class OuterComposite { */ @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -80,6 +79,7 @@ public class OuterComposite { */ @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index ba99ad03027..0e76707f06f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 8c43e7e8c30..8891d8dac55 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -38,6 +36,7 @@ public class ReadOnlyFirst { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,6 +56,7 @@ public class ReadOnlyFirst { */ @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..c681122f5f8 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index e0a16a7b89a..51dfdf9de43 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -37,6 +36,7 @@ public class SpecialModelName { */ @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java index 03d5607e29b..b6dd153652a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -57,6 +56,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 12b55e21185..c2217970131 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b74b97d38f..96efe9c2627 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public class TypeHolderExample { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java index e09df9be7b7..cf6f9233680 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -75,6 +68,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -94,6 +88,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -113,6 +108,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -132,6 +128,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -151,6 +148,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -170,6 +168,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -189,6 +188,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 280941921cd..cf49606e181 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -131,6 +102,7 @@ public class XmlItem { */ @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -150,6 +122,7 @@ public class XmlItem { */ @Valid @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -169,6 +142,7 @@ public class XmlItem { */ @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -188,6 +162,7 @@ public class XmlItem { */ @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -215,6 +190,7 @@ public class XmlItem { */ @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -234,6 +210,7 @@ public class XmlItem { */ @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -253,6 +230,7 @@ public class XmlItem { */ @Valid @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -272,6 +250,7 @@ public class XmlItem { */ @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -291,6 +270,7 @@ public class XmlItem { */ @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -318,6 +298,7 @@ public class XmlItem { */ @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -345,6 +326,7 @@ public class XmlItem { */ @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -364,6 +346,7 @@ public class XmlItem { */ @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -383,6 +366,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -402,6 +386,7 @@ public class XmlItem { */ @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -421,6 +406,7 @@ public class XmlItem { */ @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -448,6 +434,7 @@ public class XmlItem { */ @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -475,6 +462,7 @@ public class XmlItem { */ @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -494,6 +482,7 @@ public class XmlItem { */ @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -513,6 +502,7 @@ public class XmlItem { */ @Valid @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -532,6 +522,7 @@ public class XmlItem { */ @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -551,6 +542,7 @@ public class XmlItem { */ @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -578,6 +570,7 @@ public class XmlItem { */ @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -605,6 +598,7 @@ public class XmlItem { */ @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -624,6 +618,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -643,6 +638,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -662,6 +658,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -681,6 +678,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -708,6 +706,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -735,6 +734,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java new file mode 100644 index 00000000000..7b2e5702ed6 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java @@ -0,0 +1,57 @@ +package org.openapitools; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.assertj.core.api.Assertions; +import org.json.JSONException; +import org.junit.jupiter.api.Test; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; +import org.skyscreamer.jsonassert.JSONAssert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class ResponseObjectWithDifferentFieldNamesJsonSerializationTest { + + private static final String JSON_STRING = "{" + + "\"normalPropertyName\": \"normalPropertyName_value\"," + + "\"lower-case-property-dashes\": \"lowerCasePropertyDashes_value\"," + + "\"property name with spaces\": \"propertyNameWithSpaces_value\"," + + "\"UPPER_CASE_PROPERTY_SNAKE\": \"UPPER_CASE_PROPERTY_SNAKE_value\"" + + "}"; + + @Autowired + private ObjectMapper objectMapper; + + @Test + void shouldSerializedModelToJson() throws JsonProcessingException, JSONException { + ResponseObjectWithDifferentFieldNames object = new ResponseObjectWithDifferentFieldNames() + .normalPropertyName("normalPropertyName_value") + .UPPER_CASE_PROPERTY_SNAKE("UPPER_CASE_PROPERTY_SNAKE_value") + .lowerCasePropertyDashes("lowerCasePropertyDashes_value") + .propertyNameWithSpaces("propertyNameWithSpaces_value"); + + String actualJson = objectMapper.writeValueAsString(object); + + JSONAssert.assertEquals(JSON_STRING, actualJson, true); + } + + @Test + void shouldDeserializedJsonToModel() throws JsonProcessingException { + String json = "{" + + "\"normalPropertyName\": \"normalPropertyName_value\"," + + "\"lower-case-property-dashes\": \"lowerCasePropertyDashes_value\"," + + "\"property name with spaces\": \"propertyNameWithSpaces_value\"," + + "\"UPPER_CASE_PROPERTY_SNAKE\": \"UPPER_CASE_PROPERTY_SNAKE_value\"" + + "}"; + + ResponseObjectWithDifferentFieldNames object = objectMapper.readValue(json, ResponseObjectWithDifferentFieldNames.class); + + Assertions.assertThat(object) + .returns("normalPropertyName_value", ResponseObjectWithDifferentFieldNames::getNormalPropertyName) + .returns("UPPER_CASE_PROPERTY_SNAKE_value", ResponseObjectWithDifferentFieldNames::getUPPERCASEPROPERTYSNAKE) + .returns("lowerCasePropertyDashes_value", ResponseObjectWithDifferentFieldNames::getLowerCasePropertyDashes) + .returns("propertyNameWithSpaces_value", ResponseObjectWithDifferentFieldNames::getPropertyNameWithSpaces); + } + +} diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 8263ca2ee05..c904db3800a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 4e0a224db24..47c0b05280f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -213,6 +214,43 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed98..9121a395182 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0661c1a9a8d..690bd609d23 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a3f9c905789..db5353d2d35 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index db5f8d3ce35..5beed6563d9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 66e0aed61c6..eff5bd5fa4b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ff0d6d7241e..e3d835a5124 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index cc212be855d..6cde3b272d2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 7c74b7de08d..948a430c814 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 6087e70dba7..d59141c231c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesString extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index 1ecf10efc5c..51d21426e8f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -71,6 +69,7 @@ public class Animal { */ @NotNull @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("className") public String getClassName() { return className; } @@ -90,6 +89,7 @@ public class Animal { */ @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 5b6c415bd66..d7f3b9f37fa 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 4e84838be3b..6215ba771a0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index f7c9710a1ee..d53a9e07ad8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -55,6 +52,7 @@ public class ArrayTest { */ @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -82,6 +80,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -109,6 +108,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index 8c5453c4a5b..52359888607 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -96,6 +95,7 @@ public class BigCat extends Cat { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java index 741de9f41a3..bff7b148aa2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -77,6 +76,7 @@ public class BigCatAllOf { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java index 0c56400050b..31142a864ec 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -50,6 +44,7 @@ public class Capitalization { */ @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -69,6 +64,7 @@ public class Capitalization { */ @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -88,6 +84,7 @@ public class Capitalization { */ @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -107,6 +104,7 @@ public class Capitalization { */ @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -126,6 +124,7 @@ public class Capitalization { */ @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -145,6 +144,7 @@ public class Capitalization { */ @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index a2feece8de8..7fe1ed5d2b8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -65,6 +64,7 @@ public class Cat extends Animal { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java index 50a9c2cdce9..0bd8697513e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -37,6 +36,7 @@ public class CatAllOf { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java index 7ee1fde0646..745935143d1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -54,6 +52,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -73,6 +72,7 @@ public class Category { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java index a1942e9c404..95bad44f680 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -36,6 +35,7 @@ public class ClassModel { */ @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java index c38b26829be..c070bc9214b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -35,6 +34,7 @@ public class Client { */ @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 55d20539817..ebcd1eede94 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -78,6 +74,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -105,6 +102,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -132,6 +130,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -159,6 +158,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index 1bb3d6b5102..b339978e542 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -56,6 +55,7 @@ public class Dog extends Animal { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java index 256925a7841..6b11905f99a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -37,6 +36,7 @@ public class DogAllOf { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index a96e0290b0b..3d3280a42dc 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -112,6 +110,7 @@ public class EnumArrays { */ @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -139,6 +138,7 @@ public class EnumArrays { */ @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index 6f08d4ee9fb..e785606f0e1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -211,6 +206,7 @@ public class EnumTest { */ @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -230,6 +226,7 @@ public class EnumTest { */ @NotNull @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -249,6 +246,7 @@ public class EnumTest { */ @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -268,6 +266,7 @@ public class EnumTest { */ @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -287,6 +286,7 @@ public class EnumTest { */ @Valid @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java index bf750ccdcb7..7b04101a36a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -36,6 +35,7 @@ public class File { */ @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dae9b27f93a..be6e37a7aba 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java index 06e9dde8e89..bc4f1de88e6 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java @@ -29,48 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -105,6 +91,7 @@ public class FormatTest { */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -126,6 +113,7 @@ public class FormatTest { */ @Min(20) @Max(200) @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -145,6 +133,7 @@ public class FormatTest { */ @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -166,6 +155,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -187,6 +177,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -208,6 +199,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -227,6 +219,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("string") public String getString() { return string; } @@ -246,6 +239,7 @@ public class FormatTest { */ @NotNull @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -265,6 +259,7 @@ public class FormatTest { */ @Valid @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -284,6 +279,7 @@ public class FormatTest { */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -303,6 +299,7 @@ public class FormatTest { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -322,6 +319,7 @@ public class FormatTest { */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -341,6 +339,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -360,6 +359,7 @@ public class FormatTest { */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index c218d0e02b8..196214695a1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -40,6 +38,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -59,6 +58,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 74cab2e2f8c..7215fd65d7a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -63,15 +62,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -94,6 +90,7 @@ public class MapTest { */ @Valid @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -121,6 +118,7 @@ public class MapTest { */ @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -148,6 +146,7 @@ public class MapTest { */ @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -175,6 +174,7 @@ public class MapTest { */ @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d6b45daabd7..7dd078dbaa8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -49,6 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -68,6 +66,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -95,6 +94,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java index 9ca96d114aa..32198c000f1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -41,6 +39,7 @@ public class Model200Response { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -60,6 +59,7 @@ public class Model200Response { */ @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java index 06c806057b5..0a803038551 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -62,6 +60,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -81,6 +80,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java index f168748f6a2..c2ac56a57a7 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -37,6 +36,7 @@ public class ModelList { */ @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java index 641c56cd81c..83da161c83f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -38,6 +37,7 @@ public class ModelReturn { */ @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java index d6dcb665651..ed42396e815 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -61,6 +57,7 @@ public class Name { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -80,6 +77,7 @@ public class Name { */ @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -99,6 +97,7 @@ public class Name { */ @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property") public String getProperty() { return property; } @@ -118,6 +117,7 @@ public class Name { */ @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java index 4a3b6beffa2..1ec233732c3 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -36,6 +35,7 @@ public class NumberOnly { */ @Valid @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java index 9a5b61bad43..9566edcbed8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -110,6 +105,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -129,6 +125,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -148,6 +145,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -167,6 +165,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -186,6 +185,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java index b66d6d38afb..6b611504866 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -42,6 +39,7 @@ public class OuterComposite { */ @Valid @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -61,6 +59,7 @@ public class OuterComposite { */ @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -80,6 +79,7 @@ public class OuterComposite { */ @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index ba99ad03027..0e76707f06f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 8c43e7e8c30..8891d8dac55 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -38,6 +36,7 @@ public class ReadOnlyFirst { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,6 +56,7 @@ public class ReadOnlyFirst { */ @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..c681122f5f8 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index e0a16a7b89a..51dfdf9de43 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -37,6 +36,7 @@ public class SpecialModelName { */ @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java index 03d5607e29b..b6dd153652a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -57,6 +56,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 12b55e21185..c2217970131 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b74b97d38f..96efe9c2627 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public class TypeHolderExample { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java index e09df9be7b7..cf6f9233680 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -75,6 +68,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -94,6 +88,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -113,6 +108,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -132,6 +128,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -151,6 +148,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -170,6 +168,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -189,6 +188,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 280941921cd..cf49606e181 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -131,6 +102,7 @@ public class XmlItem { */ @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -150,6 +122,7 @@ public class XmlItem { */ @Valid @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -169,6 +142,7 @@ public class XmlItem { */ @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -188,6 +162,7 @@ public class XmlItem { */ @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -215,6 +190,7 @@ public class XmlItem { */ @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -234,6 +210,7 @@ public class XmlItem { */ @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -253,6 +230,7 @@ public class XmlItem { */ @Valid @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -272,6 +250,7 @@ public class XmlItem { */ @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -291,6 +270,7 @@ public class XmlItem { */ @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -318,6 +298,7 @@ public class XmlItem { */ @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -345,6 +326,7 @@ public class XmlItem { */ @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -364,6 +346,7 @@ public class XmlItem { */ @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -383,6 +366,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -402,6 +386,7 @@ public class XmlItem { */ @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -421,6 +406,7 @@ public class XmlItem { */ @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -448,6 +434,7 @@ public class XmlItem { */ @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -475,6 +462,7 @@ public class XmlItem { */ @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -494,6 +482,7 @@ public class XmlItem { */ @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -513,6 +502,7 @@ public class XmlItem { */ @Valid @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -532,6 +522,7 @@ public class XmlItem { */ @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -551,6 +542,7 @@ public class XmlItem { */ @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -578,6 +570,7 @@ public class XmlItem { */ @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -605,6 +598,7 @@ public class XmlItem { */ @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -624,6 +618,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -643,6 +638,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -662,6 +658,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -681,6 +678,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -708,6 +706,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -735,6 +734,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java index 0d2e56dfa3d..d48f33e470b 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java @@ -20,10 +20,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -36,6 +34,7 @@ public class Category { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -54,6 +53,7 @@ public class Category { * @return name */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java index f66ed8b5941..5376fa62cc3 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -22,13 +22,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public class ModelApiResponse { * @return code */ + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,6 +57,7 @@ public class ModelApiResponse { * @return type */ + @JsonProperty("type") public String getType() { return type; } @@ -77,6 +76,7 @@ public class ModelApiResponse { * @return message */ + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java index aafcfc0cc19..ad7ddb21736 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -73,10 +69,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public class Order { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -107,6 +102,7 @@ public class Order { * @return petId */ + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -125,6 +121,7 @@ public class Order { * @return quantity */ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,6 +140,7 @@ public class Order { * @return shipDate */ @Valid + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -161,6 +159,7 @@ public class Order { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -179,6 +178,7 @@ public class Order { * @return complete */ + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java index 05bed382e38..f72251ebac0 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java @@ -25,20 +25,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -79,7 +74,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -109,6 +103,7 @@ public class Pet { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -127,6 +122,7 @@ public class Pet { * @return category */ @Valid + @JsonProperty("category") public Category getCategory() { return category; } @@ -145,6 +141,7 @@ public class Pet { * @return name */ @NotNull + @JsonProperty("name") public String getName() { return name; } @@ -171,6 +168,7 @@ public class Pet { * @return photoUrls */ @NotNull + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -197,6 +195,7 @@ public class Pet { * @return tags */ @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -215,6 +214,7 @@ public class Pet { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java index 32f55514e08..ae8b17e7792 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java @@ -20,10 +20,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public class Tag { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -54,6 +53,7 @@ public class Tag { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java index 16f35830e84..f825d42b636 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java @@ -20,28 +20,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public class User { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -72,6 +65,7 @@ public class User { * @return username */ + @JsonProperty("username") public String getUsername() { return username; } @@ -90,6 +84,7 @@ public class User { * @return firstName */ + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -108,6 +103,7 @@ public class User { * @return lastName */ + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,6 +122,7 @@ public class User { * @return email */ + @JsonProperty("email") public String getEmail() { return email; } @@ -144,6 +141,7 @@ public class User { * @return password */ + @JsonProperty("password") public String getPassword() { return password; } @@ -162,6 +160,7 @@ public class User { * @return phone */ + @JsonProperty("phone") public String getPhone() { return phone; } @@ -180,6 +179,7 @@ public class User { * @return userStatus */ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java index 18b55b13d16..0c0e8e8e72a 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -39,6 +37,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java index e18ac769bd2..00924b168ab 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java index 317082440c6..4c1bb184a39 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index fdb5e59cd6b..7ed29b5a5c0 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java index b748650e3c0..adea27d0193 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java index ac6ddb97bbc..9ec0b712b14 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java index 72502d0f0e2..5fe001a360f 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java @@ -30,11 +30,9 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class Category { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("name") @JacksonXmlProperty(localName = "name") private String name; @@ -49,6 +47,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -68,6 +67,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java index d7fd8f87d92..37ee933d127 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -32,15 +32,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class ModelApiResponse { - @JsonProperty("code") @JacksonXmlProperty(localName = "code") private Integer code; - @JsonProperty("type") @JacksonXmlProperty(localName = "type") private String type; - @JsonProperty("message") @JacksonXmlProperty(localName = "message") private String message; @@ -55,6 +52,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -74,6 +72,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -93,6 +92,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java index a2507752ed0..19cc6ec9bf5 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java @@ -33,19 +33,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class Order { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("petId") @JacksonXmlProperty(localName = "petId") private Long petId; - @JsonProperty("quantity") @JacksonXmlProperty(localName = "quantity") private Integer quantity; - @JsonProperty("shipDate") @JacksonXmlProperty(localName = "shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Date shipDate; @@ -87,11 +83,9 @@ public class Order { } } - @JsonProperty("status") @JacksonXmlProperty(localName = "status") private StatusEnum status; - @JsonProperty("complete") @JacksonXmlProperty(localName = "complete") private Boolean complete = false; @@ -106,6 +100,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -125,6 +120,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -144,6 +140,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -163,6 +160,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -182,6 +180,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -201,6 +200,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java index 6fa31a30601..410419edbaa 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java @@ -35,24 +35,19 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class Pet { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("category") @JacksonXmlProperty(localName = "category") private Category category; - @JsonProperty("name") @JacksonXmlProperty(localName = "name") private String name; - @JsonProperty("photoUrls") @JacksonXmlProperty(localName = "photoUrl") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @JacksonXmlProperty(localName = "tag") @Valid private List<@Valid Tag> tags; @@ -94,7 +89,6 @@ public class Pet { } } - @JsonProperty("status") @JacksonXmlProperty(localName = "status") private StatusEnum status; @@ -126,6 +120,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -145,6 +140,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -164,6 +160,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -191,6 +188,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -218,6 +216,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -237,6 +236,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java index e841695b5e0..f2c6219aeb8 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java @@ -30,11 +30,9 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class Tag { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("name") @JacksonXmlProperty(localName = "name") private String name; @@ -49,6 +47,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -68,6 +67,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java index 5a2a1168ea8..94ac8583434 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java @@ -30,35 +30,27 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen") public class User { - @JsonProperty("id") @JacksonXmlProperty(localName = "id") private Long id; - @JsonProperty("username") @JacksonXmlProperty(localName = "username") private String username; - @JsonProperty("firstName") @JacksonXmlProperty(localName = "firstName") private String firstName; - @JsonProperty("lastName") @JacksonXmlProperty(localName = "lastName") private String lastName; - @JsonProperty("email") @JacksonXmlProperty(localName = "email") private String email; - @JsonProperty("password") @JacksonXmlProperty(localName = "password") private String password; - @JsonProperty("phone") @JacksonXmlProperty(localName = "phone") private String phone; - @JsonProperty("userStatus") @JacksonXmlProperty(localName = "userStatus") private Integer userStatus; @@ -73,6 +65,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -92,6 +85,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -111,6 +105,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -130,6 +125,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -149,6 +145,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -168,6 +165,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -187,6 +185,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -206,6 +205,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES index 18561f6ffff..10f1284050f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES @@ -50,6 +50,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index 66dfa30d774..d974ae15f0e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -185,6 +186,31 @@ public interface FakeApi { ) throws Exception; + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) throws Exception; + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 0661c1a9a8d..690bd609d23 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index a3f9c905789..db5353d2d35 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index db5f8d3ce35..5beed6563d9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 66e0aed61c6..eff5bd5fa4b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index ff0d6d7241e..e3d835a5124 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index cc212be855d..6cde3b272d2 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 7c74b7de08d..948a430c814 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 6087e70dba7..d59141c231c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesString extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java index 1ecf10efc5c..51d21426e8f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -71,6 +69,7 @@ public class Animal { */ @NotNull @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("className") public String getClassName() { return className; } @@ -90,6 +89,7 @@ public class Animal { */ @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 5b6c415bd66..d7f3b9f37fa 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 4e84838be3b..6215ba771a0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java index f7c9710a1ee..d53a9e07ad8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -55,6 +52,7 @@ public class ArrayTest { */ @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -82,6 +80,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -109,6 +108,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java index 8c5453c4a5b..52359888607 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -96,6 +95,7 @@ public class BigCat extends Cat { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java index 741de9f41a3..bff7b148aa2 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -77,6 +76,7 @@ public class BigCatAllOf { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java index 0c56400050b..31142a864ec 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -50,6 +44,7 @@ public class Capitalization { */ @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -69,6 +64,7 @@ public class Capitalization { */ @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -88,6 +84,7 @@ public class Capitalization { */ @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -107,6 +104,7 @@ public class Capitalization { */ @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -126,6 +124,7 @@ public class Capitalization { */ @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -145,6 +144,7 @@ public class Capitalization { */ @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java index a2feece8de8..7fe1ed5d2b8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -65,6 +64,7 @@ public class Cat extends Animal { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java index 50a9c2cdce9..0bd8697513e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -37,6 +36,7 @@ public class CatAllOf { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java index 7ee1fde0646..745935143d1 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -54,6 +52,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -73,6 +72,7 @@ public class Category { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java index a1942e9c404..95bad44f680 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -36,6 +35,7 @@ public class ClassModel { */ @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java index c38b26829be..c070bc9214b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -35,6 +34,7 @@ public class Client { */ @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 55d20539817..ebcd1eede94 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -78,6 +74,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -105,6 +102,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -132,6 +130,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -159,6 +158,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java index 1bb3d6b5102..b339978e542 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -56,6 +55,7 @@ public class Dog extends Animal { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java index 256925a7841..6b11905f99a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -37,6 +36,7 @@ public class DogAllOf { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java index a96e0290b0b..3d3280a42dc 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -112,6 +110,7 @@ public class EnumArrays { */ @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -139,6 +138,7 @@ public class EnumArrays { */ @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java index 6f08d4ee9fb..e785606f0e1 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -211,6 +206,7 @@ public class EnumTest { */ @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -230,6 +226,7 @@ public class EnumTest { */ @NotNull @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -249,6 +246,7 @@ public class EnumTest { */ @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -268,6 +266,7 @@ public class EnumTest { */ @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -287,6 +286,7 @@ public class EnumTest { */ @Valid @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java index bf750ccdcb7..7b04101a36a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -36,6 +35,7 @@ public class File { */ @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dae9b27f93a..be6e37a7aba 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java index 06e9dde8e89..bc4f1de88e6 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java @@ -29,48 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -105,6 +91,7 @@ public class FormatTest { */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -126,6 +113,7 @@ public class FormatTest { */ @Min(20) @Max(200) @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -145,6 +133,7 @@ public class FormatTest { */ @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -166,6 +155,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -187,6 +177,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -208,6 +199,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -227,6 +219,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("string") public String getString() { return string; } @@ -246,6 +239,7 @@ public class FormatTest { */ @NotNull @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -265,6 +259,7 @@ public class FormatTest { */ @Valid @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -284,6 +279,7 @@ public class FormatTest { */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -303,6 +299,7 @@ public class FormatTest { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -322,6 +319,7 @@ public class FormatTest { */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -341,6 +339,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -360,6 +359,7 @@ public class FormatTest { */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index c218d0e02b8..196214695a1 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -40,6 +38,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -59,6 +58,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java index 74cab2e2f8c..7215fd65d7a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -63,15 +62,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -94,6 +90,7 @@ public class MapTest { */ @Valid @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -121,6 +118,7 @@ public class MapTest { */ @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -148,6 +146,7 @@ public class MapTest { */ @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -175,6 +174,7 @@ public class MapTest { */ @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index d6b45daabd7..7dd078dbaa8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -49,6 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -68,6 +66,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -95,6 +94,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java index 9ca96d114aa..32198c000f1 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -41,6 +39,7 @@ public class Model200Response { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -60,6 +59,7 @@ public class Model200Response { */ @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java index 06c806057b5..0a803038551 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -62,6 +60,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -81,6 +80,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java index f168748f6a2..c2ac56a57a7 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -37,6 +36,7 @@ public class ModelList { */ @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java index 641c56cd81c..83da161c83f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -38,6 +37,7 @@ public class ModelReturn { */ @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java index d6dcb665651..ed42396e815 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -61,6 +57,7 @@ public class Name { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -80,6 +77,7 @@ public class Name { */ @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -99,6 +97,7 @@ public class Name { */ @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property") public String getProperty() { return property; } @@ -118,6 +117,7 @@ public class Name { */ @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java index 4a3b6beffa2..1ec233732c3 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -36,6 +35,7 @@ public class NumberOnly { */ @Valid @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java index 9a5b61bad43..9566edcbed8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -110,6 +105,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -129,6 +125,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -148,6 +145,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -167,6 +165,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -186,6 +185,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java index b66d6d38afb..6b611504866 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -42,6 +39,7 @@ public class OuterComposite { */ @Valid @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -61,6 +59,7 @@ public class OuterComposite { */ @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -80,6 +79,7 @@ public class OuterComposite { */ @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java index ba99ad03027..0e76707f06f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 8c43e7e8c30..8891d8dac55 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -38,6 +36,7 @@ public class ReadOnlyFirst { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,6 +56,7 @@ public class ReadOnlyFirst { */ @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..c681122f5f8 --- /dev/null +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java index e0a16a7b89a..51dfdf9de43 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -37,6 +36,7 @@ public class SpecialModelName { */ @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java index 03d5607e29b..b6dd153652a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -57,6 +56,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java index 12b55e21185..c2217970131 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b74b97d38f..96efe9c2627 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public class TypeHolderExample { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java index e09df9be7b7..cf6f9233680 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -75,6 +68,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -94,6 +88,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -113,6 +108,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -132,6 +128,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -151,6 +148,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -170,6 +168,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -189,6 +188,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java index 280941921cd..cf49606e181 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -131,6 +102,7 @@ public class XmlItem { */ @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -150,6 +122,7 @@ public class XmlItem { */ @Valid @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -169,6 +142,7 @@ public class XmlItem { */ @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -188,6 +162,7 @@ public class XmlItem { */ @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -215,6 +190,7 @@ public class XmlItem { */ @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -234,6 +210,7 @@ public class XmlItem { */ @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -253,6 +230,7 @@ public class XmlItem { */ @Valid @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -272,6 +250,7 @@ public class XmlItem { */ @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -291,6 +270,7 @@ public class XmlItem { */ @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -318,6 +298,7 @@ public class XmlItem { */ @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -345,6 +326,7 @@ public class XmlItem { */ @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -364,6 +346,7 @@ public class XmlItem { */ @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -383,6 +366,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -402,6 +386,7 @@ public class XmlItem { */ @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -421,6 +406,7 @@ public class XmlItem { */ @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -448,6 +434,7 @@ public class XmlItem { */ @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -475,6 +462,7 @@ public class XmlItem { */ @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -494,6 +482,7 @@ public class XmlItem { */ @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -513,6 +502,7 @@ public class XmlItem { */ @Valid @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -532,6 +522,7 @@ public class XmlItem { */ @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -551,6 +542,7 @@ public class XmlItem { */ @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -578,6 +570,7 @@ public class XmlItem { */ @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -605,6 +598,7 @@ public class XmlItem { */ @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -624,6 +618,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -643,6 +638,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -662,6 +658,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -681,6 +678,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -708,6 +706,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -735,6 +734,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java index 6f461bfe628..b0060f3ed53 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java @@ -31,27 +31,21 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ObjectWithUniqueItems { - @JsonProperty("nullSet") @Valid private JsonNullable> nullSet = JsonNullable.undefined(); - @JsonProperty("notNullSet") @Valid private Set notNullSet; - @JsonProperty("nullList") @Valid private JsonNullable> nullList = JsonNullable.undefined(); - @JsonProperty("notNullList") @Valid private List notNullList; - @JsonProperty("notNullDateField") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime notNullDateField; - @JsonProperty("nullDateField") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime nullDateField; @@ -74,6 +68,7 @@ public class ObjectWithUniqueItems { */ @Schema(name = "nullSet", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullSet") public JsonNullable> getNullSet() { return nullSet; } @@ -101,6 +96,7 @@ public class ObjectWithUniqueItems { */ @Schema(name = "notNullSet", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("notNullSet") public Set getNotNullSet() { return notNullSet; } @@ -129,6 +125,7 @@ public class ObjectWithUniqueItems { */ @Schema(name = "nullList", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullList") public JsonNullable> getNullList() { return nullList; } @@ -156,6 +153,7 @@ public class ObjectWithUniqueItems { */ @Schema(name = "notNullList", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("notNullList") public List getNotNullList() { return notNullList; } @@ -175,6 +173,7 @@ public class ObjectWithUniqueItems { */ @Valid @Schema(name = "notNullDateField", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("notNullDateField") public OffsetDateTime getNotNullDateField() { return notNullDateField; } @@ -194,6 +193,7 @@ public class ObjectWithUniqueItems { */ @Valid @Schema(name = "nullDateField", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullDateField") public OffsetDateTime getNullDateField() { return nullDateField; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES index 32921b847d0..946be002561 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index edf5c41ea0f..046ebd0a351 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed98..9121a395182 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 32dc0c3fd93..57be2f556f5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index b030575ce32..f2e2533ad4a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index a0be618b483..f29e8fdc477 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index ccad3b7842e..da623886687 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -25,45 +25,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2 = null; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -85,6 +74,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -112,6 +102,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -139,6 +130,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -166,6 +158,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -193,6 +186,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -220,6 +214,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -247,6 +242,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -274,6 +270,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -293,6 +290,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -312,6 +310,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -331,6 +330,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 0b50eae9623..74f4c62dadf 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8777da8266d..cb4c419d891 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 3d723f313ba..1dd741d8228 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 8be627cf95e..1b33552ee8a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java index c914c2141a7..cd1675c1274 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java @@ -38,10 +38,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -71,6 +69,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -90,6 +89,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index b125422b213..015b113f171 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index c596865402f..6a29ab265a8 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index c2e98872c52..7ff2226dd74 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -24,15 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -55,6 +52,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -82,6 +80,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -109,6 +108,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java index 5b4fd14d861..91cd349ca0a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java @@ -66,7 +66,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -96,6 +95,7 @@ public class BigCat extends Cat { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java index 9eee7b14085..dd11506a903 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -77,6 +76,7 @@ public class BigCatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java index f2cd4ce28cf..96aca57f16f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java @@ -21,22 +21,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -50,6 +44,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -69,6 +64,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -88,6 +84,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -107,6 +104,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -126,6 +124,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -145,6 +144,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java index aeb4370edc3..b1b009f533b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java @@ -35,7 +35,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -65,6 +64,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java index 649703382e4..fbde7c3a8dc 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -37,6 +36,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java index e7e940c65fc..f29b1ee05d3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -54,6 +52,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -73,6 +72,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java index 2666fe6a16d..630599723ec 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -36,6 +35,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java index a877f6b3ecc..12947bfa3d9 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java @@ -21,7 +21,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -35,6 +34,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 193fbbcab33..862accc3be5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -23,19 +23,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private List nullableArray; - @JsonProperty("nullable_required_array") @Valid private List nullableRequiredArray; - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); @@ -75,6 +71,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public List getNullableArray() { return nullableArray; } @@ -102,6 +99,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public List getNullableRequiredArray() { return nullableRequiredArray; } @@ -129,6 +127,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -156,6 +155,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public List getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java index 4a406912e6f..d15a20308b5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -56,6 +55,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java index 6e9cc3f76c8..c1ff31fcefc 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -37,6 +36,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index ea20037b4f2..36bbc2374aa 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -59,7 +59,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -112,6 +110,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -139,6 +138,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java index 3779fa30d64..7d071f8a81f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java @@ -62,7 +62,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -211,6 +206,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -230,6 +226,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -249,6 +246,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -268,6 +266,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -287,6 +286,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java index 3206bff2971..19a28937ff0 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -36,6 +35,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 67bf9c73d2f..514188584da 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java index dcbbc7fbde7..b564b838092 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java @@ -29,48 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -105,6 +91,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -126,6 +113,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -145,6 +133,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -166,6 +155,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -187,6 +177,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -208,6 +199,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -227,6 +219,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -246,6 +239,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -265,6 +259,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -284,6 +279,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -303,6 +299,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -322,6 +319,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -341,6 +339,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -360,6 +359,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 36d854ff06c..aac0264cd7d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -40,6 +38,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -59,6 +58,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java index 909f43125d0..70194d82f75 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -63,15 +62,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -94,6 +90,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -121,6 +118,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -148,6 +146,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -175,6 +174,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index ae7d7930f7e..205b8049fef 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -49,6 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -68,6 +66,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -95,6 +94,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java index fac227135b9..88fb0a01d34 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -41,6 +39,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -60,6 +59,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java index 6efe7c8047f..dd87a3c1b39 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -62,6 +60,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -81,6 +80,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java index dc9eb8ae525..4705ec66df4 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -37,6 +36,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java index 4622b115826..997950759de 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -38,6 +37,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java index d4d9ed411d9..c1efbf9ecdb 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java @@ -22,16 +22,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -61,6 +57,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -80,6 +77,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -99,6 +97,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -118,6 +117,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java index 33fadd6869b..7c96db2d2c5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -36,6 +35,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java index 1ce3810c20d..4492c665a86 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java @@ -24,16 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -110,6 +105,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -129,6 +125,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -148,6 +145,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -167,6 +165,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -186,6 +185,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java index a590e26b3f1..10b8a8879a3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java @@ -22,13 +22,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -42,6 +39,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -61,6 +59,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -80,6 +79,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index 84968c2299d..db4b7dab2fc 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -29,20 +29,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index c09e0076810..2e16544e4cd 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -38,6 +36,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,6 +56,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..386aaf06884 --- /dev/null +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java index 5f1ed55d3d4..25baeb0e45c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -37,6 +36,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java index 6ccb99b1e73..ea0574787c2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -57,6 +56,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index ac1c34f7878..1f070eb65c8 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index ee14d628a10..19956d3114d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -24,22 +24,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java index e5180de1584..f9546be0278 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java @@ -21,28 +21,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -75,6 +68,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -94,6 +88,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -113,6 +108,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -132,6 +128,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -151,6 +148,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -170,6 +168,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -189,6 +188,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index 9e98a7214bb..2a7c27a7a47 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -24,99 +24,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -131,6 +102,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -150,6 +122,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -169,6 +142,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -188,6 +162,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -215,6 +190,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -234,6 +210,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -253,6 +230,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -272,6 +250,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -291,6 +270,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -318,6 +298,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -345,6 +326,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -364,6 +346,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -383,6 +366,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -402,6 +386,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -421,6 +406,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -448,6 +434,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -475,6 +462,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -494,6 +482,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -513,6 +502,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -532,6 +522,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -551,6 +542,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -578,6 +570,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -605,6 +598,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -624,6 +618,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -643,6 +638,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -662,6 +658,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -681,6 +678,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -708,6 +706,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -735,6 +734,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES index 9ecdb11614b..d46ab21480e 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index edf5c41ea0f..046ebd0a351 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed98..9121a395182 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0..34712a94057 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java index d91e6d2ef40..8a1f3096018 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -72,6 +70,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -91,6 +90,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java index e9a1391ec0d..077f6becae1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -97,6 +96,7 @@ public class BigCat extends Cat { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c000..59ab1d8d2bf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -78,6 +77,7 @@ public class BigCatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java index ebd1416c5bd..1cf97a01686 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -66,6 +65,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c718..5da3d386b4d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8b..15988169280 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..187960e94e4 --- /dev/null +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java index 1ee2b748142..bf67444d3cb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd32..da676b10f0d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES index 05fbaa353e8..5789fc3c295 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES @@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index ae78c71d530..19557bc37d0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -185,6 +186,34 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + return getDelegate().responseObjectDifferentNames(petId); + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f1..b88f6171955 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index d1a650378e6..65ea3c13eae 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; @@ -107,6 +108,27 @@ public interface FakeApiDelegate { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + * @see FakeApi#responseObjectDifferentNames + */ + default ResponseEntity responseObjectDifferentNames(Long petId) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0..34712a94057 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java index d91e6d2ef40..8a1f3096018 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -72,6 +70,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -91,6 +90,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java index e9a1391ec0d..077f6becae1 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -97,6 +96,7 @@ public class BigCat extends Cat { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c000..59ab1d8d2bf 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -78,6 +77,7 @@ public class BigCatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java index ebd1416c5bd..1cf97a01686 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -66,6 +65,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c718..5da3d386b4d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8b..15988169280 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..187960e94e4 --- /dev/null +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 1ee2b748142..bf67444d3cb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd32..da676b10f0d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java index 909b0aba4e3..4a167e1c112 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -40,6 +38,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -59,6 +58,7 @@ public class Category { */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java index 52fb11fd3cf..a6a56521498 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -25,13 +25,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -45,6 +42,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -64,6 +62,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -83,6 +82,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java index 66d9df6dfd9..45802212a9d 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java @@ -26,16 +26,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -76,10 +72,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -93,6 +87,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -112,6 +107,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -131,6 +127,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -150,6 +147,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -169,6 +167,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -188,6 +187,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java index ce02f3c7d4e..086df08a3ed 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java @@ -28,20 +28,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -82,7 +77,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -113,6 +107,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -132,6 +127,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -151,6 +147,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -178,6 +175,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -205,6 +203,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -224,6 +223,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java index b30aa3fd9a2..b6d3df29573 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -40,6 +38,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -59,6 +58,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java index 8d71f0fcc04..a5233b08ae5 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java @@ -23,28 +23,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -58,6 +50,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -77,6 +70,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -96,6 +90,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -115,6 +110,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -134,6 +130,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -153,6 +150,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -172,6 +170,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -191,6 +190,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES index 05fbaa353e8..5789fc3c295 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index ae78c71d530..19557bc37d0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -185,6 +186,34 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + return getDelegate().responseObjectDifferentNames(petId); + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 726b17779f1..b88f6171955 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index d1a650378e6..65ea3c13eae 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; @@ -107,6 +108,27 @@ public interface FakeApiDelegate { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + * @see FakeApi#responseObjectDifferentNames + */ + default ResponseEntity responseObjectDifferentNames(Long petId) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0..34712a94057 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index d91e6d2ef40..8a1f3096018 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -72,6 +70,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -91,6 +90,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index e9a1391ec0d..077f6becae1 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -97,6 +96,7 @@ public class BigCat extends Cat { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c000..59ab1d8d2bf 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -78,6 +77,7 @@ public class BigCatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index ebd1416c5bd..1cf97a01686 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -66,6 +65,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c718..5da3d386b4d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8b..15988169280 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..187960e94e4 --- /dev/null +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index 1ee2b748142..bf67444d3cb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd32..da676b10f0d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java index 0d2e56dfa3d..d48f33e470b 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java @@ -20,10 +20,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Category id(Long id) { @@ -36,6 +34,7 @@ public class Category { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -54,6 +53,7 @@ public class Category { * @return name */ @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java index f66ed8b5941..5376fa62cc3 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -22,13 +22,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -41,6 +38,7 @@ public class ModelApiResponse { * @return code */ + @JsonProperty("code") public Integer getCode() { return code; } @@ -59,6 +57,7 @@ public class ModelApiResponse { * @return type */ + @JsonProperty("type") public String getType() { return type; } @@ -77,6 +76,7 @@ public class ModelApiResponse { * @return message */ + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java index aafcfc0cc19..ad7ddb21736 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -73,10 +69,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -89,6 +83,7 @@ public class Order { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -107,6 +102,7 @@ public class Order { * @return petId */ + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -125,6 +121,7 @@ public class Order { * @return quantity */ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -143,6 +140,7 @@ public class Order { * @return shipDate */ @Valid + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -161,6 +159,7 @@ public class Order { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -179,6 +178,7 @@ public class Order { * @return complete */ + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java index 05bed382e38..f72251ebac0 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java @@ -25,20 +25,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -79,7 +74,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -109,6 +103,7 @@ public class Pet { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -127,6 +122,7 @@ public class Pet { * @return category */ @Valid + @JsonProperty("category") public Category getCategory() { return category; } @@ -145,6 +141,7 @@ public class Pet { * @return name */ @NotNull + @JsonProperty("name") public String getName() { return name; } @@ -171,6 +168,7 @@ public class Pet { * @return photoUrls */ @NotNull + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -197,6 +195,7 @@ public class Pet { * @return tags */ @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -215,6 +214,7 @@ public class Pet { * @return status */ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java index 32f55514e08..ae8b17e7792 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java @@ -20,10 +20,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -36,6 +34,7 @@ public class Tag { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -54,6 +53,7 @@ public class Tag { * @return name */ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java index 16f35830e84..f825d42b636 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java @@ -20,28 +20,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -54,6 +46,7 @@ public class User { * @return id */ + @JsonProperty("id") public Long getId() { return id; } @@ -72,6 +65,7 @@ public class User { * @return username */ + @JsonProperty("username") public String getUsername() { return username; } @@ -90,6 +84,7 @@ public class User { * @return firstName */ + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -108,6 +103,7 @@ public class User { * @return lastName */ + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -126,6 +122,7 @@ public class User { * @return email */ + @JsonProperty("email") public String getEmail() { return email; } @@ -144,6 +141,7 @@ public class User { * @return password */ + @JsonProperty("password") public String getPassword() { return password; } @@ -162,6 +160,7 @@ public class User { * @return phone */ + @JsonProperty("phone") public String getPhone() { return phone; } @@ -180,6 +179,7 @@ public class User { * @return userStatus */ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 32921b847d0..946be002561 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 46f0bab3f01..de404285b49 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed98..9121a395182 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0..34712a94057 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index d91e6d2ef40..8a1f3096018 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -72,6 +70,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -91,6 +90,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index e9a1391ec0d..077f6becae1 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -97,6 +96,7 @@ public class BigCat extends Cat { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c000..59ab1d8d2bf 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -78,6 +77,7 @@ public class BigCatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index ebd1416c5bd..1cf97a01686 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -66,6 +65,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c718..5da3d386b4d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8b..15988169280 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..187960e94e4 --- /dev/null +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index 1ee2b748142..bf67444d3cb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd32..da676b10f0d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES index a38d317b824..d91ebbece08 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES @@ -66,6 +66,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index 8e2522bda4e..2dcd1304cba 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -15,6 +15,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -195,6 +196,35 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default Mono> responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiIgnore final ServerWebExchange exchange + ) { + return getDelegate().responseObjectDifferentNames(petId, exchange); + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java index db9b0dff167..ea2bb662956 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java @@ -10,6 +10,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index db5642bdaa1..1bc0667788a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -10,6 +10,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; @@ -125,6 +126,28 @@ public interface FakeApiDelegate { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + * @see FakeApi#responseObjectDifferentNames + */ + default Mono> responseObjectDifferentNames(Long petId, + ServerWebExchange exchange) { + Mono result = Mono.empty(); + exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); + for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString); + break; + } + } + return result.then(Mono.empty()); + + } + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0..34712a94057 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java index d91e6d2ef40..8a1f3096018 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -72,6 +70,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -91,6 +90,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java index e9a1391ec0d..077f6becae1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -97,6 +96,7 @@ public class BigCat extends Cat { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c000..59ab1d8d2bf 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -78,6 +77,7 @@ public class BigCatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java index ebd1416c5bd..1cf97a01686 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -66,6 +65,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c718..5da3d386b4d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8b..15988169280 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..187960e94e4 --- /dev/null +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index 1ee2b748142..bf67444d3cb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd32..da676b10f0d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 8bbdc0a2482..8cb85cb8bd5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -86,6 +75,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -113,6 +103,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -140,6 +131,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -167,6 +159,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -194,6 +187,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -221,6 +215,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -248,6 +243,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -275,6 +271,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -294,6 +291,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -313,6 +311,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -332,6 +331,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java index aa84943bc68..cd1801f743b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -70,6 +68,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -89,6 +88,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java index d89c77e1749..76e10b9855a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -57,6 +56,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java index 0e55c9b7873..5e04a5fe734 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 80d9ff32309..c4fe1a6869a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 54679942725..e8ab08ec237 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 8bbdc0a2482..8cb85cb8bd5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -86,6 +75,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -113,6 +103,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -140,6 +131,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -167,6 +159,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -194,6 +187,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -221,6 +215,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -248,6 +243,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -275,6 +271,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -294,6 +291,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -313,6 +311,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -332,6 +331,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java index aa84943bc68..cd1801f743b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -70,6 +68,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -89,6 +88,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java index d89c77e1749..76e10b9855a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -57,6 +56,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java index 0e55c9b7873..5e04a5fe734 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java index 80d9ff32309..c4fe1a6869a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java index 54679942725..e8ab08ec237 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 8bbdc0a2482..8cb85cb8bd5 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -86,6 +75,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -113,6 +103,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -140,6 +131,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -167,6 +159,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -194,6 +187,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -221,6 +215,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -248,6 +243,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -275,6 +271,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -294,6 +291,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -313,6 +311,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -332,6 +331,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java index aa84943bc68..cd1801f743b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -70,6 +68,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -89,6 +88,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java index d89c77e1749..76e10b9855a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -57,6 +56,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java index 0e55c9b7873..5e04a5fe734 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 80d9ff32309..c4fe1a6869a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 54679942725..e8ab08ec237 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 8bbdc0a2482..8cb85cb8bd5 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -26,45 +26,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private Object anytype2; - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -86,6 +75,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -113,6 +103,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -140,6 +131,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -167,6 +159,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -194,6 +187,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -221,6 +215,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -248,6 +243,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -275,6 +271,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -294,6 +291,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -313,6 +311,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public Object getAnytype2() { return anytype2; } @@ -332,6 +331,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java index aa84943bc68..cd1801f743b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java @@ -37,10 +37,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -70,6 +68,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -89,6 +88,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java index d89c77e1749..76e10b9855a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -57,6 +56,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java index 0e55c9b7873..5e04a5fe734 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -27,20 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private List photoUrls = new ArrayList<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -81,7 +76,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -112,6 +106,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -131,6 +126,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -150,6 +146,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -177,6 +174,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; } @@ -204,6 +202,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -223,6 +222,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java index 80d9ff32309..c4fe1a6869a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java index 54679942725..e8ab08ec237 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES index 32921b847d0..946be002561 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java src/main/java/org/openapitools/model/OuterEnum.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/ReadOnlyFirst.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/model/SpecialModelName.java src/main/java/org/openapitools/model/Tag.java src/main/java/org/openapitools/model/TypeHolderDefault.java diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index adbc6c1f1e8..a00b75c4c9e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNames.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java index 5ae5d5fed98..9121a395182 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.model.User; import org.openapitools.model.XmlItem; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8e4c1798976..686fafb2faa 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 27a8f01607f..a2c3df24a2d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index bc7b87d760a..82fcada6f56 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4d0595e38d0..34712a94057 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -29,45 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -89,6 +78,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -116,6 +106,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -143,6 +134,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -170,6 +162,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -197,6 +190,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -224,6 +218,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -251,6 +246,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -278,6 +274,7 @@ public class AdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -297,6 +294,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -316,6 +314,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -335,6 +334,7 @@ public class AdditionalPropertiesClass { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 00b5174e93b..ea2ec5365ed 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8fec423ffb1..4ca4b5a2f50 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 67033332b0d..7b9d8ef0b0b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 993f83bb2cc..fdc4baa9de7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index d91e6d2ef40..8a1f3096018 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -39,10 +39,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -72,6 +70,7 @@ public class Animal { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -91,6 +90,7 @@ public class Animal { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 450e9b21edf..91fca22a457 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f2b7f74a6b8..a901b8de385 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -48,6 +47,7 @@ public class ArrayOfNumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index 7d560306b65..819eb6062ab 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -25,15 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -56,6 +53,7 @@ public class ArrayTest { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -83,6 +81,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -110,6 +109,7 @@ public class ArrayTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index e9a1391ec0d..077f6becae1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -67,7 +67,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -97,6 +96,7 @@ public class BigCat extends Cat { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java index 35ae937c000..59ab1d8d2bf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java @@ -64,7 +64,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -78,6 +77,7 @@ public class BigCatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java index e9cce9de011..feb0d643c5e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java @@ -22,22 +22,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -51,6 +45,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -70,6 +65,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -89,6 +85,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -108,6 +105,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -127,6 +125,7 @@ public class Capitalization { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -146,6 +145,7 @@ public class Capitalization { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index ebd1416c5bd..1cf97a01686 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -36,7 +36,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -66,6 +65,7 @@ public class Cat extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java index eed74bea751..85c6885ae00 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java index 77ded60a471..2bd31570c78 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -55,6 +53,7 @@ public class Category { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -74,6 +73,7 @@ public class Category { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java index 69296da7e60..2c511abe3ec 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -37,6 +36,7 @@ public class ClassModel { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java index b788daea14a..a6bfdf58db7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -36,6 +35,7 @@ public class Client { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java index f513931c718..5da3d386b4d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,19 +27,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -79,6 +75,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -106,6 +103,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -133,6 +131,7 @@ public class ContainerDefaultValue { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -160,6 +159,7 @@ public class ContainerDefaultValue { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index 6d869993c19..5954daab536 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -57,6 +56,7 @@ public class Dog extends Animal { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java index 4f275e53533..5784d207b4d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOf { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index f73ffa31529..89bc2c4ed1d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -60,7 +60,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -98,7 +97,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -113,6 +111,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -140,6 +139,7 @@ public class EnumArrays { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index 806094a9830..01bd1c3c986 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -63,7 +63,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTest { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java index d82e4902623..fedeea1c638 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -37,6 +36,7 @@ public class File { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 5bac01151ba..e1106056505 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -43,6 +41,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public File getFile() { return file; } @@ -70,6 +69,7 @@ public class FileSchemaTestClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java index b7fd007ab1d..fee872bd400 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTest { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTest { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTest { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTest { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTest { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 224b16d1a2d..21a42445979 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnly { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index d024c5cc5db..16d8af2d7f6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -64,15 +63,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -95,6 +91,7 @@ public class MapTest { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -122,6 +119,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -149,6 +147,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -176,6 +175,7 @@ public class MapTest { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6ecb96d5e49..075d281eb4b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,14 +28,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java index 36dfd34883e..193231f8545 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -42,6 +40,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200Response { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java index dfba6cb672d..693e1669879 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -44,6 +41,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ModelApiResponse { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java index 97ddf5359aa..7853f3d408a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -38,6 +37,7 @@ public class ModelList { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java index 4505ddfeeec..b6f106cea22 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -39,6 +38,7 @@ public class ModelReturn { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java index cc8f667dbf0..53e568199f4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java @@ -23,16 +23,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -62,6 +58,7 @@ public class Name { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -81,6 +78,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -100,6 +98,7 @@ public class Name { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -119,6 +118,7 @@ public class Name { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java index 278146bfb89..1e3f9e15421 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -37,6 +36,7 @@ public class NumberOnly { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java index 9a9ed4f6c96..b24c70c0780 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -75,10 +71,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -92,6 +86,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -111,6 +106,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -130,6 +126,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -149,6 +146,7 @@ public class Order { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -168,6 +166,7 @@ public class Order { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -187,6 +186,7 @@ public class Order { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java index c1a709bb26a..ade2b915019 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -43,6 +40,7 @@ public class OuterComposite { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -62,6 +60,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -81,6 +80,7 @@ public class OuterComposite { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index da6c47fcc8b..15988169280 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -30,20 +30,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -84,7 +79,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -115,6 +109,7 @@ public class Pet { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -134,6 +129,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -153,6 +149,7 @@ public class Pet { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -180,6 +177,7 @@ public class Pet { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -208,6 +206,7 @@ public class Pet { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -227,6 +226,7 @@ public class Pet { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java index b7a0a416782..3eb0ebe069c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -39,6 +37,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -58,6 +57,7 @@ public class ReadOnlyFirst { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..187960e94e4 --- /dev/null +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,156 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index 1ee2b748142..bf67444d3cb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelName { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java index 6161be4a922..527e777278e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java @@ -22,10 +22,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -39,6 +37,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -58,6 +57,7 @@ public class Tag { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7654de1cd32..da676b10f0d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -25,19 +25,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -72,6 +67,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -91,6 +87,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -110,6 +107,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -129,6 +127,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -156,6 +155,7 @@ public class TypeHolderDefault { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index da3cb34f1e7..bbc653f248a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -25,22 +25,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -76,6 +70,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -95,6 +90,7 @@ public class TypeHolderExample { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -114,6 +110,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -133,6 +130,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -152,6 +150,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -179,6 +178,7 @@ public class TypeHolderExample { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java index ec85459bc99..36d29ba307d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java @@ -22,28 +22,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -57,6 +49,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +69,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -95,6 +89,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -114,6 +109,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -133,6 +129,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -152,6 +149,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -171,6 +169,7 @@ public class User { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -190,6 +189,7 @@ public class User { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index 475d6fe9ec1..58405cbb486 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -25,99 +25,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -132,6 +103,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -151,6 +123,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -170,6 +143,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -189,6 +163,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -216,6 +191,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -235,6 +211,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -254,6 +231,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -273,6 +251,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -292,6 +271,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -319,6 +299,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -346,6 +327,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -365,6 +347,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -384,6 +367,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -403,6 +387,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -422,6 +407,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -449,6 +435,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -476,6 +463,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -495,6 +483,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -514,6 +503,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -533,6 +523,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -552,6 +543,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -579,6 +571,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -606,6 +599,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -625,6 +619,7 @@ public class XmlItem { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -644,6 +639,7 @@ public class XmlItem { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -663,6 +659,7 @@ public class XmlItem { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -682,6 +679,7 @@ public class XmlItem { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -709,6 +707,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -736,6 +735,7 @@ public class XmlItem { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES index 2f1080a4150..8ba55df4658 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES @@ -61,6 +61,7 @@ src/main/java/org/openapitools/virtualan/model/OuterComposite.java src/main/java/org/openapitools/virtualan/model/OuterEnum.java src/main/java/org/openapitools/virtualan/model/Pet.java src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java +src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java src/main/java/org/openapitools/virtualan/model/SpecialModelName.java src/main/java/org/openapitools/virtualan/model/Tag.java src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index a902146a5f8..6ec4a6867ac 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -14,6 +14,7 @@ import java.util.Map; import org.openapitools.virtualan.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.virtualan.model.OuterComposite; +import org.openapitools.virtualan.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.virtualan.model.User; import org.openapitools.virtualan.model.XmlItem; import io.swagger.v3.oas.annotations.ExternalDocumentation; @@ -221,6 +222,44 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiVirtual + @Operation( + operationId = "responseObjectDifferentNames", + tags = { "pet" }, + responses = { + @ApiResponse(responseCode = "200", description = "successful operation", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java index d33842e20df..6745966de43 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.util.Map; import org.openapitools.virtualan.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.virtualan.model.OuterComposite; +import org.openapitools.virtualan.model.ResponseObjectWithDifferentFieldNames; import org.openapitools.virtualan.model.User; import org.openapitools.virtualan.model.XmlItem; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java index 9f4aa42c851..206db52a72f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyType extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyType name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesAnyType extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java index a17c327fe24..1ccea4df28c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArray extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArray name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesArray extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java index d1c746ffd00..2343eb8798e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBoolean extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBoolean name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesBoolean extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java index 170518a544d..daa9ffe49c6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java @@ -28,45 +28,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClass { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -88,6 +77,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -115,6 +105,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -142,6 +133,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -169,6 +161,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -196,6 +189,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -223,6 +217,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -250,6 +245,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -277,6 +273,7 @@ public class AdditionalPropertiesClass { */ @Valid @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -296,6 +293,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -315,6 +313,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -334,6 +333,7 @@ public class AdditionalPropertiesClass { */ @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java index b1ae91765bf..4913c13bad4 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesInteger extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesInteger name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesInteger extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java index c5fea24d469..1290ec6536e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumber extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumber name(String name) { @@ -38,6 +37,7 @@ public class AdditionalPropertiesNumber extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java index 068cdeda3b0..fab88cc6ac0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObject extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObject name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesObject extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java index e351a15df69..592acfa0695 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesString extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesString name(String name) { @@ -37,6 +36,7 @@ public class AdditionalPropertiesString extends HashMap { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java index e28dd10f0a7..1ee0306572c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java @@ -38,10 +38,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Animal { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -71,6 +69,7 @@ public class Animal { */ @NotNull @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("className") public String getClassName() { return className; } @@ -90,6 +89,7 @@ public class Animal { */ @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java index e7ecfb0b7cd..5afe4f0000d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnly { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java index a75a6fd0f92..35b81ceeef6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnly { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -47,6 +46,7 @@ public class ArrayOfNumberOnly { */ @Valid @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java index 8f2b06deddb..6004ba642ec 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java @@ -24,15 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTest { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -55,6 +52,7 @@ public class ArrayTest { */ @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -82,6 +80,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -109,6 +108,7 @@ public class ArrayTest { */ @Valid @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java index bb479265058..ea6751c1f75 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java @@ -66,7 +66,6 @@ public class BigCat extends Cat { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -96,6 +95,7 @@ public class BigCat extends Cat { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java index b3f40bf8215..daf0315ddcb 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java @@ -63,7 +63,6 @@ public class BigCatAllOf { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOf kind(KindEnum kind) { @@ -77,6 +76,7 @@ public class BigCatAllOf { */ @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java index ac66aa43baa..a7458d3ebf5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java @@ -21,22 +21,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Capitalization { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public Capitalization smallCamel(String smallCamel) { @@ -50,6 +44,7 @@ public class Capitalization { */ @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -69,6 +64,7 @@ public class Capitalization { */ @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -88,6 +84,7 @@ public class Capitalization { */ @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -107,6 +104,7 @@ public class Capitalization { */ @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -126,6 +124,7 @@ public class Capitalization { */ @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -145,6 +144,7 @@ public class Capitalization { */ @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java index 163822a2656..f1d2c5c97e9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java @@ -35,7 +35,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Cat extends Animal { - @JsonProperty("declawed") private Boolean declawed; /** @@ -65,6 +64,7 @@ public class Cat extends Animal { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java index e8e73cc0c28..6959f4c07e5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOf { - @JsonProperty("declawed") private Boolean declawed; public CatAllOf declawed(Boolean declawed) { @@ -37,6 +36,7 @@ public class CatAllOf { */ @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java index f781ae5574c..061086c3c3f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Category { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -54,6 +52,7 @@ public class Category { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -73,6 +72,7 @@ public class Category { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java index d3c9c803ec3..33d10d79839 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModel { - @JsonProperty("_class") private String propertyClass; public ClassModel propertyClass(String propertyClass) { @@ -36,6 +35,7 @@ public class ClassModel { */ @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java index 7aa7dd5ee0c..415ad50e2c8 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java @@ -21,7 +21,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Client { - @JsonProperty("client") private String client; public Client client(String client) { @@ -35,6 +34,7 @@ public class Client { */ @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java index ed71e7bf9a4..9787053cbe3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java @@ -26,19 +26,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValue { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -78,6 +74,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -105,6 +102,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -132,6 +130,7 @@ public class ContainerDefaultValue { */ @NotNull @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -159,6 +158,7 @@ public class ContainerDefaultValue { */ @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java index 1ae16f68d79..bf856e98705 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Dog extends Animal { - @JsonProperty("breed") private String breed; /** @@ -56,6 +55,7 @@ public class Dog extends Animal { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java index 0e8f816aa4f..92fd0a1003a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOf { - @JsonProperty("breed") private String breed; public DogAllOf breed(String breed) { @@ -37,6 +36,7 @@ public class DogAllOf { */ @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java index f12f8bd0528..3231c81446e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java @@ -59,7 +59,6 @@ public class EnumArrays { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -97,7 +96,6 @@ public class EnumArrays { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -112,6 +110,7 @@ public class EnumArrays { */ @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -139,6 +138,7 @@ public class EnumArrays { */ @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java index a9557c84a90..33431bc6b3b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java @@ -62,7 +62,6 @@ public class EnumTest { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -102,7 +101,6 @@ public class EnumTest { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -140,7 +138,6 @@ public class EnumTest { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ public class EnumTest { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnum outerEnum; /** @@ -211,6 +206,7 @@ public class EnumTest { */ @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -230,6 +226,7 @@ public class EnumTest { */ @NotNull @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -249,6 +246,7 @@ public class EnumTest { */ @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -268,6 +266,7 @@ public class EnumTest { */ @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -287,6 +286,7 @@ public class EnumTest { */ @Valid @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java index b98a0b9589e..90ae951c28c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class File { - @JsonProperty("sourceURI") private String sourceURI; public File sourceURI(String sourceURI) { @@ -36,6 +35,7 @@ public class File { */ @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java index 37db6d702e0..26c11a8e86b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClass { - @JsonProperty("file") private File file; - @JsonProperty("files") @Valid private List<@Valid File> files; @@ -42,6 +40,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("file") public File getFile() { return file; } @@ -69,6 +68,7 @@ public class FileSchemaTestClass { */ @Valid @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("files") public List<@Valid File> getFiles() { return files; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java index e4ad2be9177..f2cc31357aa 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java @@ -29,48 +29,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -105,6 +91,7 @@ public class FormatTest { */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -126,6 +113,7 @@ public class FormatTest { */ @Min(20) @Max(200) @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -145,6 +133,7 @@ public class FormatTest { */ @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -166,6 +155,7 @@ public class FormatTest { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -187,6 +177,7 @@ public class FormatTest { */ @DecimalMin("54.3") @DecimalMax("987.6") @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("float") public Float getFloat() { return _float; } @@ -208,6 +199,7 @@ public class FormatTest { */ @DecimalMin("67.8") @DecimalMax("123.4") @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("double") public Double getDouble() { return _double; } @@ -227,6 +219,7 @@ public class FormatTest { */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("string") public String getString() { return string; } @@ -246,6 +239,7 @@ public class FormatTest { */ @NotNull @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -265,6 +259,7 @@ public class FormatTest { */ @Valid @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -284,6 +279,7 @@ public class FormatTest { */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -303,6 +299,7 @@ public class FormatTest { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -322,6 +319,7 @@ public class FormatTest { */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -341,6 +339,7 @@ public class FormatTest { */ @NotNull @Size(min = 10, max = 64) @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -360,6 +359,7 @@ public class FormatTest { */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java index cf9c6e9d27e..a359abf6d61 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java @@ -23,10 +23,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnly { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnly bar(String bar) { @@ -40,6 +38,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -59,6 +58,7 @@ public class HasOnlyReadOnly { */ @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java index 9f6f0f6c589..a14b0343044 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTest { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -63,15 +62,12 @@ public class MapTest { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -94,6 +90,7 @@ public class MapTest { */ @Valid @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -121,6 +118,7 @@ public class MapTest { */ @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -148,6 +146,7 @@ public class MapTest { */ @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -175,6 +174,7 @@ public class MapTest { */ @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java index 247cf3cae21..2165294c3be 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,14 +27,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -49,6 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -68,6 +66,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -95,6 +94,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java index 3cbf29bb8ae..3e96c3c5eb5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200Response { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200Response name(Integer name) { @@ -41,6 +39,7 @@ public class Model200Response { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -60,6 +59,7 @@ public class Model200Response { */ @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java index c4c57e9b55a..1dafc875a73 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java @@ -23,13 +23,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelApiResponse { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +40,7 @@ public class ModelApiResponse { */ @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("code") public Integer getCode() { return code; } @@ -62,6 +60,7 @@ public class ModelApiResponse { */ @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("type") public String getType() { return type; } @@ -81,6 +80,7 @@ public class ModelApiResponse { */ @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java index 4c9f7b965f0..b2d5036185c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelList { - @JsonProperty("123-list") private String _123list; public ModelList _123list(String _123list) { @@ -37,6 +36,7 @@ public class ModelList { */ @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123-list") public String get123list() { return _123list; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java index 4f7b1d6a707..748bb9666ef 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ModelReturn { - @JsonProperty("return") private Integer _return; public ModelReturn _return(Integer _return) { @@ -38,6 +37,7 @@ public class ModelReturn { */ @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java index c765c47d462..f00cb75ddc7 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java @@ -22,16 +22,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Name { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123number; /** @@ -61,6 +57,7 @@ public class Name { */ @NotNull @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public Integer getName() { return name; } @@ -80,6 +77,7 @@ public class Name { */ @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -99,6 +97,7 @@ public class Name { */ @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property") public String getProperty() { return property; } @@ -118,6 +117,7 @@ public class Name { */ @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("123Number") public Integer get123number() { return _123number; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java index fa289a07a10..8a64f4c3b97 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java @@ -22,7 +22,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnly { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnly justNumber(BigDecimal justNumber) { @@ -36,6 +35,7 @@ public class NumberOnly { */ @Valid @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java index 6d2bc000943..5d1e4d7d9dd 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java @@ -24,16 +24,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Order { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -74,10 +70,8 @@ public class Order { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public Order id(Long id) { @@ -91,6 +85,7 @@ public class Order { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -110,6 +105,7 @@ public class Order { */ @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -129,6 +125,7 @@ public class Order { */ @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -148,6 +145,7 @@ public class Order { */ @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -167,6 +165,7 @@ public class Order { */ @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -186,6 +185,7 @@ public class Order { */ @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java index 53b0591789c..fdc4d2d3a67 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java @@ -22,13 +22,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterComposite { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterComposite myNumber(BigDecimal myNumber) { @@ -42,6 +39,7 @@ public class OuterComposite { */ @Valid @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -61,6 +59,7 @@ public class OuterComposite { */ @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -80,6 +79,7 @@ public class OuterComposite { */ @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index a6e1d1a9573..92c95332cbd 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -29,20 +29,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Pet { - @JsonProperty("id") private Long id; - @JsonProperty("category") private Category category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid Tag> tags; @@ -83,7 +78,6 @@ public class Pet { } } - @JsonProperty("status") private StatusEnum status; /** @@ -114,6 +108,7 @@ public class Pet { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -133,6 +128,7 @@ public class Pet { */ @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("category") public Category getCategory() { return category; } @@ -152,6 +148,7 @@ public class Pet { */ @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("name") public String getName() { return name; } @@ -179,6 +176,7 @@ public class Pet { */ @NotNull @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -207,6 +205,7 @@ public class Pet { */ @Valid @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; } @@ -226,6 +225,7 @@ public class Pet { */ @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java index ab46b7db4cd..7609052eca3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirst { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirst bar(String bar) { @@ -38,6 +36,7 @@ public class ReadOnlyFirst { */ @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("bar") public String getBar() { return bar; } @@ -57,6 +56,7 @@ public class ReadOnlyFirst { */ @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java new file mode 100644 index 00000000000..390bd1ee9e4 --- /dev/null +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java @@ -0,0 +1,155 @@ +package org.openapitools.virtualan.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNames + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNames { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNames {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java index 02f421df163..79e507fccc3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java @@ -23,7 +23,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelName { - @JsonProperty("$special[property.name]") private Long $specialPropertyName; public SpecialModelName $specialPropertyName(Long $specialPropertyName) { @@ -37,6 +36,7 @@ public class SpecialModelName { */ @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $specialPropertyName; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java index 1924be7de11..2c284e36e4f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java @@ -21,10 +21,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Tag { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public Tag id(Long id) { @@ -38,6 +36,7 @@ public class Tag { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -57,6 +56,7 @@ public class Tag { */ @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java index 0fd5ba6fa7b..0deae5af294 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java @@ -24,19 +24,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefault { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -71,6 +66,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -90,6 +86,7 @@ public class TypeHolderDefault { */ @NotNull @Valid @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -109,6 +106,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -128,6 +126,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -155,6 +154,7 @@ public class TypeHolderDefault { */ @NotNull @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java index 21d9337da76..9c37a634809 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java @@ -24,22 +24,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExample { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -75,6 +69,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -94,6 +89,7 @@ public class TypeHolderExample { */ @NotNull @Valid @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -113,6 +109,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -132,6 +129,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -151,6 +149,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -178,6 +177,7 @@ public class TypeHolderExample { */ @NotNull @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java index 3a2458136cb..319d6d960ca 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java @@ -21,28 +21,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class User { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public User id(Long id) { @@ -56,6 +48,7 @@ public class User { */ @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") public Long getId() { return id; } @@ -75,6 +68,7 @@ public class User { */ @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("username") public String getUsername() { return username; } @@ -94,6 +88,7 @@ public class User { */ @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -113,6 +108,7 @@ public class User { */ @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -132,6 +128,7 @@ public class User { */ @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("email") public String getEmail() { return email; } @@ -151,6 +148,7 @@ public class User { */ @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("password") public String getPassword() { return password; } @@ -170,6 +168,7 @@ public class User { */ @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("phone") public String getPhone() { return phone; } @@ -189,6 +188,7 @@ public class User { */ @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java index 84f991273fe..77160243ee2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java @@ -24,99 +24,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItem { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -131,6 +102,7 @@ public class XmlItem { */ @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -150,6 +122,7 @@ public class XmlItem { */ @Valid @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -169,6 +142,7 @@ public class XmlItem { */ @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -188,6 +162,7 @@ public class XmlItem { */ @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -215,6 +190,7 @@ public class XmlItem { */ @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -234,6 +210,7 @@ public class XmlItem { */ @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -253,6 +230,7 @@ public class XmlItem { */ @Valid @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -272,6 +250,7 @@ public class XmlItem { */ @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -291,6 +270,7 @@ public class XmlItem { */ @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -318,6 +298,7 @@ public class XmlItem { */ @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -345,6 +326,7 @@ public class XmlItem { */ @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -364,6 +346,7 @@ public class XmlItem { */ @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -383,6 +366,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -402,6 +386,7 @@ public class XmlItem { */ @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -421,6 +406,7 @@ public class XmlItem { */ @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -448,6 +434,7 @@ public class XmlItem { */ @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -475,6 +462,7 @@ public class XmlItem { */ @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -494,6 +482,7 @@ public class XmlItem { */ @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -513,6 +502,7 @@ public class XmlItem { */ @Valid @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -532,6 +522,7 @@ public class XmlItem { */ @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -551,6 +542,7 @@ public class XmlItem { */ @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -578,6 +570,7 @@ public class XmlItem { */ @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -605,6 +598,7 @@ public class XmlItem { */ @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -624,6 +618,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -643,6 +638,7 @@ public class XmlItem { */ @Valid @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -662,6 +658,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -681,6 +678,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -708,6 +706,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -735,6 +734,7 @@ public class XmlItem { */ @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml index 1fa32524cf2..260abafd6ea 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2114,6 +2139,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES index ed149e7e75b..1a5080e6434 100644 --- a/samples/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/server/petstore/springboot/.openapi-generator/FILES @@ -60,6 +60,7 @@ src/main/java/org/openapitools/model/OuterCompositeDto.java src/main/java/org/openapitools/model/OuterEnumDto.java src/main/java/org/openapitools/model/PetDto.java src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java src/main/java/org/openapitools/model/ReturnDto.java src/main/java/org/openapitools/model/SpecialModelNameDto.java src/main/java/org/openapitools/model/TagDto.java diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index d169863b104..49c9d624f08 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -14,6 +14,7 @@ import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; import org.openapitools.model.OuterCompositeDto; +import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto; import org.openapitools.model.UserDto; import org.openapitools.model.XmlItemDto; import io.swagger.annotations.*; @@ -203,6 +204,44 @@ public interface FakeApi { } + /** + * GET /fake/{petId}/response-object-different-names + * + * @param petId ID of pet to update (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "pet" }, + value = "", + nickname = "responseObjectDifferentNames", + notes = "", + response = ResponseObjectWithDifferentFieldNamesDto.class + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNamesDto.class) + }) + @RequestMapping( + method = RequestMethod.GET, + value = "/fake/{petId}/response-object-different-names", + produces = { "application/json" } + ) + default ResponseEntity responseObjectDifferentNames( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + /** * PUT /fake/body-with-file-schema * For this test, the body for this request much reference a schema named `File`. diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java index 832b3bbf29f..ad3ca0f55b6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,6 +9,7 @@ import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; import org.openapitools.model.OuterCompositeDto; +import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto; import org.openapitools.model.UserDto; import org.openapitools.model.XmlItemDto; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index 4ae78f07714..a6ba7205ba7 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesAnyTypeDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesAnyTypeDto name(String name) { @@ -40,6 +39,7 @@ public class AdditionalPropertiesAnyTypeDto extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index f3a031c68b5..2d3046d2152 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesArrayDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesArrayDto name(String name) { @@ -41,6 +40,7 @@ public class AdditionalPropertiesArrayDto extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index e58c2612b57..48df16e5b13 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesBooleanDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesBooleanDto name(String name) { @@ -40,6 +39,7 @@ public class AdditionalPropertiesBooleanDto extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index fda780a36c3..cce9f53867e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -31,45 +31,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesClassDto { - @JsonProperty("map_string") @Valid private Map mapString = new HashMap<>(); - @JsonProperty("map_number") @Valid private Map mapNumber = new HashMap<>(); - @JsonProperty("map_integer") @Valid private Map mapInteger = new HashMap<>(); - @JsonProperty("map_boolean") @Valid private Map mapBoolean = new HashMap<>(); - @JsonProperty("map_array_integer") @Valid private Map> mapArrayInteger = new HashMap<>(); - @JsonProperty("map_array_anytype") @Valid private Map> mapArrayAnytype = new HashMap<>(); - @JsonProperty("map_map_string") @Valid private Map> mapMapString = new HashMap<>(); - @JsonProperty("map_map_anytype") @Valid private Map> mapMapAnytype = new HashMap<>(); - @JsonProperty("anytype_1") private Object anytype1; - @JsonProperty("anytype_2") private JsonNullable anytype2 = JsonNullable.undefined(); - @JsonProperty("anytype_3") private Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { @@ -91,6 +80,7 @@ public class AdditionalPropertiesClassDto { */ @ApiModelProperty(value = "") + @JsonProperty("map_string") public Map getMapString() { return mapString; } @@ -118,6 +108,7 @@ public class AdditionalPropertiesClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; } @@ -145,6 +136,7 @@ public class AdditionalPropertiesClassDto { */ @ApiModelProperty(value = "") + @JsonProperty("map_integer") public Map getMapInteger() { return mapInteger; } @@ -172,6 +164,7 @@ public class AdditionalPropertiesClassDto { */ @ApiModelProperty(value = "") + @JsonProperty("map_boolean") public Map getMapBoolean() { return mapBoolean; } @@ -199,6 +192,7 @@ public class AdditionalPropertiesClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { return mapArrayInteger; } @@ -226,6 +220,7 @@ public class AdditionalPropertiesClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; } @@ -253,6 +248,7 @@ public class AdditionalPropertiesClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_string") public Map> getMapMapString() { return mapMapString; } @@ -280,6 +276,7 @@ public class AdditionalPropertiesClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { return mapMapAnytype; } @@ -299,6 +296,7 @@ public class AdditionalPropertiesClassDto { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_1") public Object getAnytype1() { return anytype1; } @@ -318,6 +316,7 @@ public class AdditionalPropertiesClassDto { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_2") public JsonNullable getAnytype2() { return anytype2; } @@ -337,6 +336,7 @@ public class AdditionalPropertiesClassDto { */ @ApiModelProperty(value = "") + @JsonProperty("anytype_3") public Object getAnytype3() { return anytype3; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index a53cb5d6447..9a288249271 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesIntegerDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesIntegerDto name(String name) { @@ -40,6 +39,7 @@ public class AdditionalPropertiesIntegerDto extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index 7014b116fd5..9623f9828ee 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesNumberDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesNumberDto name(String name) { @@ -41,6 +40,7 @@ public class AdditionalPropertiesNumberDto extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 112fc024ae6..513a0177106 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesObjectDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesObjectDto name(String name) { @@ -40,6 +39,7 @@ public class AdditionalPropertiesObjectDto extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index c611ccb01c7..239aa573c7a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -26,7 +26,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AdditionalPropertiesStringDto extends HashMap { - @JsonProperty("name") private String name; public AdditionalPropertiesStringDto name(String name) { @@ -40,6 +39,7 @@ public class AdditionalPropertiesStringDto extends HashMap { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java index ac989cfb9c3..e9f6006abda 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java @@ -40,10 +40,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class AnimalDto { - @JsonProperty("className") private String className; - @JsonProperty("color") private String color = "red"; /** @@ -73,6 +71,7 @@ public class AnimalDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("className") public String getClassName() { return className; } @@ -92,6 +91,7 @@ public class AnimalDto { */ @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java index b491a360fe1..dcf05a96d97 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -24,13 +24,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ApiResponseDto { - @JsonProperty("code") private Integer code; - @JsonProperty("type") private String type; - @JsonProperty("message") private String message; public ApiResponseDto code(Integer code) { @@ -44,6 +41,7 @@ public class ApiResponseDto { */ @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -63,6 +61,7 @@ public class ApiResponseDto { */ @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -82,6 +81,7 @@ public class ApiResponseDto { */ @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index da4445a1ba9..f822315149c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfArrayOfNumberOnlyDto { - @JsonProperty("ArrayArrayNumber") @Valid private List> arrayArrayNumber; @@ -50,6 +49,7 @@ public class ArrayOfArrayOfNumberOnlyDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 1c885b7ebd8..036ce227947 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayOfNumberOnlyDto { - @JsonProperty("ArrayNumber") @Valid private List arrayNumber; @@ -50,6 +49,7 @@ public class ArrayOfNumberOnlyDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java index 3c2137595f2..45768a4fb3f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -27,15 +27,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ArrayTestDto { - @JsonProperty("array_of_string") @Valid private List arrayOfString; - @JsonProperty("array_array_of_integer") @Valid private List> arrayArrayOfInteger; - @JsonProperty("array_array_of_model") @Valid private List> arrayArrayOfModel; @@ -58,6 +55,7 @@ public class ArrayTestDto { */ @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -85,6 +83,7 @@ public class ArrayTestDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -112,6 +111,7 @@ public class ArrayTestDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOfDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOfDto.java index 5b7c1bd8094..546ab564a99 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOfDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOfDto.java @@ -64,7 +64,6 @@ public class BigCatAllOfDto { } } - @JsonProperty("kind") private KindEnum kind; public BigCatAllOfDto kind(KindEnum kind) { @@ -78,6 +77,7 @@ public class BigCatAllOfDto { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java index dd08693ca40..5cf349a5334 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java @@ -69,7 +69,6 @@ public class BigCatDto extends CatDto { } } - @JsonProperty("kind") private KindEnum kind; /** @@ -99,6 +98,7 @@ public class BigCatDto extends CatDto { */ @ApiModelProperty(value = "") + @JsonProperty("kind") public KindEnum getKind() { return kind; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java index 404b2b016e5..0d9f693f54e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -24,22 +24,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CapitalizationDto { - @JsonProperty("smallCamel") private String smallCamel; - @JsonProperty("CapitalCamel") private String capitalCamel; - @JsonProperty("small_Snake") private String smallSnake; - @JsonProperty("Capital_Snake") private String capitalSnake; - @JsonProperty("SCA_ETH_Flow_Points") private String scAETHFlowPoints; - @JsonProperty("ATT_NAME") private String ATT_NAME; public CapitalizationDto smallCamel(String smallCamel) { @@ -53,6 +47,7 @@ public class CapitalizationDto { */ @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -72,6 +67,7 @@ public class CapitalizationDto { */ @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -91,6 +87,7 @@ public class CapitalizationDto { */ @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -110,6 +107,7 @@ public class CapitalizationDto { */ @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -129,6 +127,7 @@ public class CapitalizationDto { */ @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -148,6 +147,7 @@ public class CapitalizationDto { */ @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOfDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOfDto.java index 1fc610ad6cb..5381c543ba3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOfDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOfDto.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatAllOfDto { - @JsonProperty("declawed") private Boolean declawed; public CatAllOfDto declawed(Boolean declawed) { @@ -38,6 +37,7 @@ public class CatAllOfDto { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java index a990352b607..fc461e6b11f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java @@ -37,7 +37,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CatDto extends AnimalDto { - @JsonProperty("declawed") private Boolean declawed; /** @@ -67,6 +66,7 @@ public class CatDto extends AnimalDto { */ @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean getDeclawed() { return declawed; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java index 557df9bb685..3c3b3abd47a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class CategoryDto { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name = "default-name"; /** @@ -57,6 +55,7 @@ public class CategoryDto { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -76,6 +75,7 @@ public class CategoryDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java index e82763d08e6..d25c1804dbc 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClassModelDto { - @JsonProperty("_class") private String propertyClass; public ClassModelDto propertyClass(String propertyClass) { @@ -39,6 +38,7 @@ public class ClassModelDto { */ @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java index 469d640a365..12821380779 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ClientDto { - @JsonProperty("client") private String client; public ClientDto client(String client) { @@ -38,6 +37,7 @@ public class ClientDto { */ @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index cea6d655ab4..b7c7f4e573d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -29,19 +29,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ContainerDefaultValueDto { - @JsonProperty("nullable_array") @Valid private JsonNullable> nullableArray = JsonNullable.undefined(); - @JsonProperty("nullable_required_array") @Valid private JsonNullable> nullableRequiredArray = JsonNullable.undefined(); - @JsonProperty("required_array") @Valid private List requiredArray = new ArrayList<>(); - @JsonProperty("nullable_array_with_default") @Valid private JsonNullable> nullableArrayWithDefault = JsonNullable.undefined(); @@ -81,6 +77,7 @@ public class ContainerDefaultValueDto { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array") public JsonNullable> getNullableArray() { return nullableArray; } @@ -108,6 +105,7 @@ public class ContainerDefaultValueDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("nullable_required_array") public JsonNullable> getNullableRequiredArray() { return nullableRequiredArray; } @@ -135,6 +133,7 @@ public class ContainerDefaultValueDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("required_array") public List getRequiredArray() { return requiredArray; } @@ -162,6 +161,7 @@ public class ContainerDefaultValueDto { */ @ApiModelProperty(value = "") + @JsonProperty("nullable_array_with_default") public JsonNullable> getNullableArrayWithDefault() { return nullableArrayWithDefault; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOfDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOfDto.java index e2855024947..d855ccb5e82 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOfDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOfDto.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogAllOfDto { - @JsonProperty("breed") private String breed; public DogAllOfDto breed(String breed) { @@ -38,6 +37,7 @@ public class DogAllOfDto { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java index 44649549f19..c5aa58ba072 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java @@ -29,7 +29,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class DogDto extends AnimalDto { - @JsonProperty("breed") private String breed; /** @@ -59,6 +58,7 @@ public class DogDto extends AnimalDto { */ @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java index c7c37c6c34e..faf57f8317b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -62,7 +62,6 @@ public class EnumArraysDto { } } - @JsonProperty("just_symbol") private JustSymbolEnum justSymbol; /** @@ -100,7 +99,6 @@ public class EnumArraysDto { } } - @JsonProperty("array_enum") @Valid private List arrayEnum; @@ -115,6 +113,7 @@ public class EnumArraysDto { */ @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -142,6 +141,7 @@ public class EnumArraysDto { */ @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java index ddf3979b7b2..569cba845e8 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java @@ -63,7 +63,6 @@ public class EnumTestDto { } } - @JsonProperty("enum_string") private EnumStringEnum enumString; /** @@ -103,7 +102,6 @@ public class EnumTestDto { } } - @JsonProperty("enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -141,7 +139,6 @@ public class EnumTestDto { } } - @JsonProperty("enum_integer") private EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ public class EnumTestDto { } } - @JsonProperty("enum_number") private EnumNumberEnum enumNumber; - @JsonProperty("outerEnum") private OuterEnumDto outerEnum; /** @@ -212,6 +207,7 @@ public class EnumTestDto { */ @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -231,6 +227,7 @@ public class EnumTestDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("enum_string_required") public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -250,6 +247,7 @@ public class EnumTestDto { */ @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -269,6 +267,7 @@ public class EnumTestDto { */ @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -288,6 +287,7 @@ public class EnumTestDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnumDto getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java index 380a2a9a77e..09f0cb543a3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileDto { - @JsonProperty("sourceURI") private String sourceURI; public FileDto sourceURI(String sourceURI) { @@ -39,6 +38,7 @@ public class FileDto { */ @ApiModelProperty(value = "Test capitalization") + @JsonProperty("sourceURI") public String getSourceURI() { return sourceURI; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 347e615ed99..20934ecff64 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -27,10 +27,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FileSchemaTestClassDto { - @JsonProperty("file") private FileDto file; - @JsonProperty("files") @Valid private List<@Valid FileDto> files; @@ -45,6 +43,7 @@ public class FileSchemaTestClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("file") public FileDto getFile() { return file; } @@ -72,6 +71,7 @@ public class FileSchemaTestClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("files") public List<@Valid FileDto> getFiles() { return files; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java index 9958d734539..2a12fb9c44b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java @@ -30,48 +30,34 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTestDto { - @JsonProperty("integer") private Integer integer; - @JsonProperty("int32") private Integer int32; - @JsonProperty("int64") private Long int64; - @JsonProperty("number") private BigDecimal number; - @JsonProperty("float") private Float _float; - @JsonProperty("double") private Double _double; - @JsonProperty("string") private String string; - @JsonProperty("byte") private byte[] _byte; - @JsonProperty("binary") private org.springframework.core.io.Resource binary; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("password") private String password; - @JsonProperty("BigDecimal") private BigDecimal bigDecimal; /** @@ -106,6 +92,7 @@ public class FormatTestDto { */ @Min(10) @Max(100) @ApiModelProperty(value = "") + @JsonProperty("integer") public Integer getInteger() { return integer; } @@ -127,6 +114,7 @@ public class FormatTestDto { */ @Min(20) @Max(200) @ApiModelProperty(value = "") + @JsonProperty("int32") public Integer getInt32() { return int32; } @@ -146,6 +134,7 @@ public class FormatTestDto { */ @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -167,6 +156,7 @@ public class FormatTestDto { */ @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") + @JsonProperty("number") public BigDecimal getNumber() { return number; } @@ -188,6 +178,7 @@ public class FormatTestDto { */ @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") + @JsonProperty("float") public Float getFloat() { return _float; } @@ -209,6 +200,7 @@ public class FormatTestDto { */ @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") + @JsonProperty("double") public Double getDouble() { return _double; } @@ -228,6 +220,7 @@ public class FormatTestDto { */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") + @JsonProperty("string") public String getString() { return string; } @@ -247,6 +240,7 @@ public class FormatTestDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("byte") public byte[] getByte() { return _byte; } @@ -266,6 +260,7 @@ public class FormatTestDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("binary") public org.springframework.core.io.Resource getBinary() { return binary; } @@ -285,6 +280,7 @@ public class FormatTestDto { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("date") public LocalDate getDate() { return date; } @@ -304,6 +300,7 @@ public class FormatTestDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -323,6 +320,7 @@ public class FormatTestDto { */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -342,6 +340,7 @@ public class FormatTestDto { */ @NotNull @Size(min = 10, max = 64) @ApiModelProperty(required = true, value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -361,6 +360,7 @@ public class FormatTestDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { return bigDecimal; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index 2b8b8181dd2..4911ed09bf3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class HasOnlyReadOnlyDto { - @JsonProperty("bar") private String bar; - @JsonProperty("foo") private String foo; public HasOnlyReadOnlyDto bar(String bar) { @@ -41,6 +39,7 @@ public class HasOnlyReadOnlyDto { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class HasOnlyReadOnlyDto { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java index b62ae7e5cb0..915c901ea75 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ListDto { - @JsonProperty("123-list") private String _123List; public ListDto _123List(String _123List) { @@ -38,6 +37,7 @@ public class ListDto { */ @ApiModelProperty(value = "") + @JsonProperty("123-list") public String get123List() { return _123List; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java index 7edf8258281..6d74ef6517e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java @@ -27,7 +27,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MapTestDto { - @JsonProperty("map_map_of_string") @Valid private Map> mapMapOfString = new HashMap<>(); @@ -66,15 +65,12 @@ public class MapTestDto { } } - @JsonProperty("map_of_enum_string") @Valid private Map mapOfEnumString = new HashMap<>(); - @JsonProperty("direct_map") @Valid private Map directMap = new HashMap<>(); - @JsonProperty("indirect_map") @Valid private Map indirectMap = new HashMap<>(); @@ -97,6 +93,7 @@ public class MapTestDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -124,6 +121,7 @@ public class MapTestDto { */ @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } @@ -151,6 +149,7 @@ public class MapTestDto { */ @ApiModelProperty(value = "") + @JsonProperty("direct_map") public Map getDirectMap() { return directMap; } @@ -178,6 +177,7 @@ public class MapTestDto { */ @ApiModelProperty(value = "") + @JsonProperty("indirect_map") public Map getIndirectMap() { return indirectMap; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index c602c9a77e0..3640ff771d1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -30,14 +30,11 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClassDto { - @JsonProperty("uuid") private UUID uuid; - @JsonProperty("dateTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dateTime; - @JsonProperty("map") @Valid private Map map = new HashMap<>(); @@ -52,6 +49,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -71,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("dateTime") public OffsetDateTime getDateTime() { return dateTime; } @@ -98,6 +97,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java index 88f61f6732c..6a9cd2b5ef2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -25,10 +25,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class Model200ResponseDto { - @JsonProperty("name") private Integer name; - @JsonProperty("class") private String propertyClass; public Model200ResponseDto name(Integer name) { @@ -42,6 +40,7 @@ public class Model200ResponseDto { */ @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -61,6 +60,7 @@ public class Model200ResponseDto { */ @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java index 1428f8ee913..21351e2fced 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java @@ -25,16 +25,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NameDto { - @JsonProperty("name") private Integer name; - @JsonProperty("snake_case") private Integer snakeCase; - @JsonProperty("property") private String property; - @JsonProperty("123Number") private Integer _123Number; /** @@ -64,6 +60,7 @@ public class NameDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -83,6 +80,7 @@ public class NameDto { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -102,6 +100,7 @@ public class NameDto { */ @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -121,6 +120,7 @@ public class NameDto { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("123Number") public Integer get123Number() { return _123Number; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java index d3ae78d54cb..23b53177c21 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class NumberOnlyDto { - @JsonProperty("JustNumber") private BigDecimal justNumber; public NumberOnlyDto justNumber(BigDecimal justNumber) { @@ -39,6 +38,7 @@ public class NumberOnlyDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java index 52825dc3d50..05e501b79e4 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java @@ -27,16 +27,12 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OrderDto { - @JsonProperty("id") private Long id; - @JsonProperty("petId") private Long petId; - @JsonProperty("quantity") private Integer quantity; - @JsonProperty("shipDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -77,10 +73,8 @@ public class OrderDto { } } - @JsonProperty("status") private StatusEnum status; - @JsonProperty("complete") private Boolean complete = false; public OrderDto id(Long id) { @@ -94,6 +88,7 @@ public class OrderDto { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -113,6 +108,7 @@ public class OrderDto { */ @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -132,6 +128,7 @@ public class OrderDto { */ @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -151,6 +148,7 @@ public class OrderDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("shipDate") public OffsetDateTime getShipDate() { return shipDate; } @@ -170,6 +168,7 @@ public class OrderDto { */ @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -189,6 +188,7 @@ public class OrderDto { */ @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean getComplete() { return complete; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java index e7d74089cb2..68c1e7f760d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -25,13 +25,10 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class OuterCompositeDto { - @JsonProperty("my_number") private BigDecimal myNumber; - @JsonProperty("my_string") private String myString; - @JsonProperty("my_boolean") private Boolean myBoolean; public OuterCompositeDto myNumber(BigDecimal myNumber) { @@ -45,6 +42,7 @@ public class OuterCompositeDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -64,6 +62,7 @@ public class OuterCompositeDto { */ @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -83,6 +82,7 @@ public class OuterCompositeDto { */ @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java index bbd680e89fa..88d38a4e503 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java @@ -32,20 +32,15 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class PetDto { - @JsonProperty("id") private Long id; - @JsonProperty("category") private CategoryDto category; - @JsonProperty("name") private String name; - @JsonProperty("photoUrls") @Valid private Set photoUrls = new LinkedHashSet<>(); - @JsonProperty("tags") @Valid private List<@Valid TagDto> tags; @@ -86,7 +81,6 @@ public class PetDto { } } - @JsonProperty("status") private StatusEnum status; /** @@ -117,6 +111,7 @@ public class PetDto { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -136,6 +131,7 @@ public class PetDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("category") public CategoryDto getCategory() { return category; } @@ -155,6 +151,7 @@ public class PetDto { */ @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") public String getName() { return name; } @@ -182,6 +179,7 @@ public class PetDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") public Set getPhotoUrls() { return photoUrls; } @@ -210,6 +208,7 @@ public class PetDto { */ @Valid @ApiModelProperty(value = "") + @JsonProperty("tags") public List<@Valid TagDto> getTags() { return tags; } @@ -229,6 +228,7 @@ public class PetDto { */ @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index 9d60f0b4f2e..5112782b229 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReadOnlyFirstDto { - @JsonProperty("bar") private String bar; - @JsonProperty("baz") private String baz; public ReadOnlyFirstDto bar(String bar) { @@ -41,6 +39,7 @@ public class ReadOnlyFirstDto { */ @ApiModelProperty(readOnly = true, value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -60,6 +59,7 @@ public class ReadOnlyFirstDto { */ @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java new file mode 100644 index 00000000000..3276113a5c9 --- /dev/null +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -0,0 +1,158 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * ResponseObjectWithDifferentFieldNamesDto + */ + +@JsonTypeName("ResponseObjectWithDifferentFieldNames") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen") +public class ResponseObjectWithDifferentFieldNamesDto { + + private String normalPropertyName; + + private String UPPER_CASE_PROPERTY_SNAKE; + + private String lowerCasePropertyDashes; + + private String propertyNameWithSpaces; + + public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + return this; + } + + /** + * Get normalPropertyName + * @return normalPropertyName + */ + + @ApiModelProperty(value = "") + @JsonProperty("normalPropertyName") + public String getNormalPropertyName() { + return normalPropertyName; + } + + public void setNormalPropertyName(String normalPropertyName) { + this.normalPropertyName = normalPropertyName; + } + + public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + return this; + } + + /** + * Get UPPER_CASE_PROPERTY_SNAKE + * @return UPPER_CASE_PROPERTY_SNAKE + */ + + @ApiModelProperty(value = "") + @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") + public String getUPPERCASEPROPERTYSNAKE() { + return UPPER_CASE_PROPERTY_SNAKE; + } + + public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; + } + + public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + return this; + } + + /** + * Get lowerCasePropertyDashes + * @return lowerCasePropertyDashes + */ + + @ApiModelProperty(value = "") + @JsonProperty("lower-case-property-dashes") + public String getLowerCasePropertyDashes() { + return lowerCasePropertyDashes; + } + + public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) { + this.lowerCasePropertyDashes = lowerCasePropertyDashes; + } + + public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + return this; + } + + /** + * Get propertyNameWithSpaces + * @return propertyNameWithSpaces + */ + + @ApiModelProperty(value = "") + @JsonProperty("property name with spaces") + public String getPropertyNameWithSpaces() { + return propertyNameWithSpaces; + } + + public void setPropertyNameWithSpaces(String propertyNameWithSpaces) { + this.propertyNameWithSpaces = propertyNameWithSpaces; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ResponseObjectWithDifferentFieldNamesDto responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNamesDto) o; + return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) && + Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) && + Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) && + Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces); + } + + @Override + public int hashCode() { + return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ResponseObjectWithDifferentFieldNamesDto {\n"); + sb.append(" normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n"); + sb.append(" UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n"); + sb.append(" lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n"); + sb.append(" propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java index 44c776f01c1..033daa6a180 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java @@ -25,7 +25,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class ReturnDto { - @JsonProperty("return") private Integer _return; public ReturnDto _return(Integer _return) { @@ -39,6 +38,7 @@ public class ReturnDto { */ @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java index f5ea44d681a..35c91451a26 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -24,7 +24,6 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class SpecialModelNameDto { - @JsonProperty("$special[property.name]") private Long $SpecialPropertyName; public SpecialModelNameDto $SpecialPropertyName(Long $SpecialPropertyName) { @@ -38,6 +37,7 @@ public class SpecialModelNameDto { */ @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { return $SpecialPropertyName; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java index 073b54c2b98..18f25a44044 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java @@ -24,10 +24,8 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TagDto { - @JsonProperty("id") private Long id; - @JsonProperty("name") private String name; public TagDto id(Long id) { @@ -41,6 +39,7 @@ public class TagDto { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -60,6 +59,7 @@ public class TagDto { */ @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 465fb77c08c..ef1a9c240ee 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -27,19 +27,14 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderDefaultDto { - @JsonProperty("string_item") private String stringItem = "what"; - @JsonProperty("number_item") private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonProperty("integer_item") private Integer integerItem = -2; - @JsonProperty("bool_item") private Boolean boolItem = true; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @@ -74,6 +69,7 @@ public class TypeHolderDefaultDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -93,6 +89,7 @@ public class TypeHolderDefaultDto { */ @NotNull @Valid @ApiModelProperty(required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -112,6 +109,7 @@ public class TypeHolderDefaultDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -131,6 +129,7 @@ public class TypeHolderDefaultDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -158,6 +157,7 @@ public class TypeHolderDefaultDto { */ @NotNull @ApiModelProperty(required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 15dc401681a..c4eb4d96721 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -27,22 +27,16 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class TypeHolderExampleDto { - @JsonProperty("string_item") private String stringItem; - @JsonProperty("number_item") private BigDecimal numberItem; - @JsonProperty("float_item") private Float floatItem; - @JsonProperty("integer_item") private Integer integerItem; - @JsonProperty("bool_item") private Boolean boolItem; - @JsonProperty("array_item") @Valid private List arrayItem = new ArrayList<>(); @@ -78,6 +72,7 @@ public class TypeHolderExampleDto { */ @NotNull @ApiModelProperty(example = "what", required = true, value = "") + @JsonProperty("string_item") public String getStringItem() { return stringItem; } @@ -97,6 +92,7 @@ public class TypeHolderExampleDto { */ @NotNull @Valid @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("number_item") public BigDecimal getNumberItem() { return numberItem; } @@ -116,6 +112,7 @@ public class TypeHolderExampleDto { */ @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") + @JsonProperty("float_item") public Float getFloatItem() { return floatItem; } @@ -135,6 +132,7 @@ public class TypeHolderExampleDto { */ @NotNull @ApiModelProperty(example = "-2", required = true, value = "") + @JsonProperty("integer_item") public Integer getIntegerItem() { return integerItem; } @@ -154,6 +152,7 @@ public class TypeHolderExampleDto { */ @NotNull @ApiModelProperty(example = "true", required = true, value = "") + @JsonProperty("bool_item") public Boolean getBoolItem() { return boolItem; } @@ -181,6 +180,7 @@ public class TypeHolderExampleDto { */ @NotNull @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "") + @JsonProperty("array_item") public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java index 43f14f44bff..e8f22138103 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java @@ -24,28 +24,20 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class UserDto { - @JsonProperty("id") private Long id; - @JsonProperty("username") private String username; - @JsonProperty("firstName") private String firstName; - @JsonProperty("lastName") private String lastName; - @JsonProperty("email") private String email; - @JsonProperty("password") private String password; - @JsonProperty("phone") private String phone; - @JsonProperty("userStatus") private Integer userStatus; public UserDto id(Long id) { @@ -59,6 +51,7 @@ public class UserDto { */ @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -78,6 +71,7 @@ public class UserDto { */ @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -97,6 +91,7 @@ public class UserDto { */ @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -116,6 +111,7 @@ public class UserDto { */ @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -135,6 +131,7 @@ public class UserDto { */ @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -154,6 +151,7 @@ public class UserDto { */ @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -173,6 +171,7 @@ public class UserDto { */ @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -192,6 +191,7 @@ public class UserDto { */ @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java index a100cd91283..10677d46297 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java @@ -27,99 +27,70 @@ import javax.annotation.Generated; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class XmlItemDto { - @JsonProperty("attribute_string") private String attributeString; - @JsonProperty("attribute_number") private BigDecimal attributeNumber; - @JsonProperty("attribute_integer") private Integer attributeInteger; - @JsonProperty("attribute_boolean") private Boolean attributeBoolean; - @JsonProperty("wrapped_array") @Valid private List wrappedArray; - @JsonProperty("name_string") private String nameString; - @JsonProperty("name_number") private BigDecimal nameNumber; - @JsonProperty("name_integer") private Integer nameInteger; - @JsonProperty("name_boolean") private Boolean nameBoolean; - @JsonProperty("name_array") @Valid private List nameArray; - @JsonProperty("name_wrapped_array") @Valid private List nameWrappedArray; - @JsonProperty("prefix_string") private String prefixString; - @JsonProperty("prefix_number") private BigDecimal prefixNumber; - @JsonProperty("prefix_integer") private Integer prefixInteger; - @JsonProperty("prefix_boolean") private Boolean prefixBoolean; - @JsonProperty("prefix_array") @Valid private List prefixArray; - @JsonProperty("prefix_wrapped_array") @Valid private List prefixWrappedArray; - @JsonProperty("namespace_string") private String namespaceString; - @JsonProperty("namespace_number") private BigDecimal namespaceNumber; - @JsonProperty("namespace_integer") private Integer namespaceInteger; - @JsonProperty("namespace_boolean") private Boolean namespaceBoolean; - @JsonProperty("namespace_array") @Valid private List namespaceArray; - @JsonProperty("namespace_wrapped_array") @Valid private List namespaceWrappedArray; - @JsonProperty("prefix_ns_string") private String prefixNsString; - @JsonProperty("prefix_ns_number") private BigDecimal prefixNsNumber; - @JsonProperty("prefix_ns_integer") private Integer prefixNsInteger; - @JsonProperty("prefix_ns_boolean") private Boolean prefixNsBoolean; - @JsonProperty("prefix_ns_array") @Valid private List prefixNsArray; - @JsonProperty("prefix_ns_wrapped_array") @Valid private List prefixNsWrappedArray; @@ -134,6 +105,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("attribute_string") public String getAttributeString() { return attributeString; } @@ -153,6 +125,7 @@ public class XmlItemDto { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -172,6 +145,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("attribute_integer") public Integer getAttributeInteger() { return attributeInteger; } @@ -191,6 +165,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { return attributeBoolean; } @@ -218,6 +193,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("wrapped_array") public List getWrappedArray() { return wrappedArray; } @@ -237,6 +213,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("name_string") public String getNameString() { return nameString; } @@ -256,6 +233,7 @@ public class XmlItemDto { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("name_number") public BigDecimal getNameNumber() { return nameNumber; } @@ -275,6 +253,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("name_integer") public Integer getNameInteger() { return nameInteger; } @@ -294,6 +273,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("name_boolean") public Boolean getNameBoolean() { return nameBoolean; } @@ -321,6 +301,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("name_array") public List getNameArray() { return nameArray; } @@ -348,6 +329,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; } @@ -367,6 +349,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_string") public String getPrefixString() { return prefixString; } @@ -386,6 +369,7 @@ public class XmlItemDto { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -405,6 +389,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_integer") public Integer getPrefixInteger() { return prefixInteger; } @@ -424,6 +409,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { return prefixBoolean; } @@ -451,6 +437,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_array") public List getPrefixArray() { return prefixArray; } @@ -478,6 +465,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; } @@ -497,6 +485,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("namespace_string") public String getNamespaceString() { return namespaceString; } @@ -516,6 +505,7 @@ public class XmlItemDto { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -535,6 +525,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { return namespaceInteger; } @@ -554,6 +545,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { return namespaceBoolean; } @@ -581,6 +573,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_array") public List getNamespaceArray() { return namespaceArray; } @@ -608,6 +601,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; } @@ -627,6 +621,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "string", value = "") + @JsonProperty("prefix_ns_string") public String getPrefixNsString() { return prefixNsString; } @@ -646,6 +641,7 @@ public class XmlItemDto { */ @Valid @ApiModelProperty(example = "1.234", value = "") + @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } @@ -665,6 +661,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "-2", value = "") + @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { return prefixNsInteger; } @@ -684,6 +681,7 @@ public class XmlItemDto { */ @ApiModelProperty(example = "true", value = "") + @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { return prefixNsBoolean; } @@ -711,6 +709,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { return prefixNsArray; } @@ -738,6 +737,7 @@ public class XmlItemDto { */ @ApiModelProperty(value = "") + @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml index c2cce49a800..2151d60d758 100644 --- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml @@ -1174,6 +1174,31 @@ paths: x-accepts: application/json x-tags: - tag: pet + /fake/{petId}/response-object-different-names: + get: + operationId: responseObjectDifferentNames + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames' + description: successful operation + tags: + - pet + x-accepts: application/json + x-tags: + - tag: pet components: requestBodies: UserArray: @@ -2106,6 +2131,22 @@ components: - nullable_required_array - required_array type: object + ResponseObjectWithDifferentFieldNames: + example: + UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE + lower-case-property-dashes: lower-case-property-dashes + property name with spaces: property name with spaces + normalPropertyName: normalPropertyName + properties: + normalPropertyName: + type: string + UPPER_CASE_PROPERTY_SNAKE: + type: string + lower-case-property-dashes: + type: string + property name with spaces: + type: string + type: object updatePetWithForm_request: properties: name: From 3ea346e1bbdf1d6f913d8388d9ab95a2a44b8a4d Mon Sep 17 00:00:00 2001 From: Mintas Date: Sun, 19 Mar 2023 15:18:11 +0300 Subject: [PATCH 064/131] [SPRING] resolved ambiguous beanValidation Email annotation imports; fix #13379 (#13962) * resolved ambiguous beanValidation Email annotation imports; fix #13379 * [Java][Spring] fix email import --------- Co-authored-by: Oleh Kurpiak --- .../JavaSpring/beanValidationCore.mustache | 6 +++-- .../java/spring/SpringCodegenTest.java | 25 +++++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache index f8aa5ab2a9a..7ebfccafca5 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache @@ -11,8 +11,10 @@ minLength not set, maxLength set }}{{#minItems}}{{^maxItems}}@Size(min = {{minItems}}) {{/maxItems}}{{/minItems}}{{! @Size: minItems not set && maxItems set }}{{^minItems}}{{#maxItems}}@Size(max = {{.}}) {{/maxItems}}{{/minItems}}{{! -@Email: useBeanValidation set && isEmail set -}}{{#useBeanValidation}}{{#isEmail}}@Email{{/isEmail}}{{/useBeanValidation}}{{! +@Email: useBeanValidation +}}{{#isEmail}}{{#useBeanValidation}}@{{javaxPackage}}.validation.constraints.Email{{/useBeanValidation}}{{! +@Email: performBeanValidation exclusive +}}{{^useBeanValidation}}{{#performBeanValidation}}@org.hibernate.validator.constraints.Email{{/performBeanValidation}}{{/useBeanValidation}}{{/isEmail}}{{! check for integer or long / all others=decimal type with @Decimal* isInteger set }}{{#isInteger}}{{#minimum}}@Min({{.}}) {{/minimum}}{{#maximum}}@Max({{.}}) {{/maximum}}{{/isInteger}}{{! diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 46cec50b1b3..b3e139db21c 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -821,16 +821,25 @@ public class SpringCodegenTest { @Test public void useBeanValidationTruePerformBeanValidationFalseJava8TrueForFormatEmail() throws IOException { - beanValidationForFormatEmail(true, false, true, "@Email", "@org.hibernate.validator.constraints.Email"); + beanValidationForFormatEmail(true, false, true, "@javax.validation.constraints.Email", "@org.hibernate.validator.constraints.Email"); } @Test public void useBeanValidationTruePerformBeanValidationTrueJava8FalseForFormatEmail() throws IOException { - beanValidationForFormatEmail(true, true, false, "@Email", "@org.hibernate.validator.constraints.Email"); + beanValidationForFormatEmail(true, true, false, "@javax.validation.constraints.Email", "@org.hibernate.validator.constraints.Email"); + } + + @Test + public void useBeanValidationTruePerformBeanValidationFalseJava8TrueJakartaeeTrueForFormatEmail() throws IOException { + beanValidationForFormatEmail(true, false, true, true,"@jakarta.validation.constraints.Email", "@javax.validation.constraints.Email"); } // note: java8 option/mustache tag has been removed and default to true private void beanValidationForFormatEmail(boolean useBeanValidation, boolean performBeanValidation, boolean java8, String contains, String notContains) throws IOException { + this.beanValidationForFormatEmail(useBeanValidation, performBeanValidation, java8, false, contains, notContains); + } + + private void beanValidationForFormatEmail(boolean useBeanValidation, boolean performBeanValidation, boolean java8, boolean useJakarta, String contains, String notContains) throws IOException { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); @@ -842,6 +851,7 @@ public class SpringCodegenTest { codegen.setOutputDir(output.getAbsolutePath()); codegen.setUseBeanValidation(useBeanValidation); codegen.setPerformBeanValidation(performBeanValidation); + codegen.setUseSpringBoot3(useJakarta); ClientOptInput input = new ClientOptInput(); input.openAPI(openAPI); @@ -855,15 +865,20 @@ public class SpringCodegenTest { generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - List files = generator.opts(input).generate(); + Map files = generator.opts(input).generate().stream() + .collect(Collectors.toMap(File::getName, Function.identity())); + JavaFileAssert javaFileAssert = JavaFileAssert.assertThat(files.get("PersonWithEmail.java")) + .printFileContent(); + if (useBeanValidation) javaFileAssert.hasImports((useJakarta? "jakarta" : "javax") + ".validation.constraints"); + if (performBeanValidation) javaFileAssert.hasImports("org.hibernate.validator.constraints"); assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/PersonWithEmail.java"), contains); assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/PersonWithEmail.java"), notContains); } @Test public void useBeanValidationTruePerformBeanValidationTrueJava8TrueForFormatEmail() throws IOException { - beanValidationForFormatEmail(true, true, true, "@Email", "@org.hibernate.validator.constraints.Email"); + beanValidationForFormatEmail(true, true, true, "@javax.validation.constraints.Email", "@org.hibernate.validator.constraints.Email"); } @Test @@ -1934,7 +1949,7 @@ public class SpringCodegenTest { JavaFileAssert javaFileAssert = JavaFileAssert.assertThat(files.get("Person.java")) .printFileContent(); javaFileAssert.assertMethod("getName").assertMethodAnnotations() - .containsWithName("NotNull").containsWithName("Size").containsWithName("Email"); + .containsWithName("NotNull").containsWithName("Size").containsWithName("javax.validation.constraints.Email"); javaFileAssert .hasNoImports("javax.validation.constraints.NotNull") .hasImports("javax.validation.constraints"); From e780d59352d5998f922fd71565fda7cf2c0bf0a7 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 20 Mar 2023 16:58:13 +0800 Subject: [PATCH 065/131] add auto-generated api spec file (#14994) --- .../codegen/languages/CSharpNetCoreClientCodegen.java | 4 ++++ .../src/main/resources/csharp-netcore/openapi.mustache | 1 + .../csharp-netcore-complex-files/.openapi-generator/FILES | 1 + .../others/csharp-netcore-complex-files/api/openapi.yaml | 1 + .../.openapi-generator/FILES | 1 + .../OpenAPIClient-ConditionalSerialization/api/openapi.yaml | 1 + .../.openapi-generator/FILES | 1 + .../OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml | 1 + .../OpenAPIClient-generichost-net6.0/.openapi-generator/FILES | 1 + .../OpenAPIClient-generichost-net6.0/api/openapi.yaml | 1 + .../.openapi-generator/FILES | 1 + .../api/openapi.yaml | 1 + .../.openapi-generator/FILES | 1 + .../api/openapi.yaml | 1 + .../.openapi-generator/FILES | 1 + .../api/openapi.yaml | 1 + .../.openapi-generator/FILES | 1 + .../OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml | 1 + .../OpenAPIClient-httpclient/.openapi-generator/FILES | 1 + .../csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml | 1 + .../OpenAPIClient-net47/.openapi-generator/FILES | 1 + .../csharp-netcore/OpenAPIClient-net47/api/openapi.yaml | 1 + .../OpenAPIClient-net48/.openapi-generator/FILES | 1 + .../csharp-netcore/OpenAPIClient-net48/api/openapi.yaml | 1 + .../OpenAPIClient-net5.0/.openapi-generator/FILES | 1 + .../csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml | 1 + .../OpenAPIClient-unityWebRequest/.openapi-generator/FILES | 1 + .../OpenAPIClient-unityWebRequest/api/openapi.yaml | 1 + .../csharp-netcore/OpenAPIClient/.openapi-generator/FILES | 1 + .../petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml | 1 + .../csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES | 1 + .../csharp-netcore/OpenAPIClientCore/api/openapi.yaml | 1 + .../OpenAPIClientCoreAndNet47/.openapi-generator/FILES | 1 + .../csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml | 1 + 34 files changed, 37 insertions(+) create mode 100644 modules/openapi-generator/src/main/resources/csharp-netcore/openapi.mustache create mode 100644 samples/client/others/csharp-netcore-complex-files/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index c877c63a0ca..a93477ed25d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -860,6 +860,10 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { supportingFiles.add(new SupportingFile("auth/OAuthFlow.mustache", authPackageDir, "OAuthFlow.cs")); } } + + // include the spec in the output + supportingFiles.add(new SupportingFile("openapi.mustache", "api", "openapi.yaml")); + } public void setClientPackage(String clientPackage) { diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/openapi.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/openapi.mustache new file mode 100644 index 00000000000..34fbb53f331 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/openapi.mustache @@ -0,0 +1 @@ +{{{openapi-yaml}}} diff --git a/samples/client/others/csharp-netcore-complex-files/.openapi-generator/FILES b/samples/client/others/csharp-netcore-complex-files/.openapi-generator/FILES index 4afed17cb82..fb5f0b603c3 100644 --- a/samples/client/others/csharp-netcore-complex-files/.openapi-generator/FILES +++ b/samples/client/others/csharp-netcore-complex-files/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/MultipartApi.md docs/MultipartArrayRequest.md diff --git a/samples/client/others/csharp-netcore-complex-files/api/openapi.yaml b/samples/client/others/csharp-netcore-complex-files/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/others/csharp-netcore-complex-files/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES index 733114e3828..4520a7cbbe1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/Activity.md docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES index ff892217def..9fe94806020 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/apis/AnotherFakeApi.md docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES index ff892217def..9fe94806020 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/apis/AnotherFakeApi.md docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES index f71328b618e..16f489ff88b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/apis/DefaultApi.md docs/models/Adult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES index af3bdedb0b6..a71e463b072 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/apis/DefaultApi.md docs/models/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES index af3bdedb0b6..a71e463b072 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/apis/DefaultApi.md docs/models/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES index ff892217def..9fe94806020 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/apis/AnotherFakeApi.md docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES index 05e40204769..605b852fd02 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/Activity.md docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES index 733114e3828..4520a7cbbe1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/Activity.md docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES index 733114e3828..4520a7cbbe1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/Activity.md docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES index 733114e3828..4520a7cbbe1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/Activity.md docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES index 2668d8a45b1..1eca9a79f1b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES @@ -1,5 +1,6 @@ .gitignore README.md +api/openapi.yaml docs/Activity.md docs/ActivityOutputElementRepresentation.md docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES index f465ea1d3ab..1002fd3c2f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/Activity.md docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES index f465ea1d3ab..1002fd3c2f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/Activity.md docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml @@ -0,0 +1 @@ + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/FILES index 9f81e159fbb..f05700009ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/FILES @@ -1,6 +1,7 @@ .gitignore Org.OpenAPITools.sln README.md +api/openapi.yaml appveyor.yml docs/ApiResponse.md docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml @@ -0,0 +1 @@ + From 17fa35c78d2b2355dab44975d9256256ea43ecda Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 20 Mar 2023 16:59:08 +0800 Subject: [PATCH 066/131] Add AWS to the user list (#14996) * add AWS to the user list * add new file --- README.md | 3 ++- website/src/dynamic/users.yml | 5 +++++ website/static/img/companies/aws.png | Bin 0 -> 106064 bytes 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 website/static/img/companies/aws.png diff --git a/README.md b/README.md index 5256e23d8ac..58322ec10ba 100644 --- a/README.md +++ b/README.md @@ -588,8 +588,9 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - [Angular.Schule](https://angular.schule/) - [Aqovia](https://aqovia.com/) - [Australia and New Zealand Banking Group (ANZ)](http://www.anz.com/) -- [ASKUL](https://www.askul.co.jp) - [Arduino](https://www.arduino.cc/) +- [ASKUL](https://www.askul.co.jp) +- [Amazon Web Services (AWS)](https://aws.amazon.com/) - [b<>com](https://b-com.com/en) - [百度营销](https://e.baidu.com) - [Bandwidth](https://dev.bandwidth.com) diff --git a/website/src/dynamic/users.yml b/website/src/dynamic/users.yml index 22a6201fb52..5a0d7bbf44c 100644 --- a/website/src/dynamic/users.yml +++ b/website/src/dynamic/users.yml @@ -48,6 +48,11 @@ image: "img/companies/logo-askul-01.gif" infoLink: "https://www.askul.co.jp/" pinned: true +- + caption: Amazon Web Services (AWS) + image: "img/companies/aws.png" + infoLink: "https://aws.amazon.com/" + pinned: false - caption: "b<>com" image: "img/companies/b-com.png" diff --git a/website/static/img/companies/aws.png b/website/static/img/companies/aws.png new file mode 100644 index 0000000000000000000000000000000000000000..4ff85d172c80d655207b4ca70d0086fd028e4736 GIT binary patch literal 106064 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 Q{GWNc`z|kD8vM Date: Tue, 21 Mar 2023 14:52:54 +0800 Subject: [PATCH 067/131] use Any instead of StrictStr in any type (#14995) --- .../languages/PythonNextgenClientCodegen.java | 12 +- ...ith-fake-endpoints-models-for-testing.yaml | 14 ++ .../openapi_client/api/query_api.py | 12 +- .../petstore/python-nextgen-aiohttp/README.md | 1 + .../python-nextgen-aiohttp/docs/FakeApi.md | 61 +++++++ .../petstore_api/api/fake_api.py | 151 +++++++++++++++++- .../client/petstore/python-nextgen/README.md | 1 + .../petstore/python-nextgen/docs/FakeApi.md | 61 +++++++ .../petstore_api/api/fake_api.py | 141 +++++++++++++++- 9 files changed, 440 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java index b2bb11e4f37..97ef3daa7fb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java @@ -422,9 +422,9 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements Set modelImports) { if (cp == null) { // if codegen parameter (e.g. map/dict of undefined type) is null, default to string - LOGGER.warn("Codegen property is null (e.g. map/dict of undefined type). Default to string (StrictStr in Pydantic)"); - pydanticImports.add("StrictStr"); - return "StrictStr"; + LOGGER.warn("Codegen property is null (e.g. map/dict of undefined type). Default to typing.Any."); + typingImports.add("Any"); + return "Any"; } if (cp.isArray) { @@ -651,9 +651,9 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements Set modelImports) { if (cp == null) { // if codegen property (e.g. map/dict of undefined type) is null, default to string - LOGGER.warn("Codegen property is null (e.g. map/dict of undefined type). Default to string (StrictStr in Pydantic)"); - pydanticImports.add("StrictStr"); - return "StrictStr"; + LOGGER.warn("Codegen property is null (e.g. map/dict of undefined type). Default to typing.Any."); + typingImports.add("Any"); + return "Any"; } if (cp.isEnum) { diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml index 24a7dd47d53..ac9df8980a4 100644 --- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1234,6 +1234,20 @@ paths: responses: 200: description: The instance started successfully + /fake/any_type_body: + post: + tags: + - fake + summary: test any type request body + operationId: fakeAnyTypeRequestBody + requestBody: + content: + application/json: + schema: + type: object + responses: + 200: + description: OK servers: - url: 'http://{server}.swagger.io:{port}/v2' description: petstore server diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py index fd624a242e0..c5782a008e8 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py @@ -365,7 +365,7 @@ class QueryApi(object): _request_auth=_params.get('_request_auth')) @validate_arguments - def test_query_style_deep_object_explode_true_object(self, query_object : Optional[Dict[str, Dict[str, StrictStr]]] = None, **kwargs) -> str: # noqa: E501 + def test_query_style_deep_object_explode_true_object(self, query_object : Optional[Dict[str, Dict[str, Any]]] = None, **kwargs) -> str: # noqa: E501 """Test query parameter(s) # noqa: E501 Test query parameter(s) # noqa: E501 @@ -396,7 +396,7 @@ class QueryApi(object): return self.test_query_style_deep_object_explode_true_object_with_http_info(query_object, **kwargs) # noqa: E501 @validate_arguments - def test_query_style_deep_object_explode_true_object_with_http_info(self, query_object : Optional[Dict[str, Dict[str, StrictStr]]] = None, **kwargs): # noqa: E501 + def test_query_style_deep_object_explode_true_object_with_http_info(self, query_object : Optional[Dict[str, Dict[str, Any]]] = None, **kwargs): # noqa: E501 """Test query parameter(s) # noqa: E501 Test query parameter(s) # noqa: E501 @@ -645,7 +645,7 @@ class QueryApi(object): _request_auth=_params.get('_request_auth')) @validate_arguments - def test_query_style_form_explode_true_array_string(self, query_object : Optional[Dict[str, StrictStr]] = None, **kwargs) -> str: # noqa: E501 + def test_query_style_form_explode_true_array_string(self, query_object : Optional[Dict[str, Any]] = None, **kwargs) -> str: # noqa: E501 """Test query parameter(s) # noqa: E501 Test query parameter(s) # noqa: E501 @@ -676,7 +676,7 @@ class QueryApi(object): return self.test_query_style_form_explode_true_array_string_with_http_info(query_object, **kwargs) # noqa: E501 @validate_arguments - def test_query_style_form_explode_true_array_string_with_http_info(self, query_object : Optional[Dict[str, StrictStr]] = None, **kwargs): # noqa: E501 + def test_query_style_form_explode_true_array_string_with_http_info(self, query_object : Optional[Dict[str, Any]] = None, **kwargs): # noqa: E501 """Test query parameter(s) # noqa: E501 Test query parameter(s) # noqa: E501 @@ -785,7 +785,7 @@ class QueryApi(object): _request_auth=_params.get('_request_auth')) @validate_arguments - def test_query_style_form_explode_true_object(self, query_object : Optional[Dict[str, StrictStr]] = None, **kwargs) -> str: # noqa: E501 + def test_query_style_form_explode_true_object(self, query_object : Optional[Dict[str, Any]] = None, **kwargs) -> str: # noqa: E501 """Test query parameter(s) # noqa: E501 Test query parameter(s) # noqa: E501 @@ -816,7 +816,7 @@ class QueryApi(object): return self.test_query_style_form_explode_true_object_with_http_info(query_object, **kwargs) # noqa: E501 @validate_arguments - def test_query_style_form_explode_true_object_with_http_info(self, query_object : Optional[Dict[str, StrictStr]] = None, **kwargs): # noqa: E501 + def test_query_style_form_explode_true_object_with_http_info(self, query_object : Optional[Dict[str, Any]] = None, **kwargs): # noqa: E501 """Test query parameter(s) # noqa: E501 Test query parameter(s) # noqa: E501 diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md index 2a6511e7b74..be281eb9946 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md @@ -88,6 +88,7 @@ Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- *AnotherFakeApi* | [**call_123_test_special_tags**](docs/AnotherFakeApi.md#call_123_test_special_tags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**foo_get**](docs/DefaultApi.md#foo_get) | **GET** /foo | +*FakeApi* | [**fake_any_type_request_body**](docs/FakeApi.md#fake_any_type_request_body) | **POST** /fake/any_type_body | test any type request body *FakeApi* | [**fake_health_get**](docs/FakeApi.md#fake_health_get) | **GET** /fake/health | Health check endpoint *FakeApi* | [**fake_http_signature_test**](docs/FakeApi.md#fake_http_signature_test) | **GET** /fake/http-signature-test | test http signature authentication *FakeApi* | [**fake_outer_boolean_serialize**](docs/FakeApi.md#fake_outer_boolean_serialize) | **POST** /fake/outer/boolean | diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md index c819e37193f..e8970e82d3c 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md @@ -4,6 +4,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- +[**fake_any_type_request_body**](FakeApi.md#fake_any_type_request_body) | **POST** /fake/any_type_body | test any type request body [**fake_health_get**](FakeApi.md#fake_health_get) | **GET** /fake/health | Health check endpoint [**fake_http_signature_test**](FakeApi.md#fake_http_signature_test) | **GET** /fake/http-signature-test | test http signature authentication [**fake_outer_boolean_serialize**](FakeApi.md#fake_outer_boolean_serialize) | **POST** /fake/outer/boolean | @@ -23,6 +24,66 @@ Method | HTTP request | Description [**test_query_parameter_collection_format**](FakeApi.md#test_query_parameter_collection_format) | **PUT** /fake/test-query-parameters | +# **fake_any_type_request_body** +> fake_any_type_request_body(body=body) + +test any type request body + +### Example + +```python +from __future__ import print_function +import time +import os +import petstore_api +from petstore_api.rest import ApiException +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 +async with petstore_api.ApiClient(configuration) as api_client: + # Create an instance of the API class + api_instance = petstore_api.FakeApi(api_client) + body = None # object | (optional) + + try: + # test any type request body + await api_instance.fake_any_type_request_body(body=body) + except Exception as e: + print("Exception when calling FakeApi->fake_any_type_request_body: %s\n" % e) +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **body** | **object**| | [optional] + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | OK | - | + +[[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-nextgen-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py index a705d5af6e7..4b9d11adc68 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py @@ -24,7 +24,7 @@ from datetime import date, datetime from pydantic import Field, StrictBool, StrictInt, StrictStr, confloat, conint, conlist, constr, validator -from typing import Dict, Optional +from typing import Any, Dict, Optional from petstore_api.models.client import Client from petstore_api.models.file_schema_test_class import FileSchemaTestClass @@ -53,6 +53,155 @@ class FakeApi(object): api_client = ApiClient.get_default() self.api_client = api_client + @overload + async def fake_any_type_request_body(self, body : Optional[Dict[str, Any]] = None, **kwargs) -> None: # noqa: E501 + ... + + @overload + def fake_any_type_request_body(self, body : Optional[Dict[str, Any]] = None, async_req: Optional[bool]=True, **kwargs) -> None: # noqa: E501 + ... + + @validate_arguments + def fake_any_type_request_body(self, body : Optional[Dict[str, Any]] = None, async_req: Optional[bool]=None, **kwargs) -> Union[None, Awaitable[None]]: # noqa: E501 + """test any type request body # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.fake_any_type_request_body(body, async_req=True) + >>> result = thread.get() + + :param body: + :type body: object + :param async_req: Whether to execute the request asynchronously. + :type async_req: bool, optional + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :type _preload_content: bool, optional + :param _request_timeout: 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. + :return: Returns the result object. + If the method is called asynchronously, + returns the request thread. + :rtype: None + """ + kwargs['_return_http_data_only'] = True + if async_req is not None: + kwargs['async_req'] = async_req + return self.fake_any_type_request_body_with_http_info(body, **kwargs) # noqa: E501 + + @validate_arguments + def fake_any_type_request_body_with_http_info(self, body : Optional[Dict[str, Any]] = None, **kwargs): # noqa: E501 + """test any type request body # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.fake_any_type_request_body_with_http_info(body, async_req=True) + >>> result = thread.get() + + :param body: + :type body: object + :param async_req: Whether to execute the request asynchronously. + :type async_req: bool, optional + :param _return_http_data_only: response data without head status code + and headers + :type _return_http_data_only: bool, optional + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :type _preload_content: bool, optional + :param _request_timeout: 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. + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the authentication + in the spec for a single request. + :type _request_auth: dict, optional + :type _content_type: string, optional: force content-type for the request + :return: Returns the result object. + If the method is called asynchronously, + returns the request thread. + :rtype: None + """ + + _params = locals() + + _all_params = [ + 'body' + ] + _all_params.extend( + [ + 'async_req', + '_return_http_data_only', + '_preload_content', + '_request_timeout', + '_request_auth', + '_content_type', + '_headers' + ] + ) + + # validate the arguments + for _key, _val in _params['kwargs'].items(): + if _key not in _all_params: + raise ApiTypeError( + "Got an unexpected keyword argument '%s'" + " to method fake_any_type_request_body" % _key + ) + _params[_key] = _val + del _params['kwargs'] + + _collection_formats = {} + + # process the path parameters + _path_params = {} + + # process the query parameters + _query_params = [] + # process the header parameters + _header_params = dict(_params.get('_headers', {})) + # process the form parameters + _form_params = [] + _files = {} + # process the body parameter + _body_params = None + if _params['body']: + _body_params = _params['body'] + + # set the HTTP header `Content-Type` + _content_types_list = _params.get('_content_type', + self.api_client.select_header_content_type( + ['application/json'])) + if _content_types_list: + _header_params['Content-Type'] = _content_types_list + + # authentication setting + _auth_settings = [] # noqa: E501 + + _response_types_map = {} + + return self.api_client.call_api( + '/fake/any_type_body', 'POST', + _path_params, + _query_params, + _header_params, + body=_body_params, + post_params=_form_params, + files=_files, + response_types_map=_response_types_map, + auth_settings=_auth_settings, + async_req=_params.get('async_req'), + _return_http_data_only=_params.get('_return_http_data_only'), # noqa: E501 + _preload_content=_params.get('_preload_content', True), + _request_timeout=_params.get('_request_timeout'), + collection_formats=_collection_formats, + _request_auth=_params.get('_request_auth')) + @overload async def fake_health_get(self, **kwargs) -> HealthCheckResult: # noqa: E501 ... diff --git a/samples/openapi3/client/petstore/python-nextgen/README.md b/samples/openapi3/client/petstore/python-nextgen/README.md index 00f4adf15c5..c5e730e2862 100755 --- a/samples/openapi3/client/petstore/python-nextgen/README.md +++ b/samples/openapi3/client/petstore/python-nextgen/README.md @@ -88,6 +88,7 @@ Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- *AnotherFakeApi* | [**call_123_test_special_tags**](docs/AnotherFakeApi.md#call_123_test_special_tags) | **PATCH** /another-fake/dummy | To test special tags *DefaultApi* | [**foo_get**](docs/DefaultApi.md#foo_get) | **GET** /foo | +*FakeApi* | [**fake_any_type_request_body**](docs/FakeApi.md#fake_any_type_request_body) | **POST** /fake/any_type_body | test any type request body *FakeApi* | [**fake_health_get**](docs/FakeApi.md#fake_health_get) | **GET** /fake/health | Health check endpoint *FakeApi* | [**fake_http_signature_test**](docs/FakeApi.md#fake_http_signature_test) | **GET** /fake/http-signature-test | test http signature authentication *FakeApi* | [**fake_outer_boolean_serialize**](docs/FakeApi.md#fake_outer_boolean_serialize) | **POST** /fake/outer/boolean | diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md b/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md index 4407e642760..83ceaf660d5 100755 --- a/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md @@ -4,6 +4,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* Method | HTTP request | Description ------------- | ------------- | ------------- +[**fake_any_type_request_body**](FakeApi.md#fake_any_type_request_body) | **POST** /fake/any_type_body | test any type request body [**fake_health_get**](FakeApi.md#fake_health_get) | **GET** /fake/health | Health check endpoint [**fake_http_signature_test**](FakeApi.md#fake_http_signature_test) | **GET** /fake/http-signature-test | test http signature authentication [**fake_outer_boolean_serialize**](FakeApi.md#fake_outer_boolean_serialize) | **POST** /fake/outer/boolean | @@ -23,6 +24,66 @@ Method | HTTP request | Description [**test_query_parameter_collection_format**](FakeApi.md#test_query_parameter_collection_format) | **PUT** /fake/test-query-parameters | +# **fake_any_type_request_body** +> fake_any_type_request_body(body=body) + +test any type request body + +### Example + +```python +from __future__ import print_function +import time +import os +import petstore_api +from petstore_api.rest import ApiException +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(configuration) as api_client: + # Create an instance of the API class + api_instance = petstore_api.FakeApi(api_client) + body = None # object | (optional) + + try: + # test any type request body + api_instance.fake_any_type_request_body(body=body) + except Exception as e: + print("Exception when calling FakeApi->fake_any_type_request_body: %s\n" % e) +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **body** | **object**| | [optional] + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: Not defined + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | OK | - | + +[[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-nextgen/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py index 27d18a0e091..8ce851d9f06 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py @@ -23,7 +23,7 @@ from datetime import date, datetime from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, confloat, conint, conlist, constr, validator -from typing import Dict, Optional +from typing import Any, Dict, Optional from petstore_api.models.client import Client from petstore_api.models.file_schema_test_class import FileSchemaTestClass @@ -52,6 +52,145 @@ class FakeApi(object): api_client = ApiClient.get_default() self.api_client = api_client + @validate_arguments + def fake_any_type_request_body(self, body : Optional[Dict[str, Any]] = None, **kwargs) -> None: # noqa: E501 + """test any type request body # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.fake_any_type_request_body(body, async_req=True) + >>> result = thread.get() + + :param body: + :type body: object + :param async_req: Whether to execute the request asynchronously. + :type async_req: bool, optional + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :type _preload_content: bool, optional + :param _request_timeout: 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. + :return: Returns the result object. + If the method is called asynchronously, + returns the request thread. + :rtype: None + """ + kwargs['_return_http_data_only'] = True + return self.fake_any_type_request_body_with_http_info(body, **kwargs) # noqa: E501 + + @validate_arguments + def fake_any_type_request_body_with_http_info(self, body : Optional[Dict[str, Any]] = None, **kwargs): # noqa: E501 + """test any type request body # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.fake_any_type_request_body_with_http_info(body, async_req=True) + >>> result = thread.get() + + :param body: + :type body: object + :param async_req: Whether to execute the request asynchronously. + :type async_req: bool, optional + :param _return_http_data_only: response data without head status code + and headers + :type _return_http_data_only: bool, optional + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :type _preload_content: bool, optional + :param _request_timeout: 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. + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the authentication + in the spec for a single request. + :type _request_auth: dict, optional + :type _content_type: string, optional: force content-type for the request + :return: Returns the result object. + If the method is called asynchronously, + returns the request thread. + :rtype: None + """ + + _params = locals() + + _all_params = [ + 'body' + ] + _all_params.extend( + [ + 'async_req', + '_return_http_data_only', + '_preload_content', + '_request_timeout', + '_request_auth', + '_content_type', + '_headers' + ] + ) + + # validate the arguments + for _key, _val in _params['kwargs'].items(): + if _key not in _all_params: + raise ApiTypeError( + "Got an unexpected keyword argument '%s'" + " to method fake_any_type_request_body" % _key + ) + _params[_key] = _val + del _params['kwargs'] + + _collection_formats = {} + + # process the path parameters + _path_params = {} + + # process the query parameters + _query_params = [] + # process the header parameters + _header_params = dict(_params.get('_headers', {})) + # process the form parameters + _form_params = [] + _files = {} + # process the body parameter + _body_params = None + if _params['body']: + _body_params = _params['body'] + + # set the HTTP header `Content-Type` + _content_types_list = _params.get('_content_type', + self.api_client.select_header_content_type( + ['application/json'])) + if _content_types_list: + _header_params['Content-Type'] = _content_types_list + + # authentication setting + _auth_settings = [] # noqa: E501 + + _response_types_map = {} + + return self.api_client.call_api( + '/fake/any_type_body', 'POST', + _path_params, + _query_params, + _header_params, + body=_body_params, + post_params=_form_params, + files=_files, + response_types_map=_response_types_map, + auth_settings=_auth_settings, + async_req=_params.get('async_req'), + _return_http_data_only=_params.get('_return_http_data_only'), # noqa: E501 + _preload_content=_params.get('_preload_content', True), + _request_timeout=_params.get('_request_timeout'), + collection_formats=_collection_formats, + _request_auth=_params.get('_request_auth')) + @validate_arguments def fake_health_get(self, **kwargs) -> HealthCheckResult: # noqa: E501 """Health check endpoint # noqa: E501 From d24ae6b27ab467868bc8d956d72bdf57b58e0198 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Tue, 21 Mar 2023 03:44:10 -0400 Subject: [PATCH 068/131] fixed bug (#15006) --- .../languages/AbstractCSharpCodegen.java | 8 +- ...odels-for-testing-with-http-signature.yaml | 12 ++ .../.openapi-generator/FILES | 4 + .../README.md | 2 + .../docs/TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 69 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 69 ++++++++ .../Model/TestCollectionEndingWithWordList.cs | 154 +++++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 154 +++++++++++++++++ .../.openapi-generator/FILES | 4 + .../TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 68 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 68 ++++++++ .../Client/HostConfiguration.cs | 2 + .../Model/TestCollectionEndingWithWordList.cs | 155 +++++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 157 ++++++++++++++++++ .../.openapi-generator/FILES | 4 + .../TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 68 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 68 ++++++++ .../Client/HostConfiguration.cs | 2 + .../Model/TestCollectionEndingWithWordList.cs | 153 +++++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 155 +++++++++++++++++ .../.openapi-generator/FILES | 4 + .../TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 68 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 68 ++++++++ .../Client/HostConfiguration.cs | 2 + .../Model/TestCollectionEndingWithWordList.cs | 153 +++++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 155 +++++++++++++++++ .../.openapi-generator/FILES | 4 + .../OpenAPIClient-httpclient/README.md | 2 + .../docs/TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 69 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 69 ++++++++ .../Model/TestCollectionEndingWithWordList.cs | 133 +++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 133 +++++++++++++++ .../.openapi-generator/FILES | 4 + .../OpenAPIClient-net47/README.md | 2 + .../docs/TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 69 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 69 ++++++++ .../Model/TestCollectionEndingWithWordList.cs | 132 +++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 132 +++++++++++++++ .../.openapi-generator/FILES | 4 + .../OpenAPIClient-net48/README.md | 2 + .../docs/TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 69 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 69 ++++++++ .../Model/TestCollectionEndingWithWordList.cs | 132 +++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 132 +++++++++++++++ .../.openapi-generator/FILES | 4 + .../OpenAPIClient-net5.0/README.md | 2 + .../docs/TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 69 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 69 ++++++++ .../Model/TestCollectionEndingWithWordList.cs | 132 +++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 132 +++++++++++++++ .../.openapi-generator/FILES | 4 + .../OpenAPIClient-unityWebRequest/README.md | 2 + .../docs/TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 66 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 66 ++++++++ .../Model/TestCollectionEndingWithWordList.cs | 118 +++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 119 +++++++++++++ .../OpenAPIClient/.openapi-generator/FILES | 4 + .../csharp-netcore/OpenAPIClient/README.md | 2 + .../docs/TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 69 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 69 ++++++++ .../Model/TestCollectionEndingWithWordList.cs | 132 +++++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 132 +++++++++++++++ .../.openapi-generator/FILES | 4 + .../OpenAPIClientCore/README.md | 2 + .../docs/TestCollectionEndingWithWordList.md | 10 ++ .../TestCollectionEndingWithWordListObject.md | 10 ++ ...CollectionEndingWithWordListObjectTests.cs | 69 ++++++++ .../TestCollectionEndingWithWordListTests.cs | 69 ++++++++ .../Model/TestCollectionEndingWithWordList.cs | 120 +++++++++++++ .../TestCollectionEndingWithWordListObject.cs | 120 +++++++++++++ 90 files changed, 4843 insertions(+), 4 deletions(-) create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index 36c56dc08fa..651a015111b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -552,12 +552,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } // fix incorrect data types for maps of maps - if (property.datatypeWithEnum.contains("List>") && property.items != null) { - property.datatypeWithEnum = property.datatypeWithEnum.replace("List>", property.items.datatypeWithEnum + ">"); + if (property.datatypeWithEnum.endsWith(", List>") && property.items != null) { + property.datatypeWithEnum = property.datatypeWithEnum.replace(", List>", ", " + property.items.datatypeWithEnum + ">"); property.dataType = property.datatypeWithEnum; } - if (property.datatypeWithEnum.contains("Dictionary>") && property.items != null) { - property.datatypeWithEnum = property.datatypeWithEnum.replace("Dictionary>", property.items.datatypeWithEnum + ">"); + if (property.datatypeWithEnum.endsWith(", Dictionary>") && property.items != null) { + property.datatypeWithEnum = property.datatypeWithEnum.replace(", Dictionary>", ", " + property.items.datatypeWithEnum + ">"); property.dataType = property.datatypeWithEnum; } diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 289c9719314..21d824b0084 100644 --- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -2248,3 +2248,15 @@ components: type: string format: date example: "2017-07-21" + TestCollectionEndingWithWordListObject: + type: object + properties: + TestCollectionEndingWithWordList: + type: array + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + TestCollectionEndingWithWordList: + type: object + properties: + value: + type: string \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES index 4520a7cbbe1..ca00a1d0b12 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES @@ -85,6 +85,8 @@ docs/SimpleQuadrilateral.md docs/SpecialModelName.md docs/StoreApi.md docs/Tag.md +docs/TestCollectionEndingWithWordList.md +docs/TestCollectionEndingWithWordListObject.md docs/Triangle.md docs/TriangleInterface.md docs/User.md @@ -197,6 +199,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md index 439e572e13f..56476d9a949 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md @@ -225,6 +225,8 @@ Class | Method | HTTP request | Description - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - [Model.Tag](docs/Tag.md) + - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) + - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) - [Model.Triangle](docs/Triangle.md) - [Model.TriangleInterface](docs/TriangleInterface.md) - [Model.User](docs/User.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..0e5568637b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..7213b3ca8d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..4def0dcda9c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..e9df66daf2e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..238328da587 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,154 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + [DataContract(Name = "TestCollectionEndingWithWordList")] + public partial class TestCollectionEndingWithWordList : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value. + public TestCollectionEndingWithWordList(string value = default(string)) + { + this._Value = value; + if (this.Value != null) + { + this._flagValue = true; + } + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets Value + /// + [DataMember(Name = "value", EmitDefaultValue = false)] + public string Value + { + get{ return _Value;} + set + { + _Value = value; + _flagValue = true; + } + } + private string _Value; + private bool _flagValue; + + /// + /// Returns false as Value should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeValue() + { + return _flagValue; + } + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordList).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordList instances are equal + /// + /// Instance of TestCollectionEndingWithWordList to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordList input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Value != null) + { + hashCode = (hashCode * 59) + this.Value.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..e7654fb69e1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,154 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + [DataContract(Name = "TestCollectionEndingWithWordListObject")] + public partial class TestCollectionEndingWithWordListObject : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList. + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList = default(List)) + { + this._TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + if (this.TestCollectionEndingWithWordList != null) + { + this._flagTestCollectionEndingWithWordList = true; + } + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [DataMember(Name = "TestCollectionEndingWithWordList", EmitDefaultValue = false)] + public List TestCollectionEndingWithWordList + { + get{ return _TestCollectionEndingWithWordList;} + set + { + _TestCollectionEndingWithWordList = value; + _flagTestCollectionEndingWithWordList = true; + } + } + private List _TestCollectionEndingWithWordList; + private bool _flagTestCollectionEndingWithWordList; + + /// + /// Returns false as TestCollectionEndingWithWordList should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeTestCollectionEndingWithWordList() + { + return _flagTestCollectionEndingWithWordList; + } + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordListObject).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordListObject instances are equal + /// + /// Instance of TestCollectionEndingWithWordListObject to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordListObject input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TestCollectionEndingWithWordList != null) + { + hashCode = (hashCode * 59) + this.TestCollectionEndingWithWordList.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES index 9fe94806020..9d9da2869df 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES @@ -86,6 +86,8 @@ docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md docs/models/Tag.md +docs/models/TestCollectionEndingWithWordList.md +docs/models/TestCollectionEndingWithWordListObject.md docs/models/Triangle.md docs/models/TriangleInterface.md docs/models/User.md @@ -203,6 +205,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..5c5eb22d9a8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..cfa933cc576 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..6204d80fb4f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..4068363f13b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs index 834af932817..8bd9635ba09 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -128,6 +128,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); + _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); + _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); _jsonOptions.Converters.Add(new TriangleJsonConverter()); _jsonOptions.Converters.Add(new TriangleInterfaceJsonConverter()); _jsonOptions.Converters.Add(new UserJsonConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..4c77a059bea --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,155 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + public partial class TestCollectionEndingWithWordList : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value + [JsonConstructor] + public TestCollectionEndingWithWordList(string value) + { + Value = value; + } + + /// + /// Gets or Sets Value + /// + [JsonPropertyName("value")] + public string Value { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type TestCollectionEndingWithWordList + /// + public class TestCollectionEndingWithWordListJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override TestCollectionEndingWithWordList Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + string value = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "value": + value = utf8JsonReader.GetString(); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (value == null) + throw new ArgumentNullException(nameof(value), "Property is required for class TestCollectionEndingWithWordList."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new TestCollectionEndingWithWordList(value); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, TestCollectionEndingWithWordList testCollectionEndingWithWordList, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WriteString("value", testCollectionEndingWithWordList.Value); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..263dafcca2c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,157 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + public partial class TestCollectionEndingWithWordListObject : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList + [JsonConstructor] + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList) + { + TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [JsonPropertyName("TestCollectionEndingWithWordList")] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type TestCollectionEndingWithWordListObject + /// + public class TestCollectionEndingWithWordListObjectJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override TestCollectionEndingWithWordListObject Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + List testCollectionEndingWithWordList = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "TestCollectionEndingWithWordList": + if (utf8JsonReader.TokenType != JsonTokenType.Null) + testCollectionEndingWithWordList = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (testCollectionEndingWithWordList == null) + throw new ArgumentNullException(nameof(testCollectionEndingWithWordList), "Property is required for class TestCollectionEndingWithWordListObject."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new TestCollectionEndingWithWordListObject(testCollectionEndingWithWordList); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, TestCollectionEndingWithWordListObject testCollectionEndingWithWordListObject, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WritePropertyName("TestCollectionEndingWithWordList"); + JsonSerializer.Serialize(writer, testCollectionEndingWithWordListObject.TestCollectionEndingWithWordList, jsonSerializerOptions); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES index 9fe94806020..9d9da2869df 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES @@ -86,6 +86,8 @@ docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md docs/models/Tag.md +docs/models/TestCollectionEndingWithWordList.md +docs/models/TestCollectionEndingWithWordListObject.md docs/models/Triangle.md docs/models/TriangleInterface.md docs/models/User.md @@ -203,6 +205,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..5c5eb22d9a8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..cfa933cc576 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..6204d80fb4f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..4068363f13b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index ad15d6f98cb..34478d4be16 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -126,6 +126,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); + _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); + _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); _jsonOptions.Converters.Add(new TriangleJsonConverter()); _jsonOptions.Converters.Add(new TriangleInterfaceJsonConverter()); _jsonOptions.Converters.Add(new UserJsonConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..f3f2789d5d1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,153 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + public partial class TestCollectionEndingWithWordList : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value + [JsonConstructor] + public TestCollectionEndingWithWordList(string value) + { + Value = value; + } + + /// + /// Gets or Sets Value + /// + [JsonPropertyName("value")] + public string Value { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type TestCollectionEndingWithWordList + /// + public class TestCollectionEndingWithWordListJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override TestCollectionEndingWithWordList Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + string value = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "value": + value = utf8JsonReader.GetString(); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (value == null) + throw new ArgumentNullException(nameof(value), "Property is required for class TestCollectionEndingWithWordList."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new TestCollectionEndingWithWordList(value); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, TestCollectionEndingWithWordList testCollectionEndingWithWordList, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WriteString("value", testCollectionEndingWithWordList.Value); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..91ddee2d53c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,155 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + public partial class TestCollectionEndingWithWordListObject : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList + [JsonConstructor] + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList) + { + TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [JsonPropertyName("TestCollectionEndingWithWordList")] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type TestCollectionEndingWithWordListObject + /// + public class TestCollectionEndingWithWordListObjectJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override TestCollectionEndingWithWordListObject Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + List testCollectionEndingWithWordList = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "TestCollectionEndingWithWordList": + if (utf8JsonReader.TokenType != JsonTokenType.Null) + testCollectionEndingWithWordList = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (testCollectionEndingWithWordList == null) + throw new ArgumentNullException(nameof(testCollectionEndingWithWordList), "Property is required for class TestCollectionEndingWithWordListObject."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new TestCollectionEndingWithWordListObject(testCollectionEndingWithWordList); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, TestCollectionEndingWithWordListObject testCollectionEndingWithWordListObject, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WritePropertyName("TestCollectionEndingWithWordList"); + JsonSerializer.Serialize(writer, testCollectionEndingWithWordListObject.TestCollectionEndingWithWordList, jsonSerializerOptions); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES index 9fe94806020..9d9da2869df 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES @@ -86,6 +86,8 @@ docs/models/ShapeOrNull.md docs/models/SimpleQuadrilateral.md docs/models/SpecialModelName.md docs/models/Tag.md +docs/models/TestCollectionEndingWithWordList.md +docs/models/TestCollectionEndingWithWordListObject.md docs/models/Triangle.md docs/models/TriangleInterface.md docs/models/User.md @@ -203,6 +205,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..5c5eb22d9a8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..cfa933cc576 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..6204d80fb4f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..4068363f13b --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,68 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index ad15d6f98cb..34478d4be16 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -126,6 +126,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new SimpleQuadrilateralJsonConverter()); _jsonOptions.Converters.Add(new SpecialModelNameJsonConverter()); _jsonOptions.Converters.Add(new TagJsonConverter()); + _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListJsonConverter()); + _jsonOptions.Converters.Add(new TestCollectionEndingWithWordListObjectJsonConverter()); _jsonOptions.Converters.Add(new TriangleJsonConverter()); _jsonOptions.Converters.Add(new TriangleInterfaceJsonConverter()); _jsonOptions.Converters.Add(new UserJsonConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..f3f2789d5d1 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,153 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + public partial class TestCollectionEndingWithWordList : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value + [JsonConstructor] + public TestCollectionEndingWithWordList(string value) + { + Value = value; + } + + /// + /// Gets or Sets Value + /// + [JsonPropertyName("value")] + public string Value { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type TestCollectionEndingWithWordList + /// + public class TestCollectionEndingWithWordListJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override TestCollectionEndingWithWordList Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + string value = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "value": + value = utf8JsonReader.GetString(); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (value == null) + throw new ArgumentNullException(nameof(value), "Property is required for class TestCollectionEndingWithWordList."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new TestCollectionEndingWithWordList(value); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, TestCollectionEndingWithWordList testCollectionEndingWithWordList, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WriteString("value", testCollectionEndingWithWordList.Value); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..91ddee2d53c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,155 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + public partial class TestCollectionEndingWithWordListObject : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList + [JsonConstructor] + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList) + { + TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [JsonPropertyName("TestCollectionEndingWithWordList")] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type TestCollectionEndingWithWordListObject + /// + public class TestCollectionEndingWithWordListObjectJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override TestCollectionEndingWithWordListObject Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + List testCollectionEndingWithWordList = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "TestCollectionEndingWithWordList": + if (utf8JsonReader.TokenType != JsonTokenType.Null) + testCollectionEndingWithWordList = JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (testCollectionEndingWithWordList == null) + throw new ArgumentNullException(nameof(testCollectionEndingWithWordList), "Property is required for class TestCollectionEndingWithWordListObject."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new TestCollectionEndingWithWordListObject(testCollectionEndingWithWordList); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, TestCollectionEndingWithWordListObject testCollectionEndingWithWordListObject, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WritePropertyName("TestCollectionEndingWithWordList"); + JsonSerializer.Serialize(writer, testCollectionEndingWithWordListObject.TestCollectionEndingWithWordList, jsonSerializerOptions); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES index 605b852fd02..8b5e6fe3c0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES @@ -85,6 +85,8 @@ docs/SimpleQuadrilateral.md docs/SpecialModelName.md docs/StoreApi.md docs/Tag.md +docs/TestCollectionEndingWithWordList.md +docs/TestCollectionEndingWithWordListObject.md docs/Triangle.md docs/TriangleInterface.md docs/User.md @@ -194,6 +196,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md index 12dad0efc22..759cb8d2847 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md @@ -250,6 +250,8 @@ Class | Method | HTTP request | Description - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - [Model.Tag](docs/Tag.md) + - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) + - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) - [Model.Triangle](docs/Triangle.md) - [Model.TriangleInterface](docs/TriangleInterface.md) - [Model.User](docs/User.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..0e5568637b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..7213b3ca8d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..4def0dcda9c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..e9df66daf2e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..accec5dd29e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,133 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + [DataContract(Name = "TestCollectionEndingWithWordList")] + public partial class TestCollectionEndingWithWordList : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value. + public TestCollectionEndingWithWordList(string value = default(string)) + { + this.Value = value; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets Value + /// + [DataMember(Name = "value", EmitDefaultValue = false)] + public string Value { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordList).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordList instances are equal + /// + /// Instance of TestCollectionEndingWithWordList to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordList input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Value != null) + { + hashCode = (hashCode * 59) + this.Value.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..9b4f0566691 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,133 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + [DataContract(Name = "TestCollectionEndingWithWordListObject")] + public partial class TestCollectionEndingWithWordListObject : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList. + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList = default(List)) + { + this.TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [DataMember(Name = "TestCollectionEndingWithWordList", EmitDefaultValue = false)] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordListObject).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordListObject instances are equal + /// + /// Instance of TestCollectionEndingWithWordListObject to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordListObject input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TestCollectionEndingWithWordList != null) + { + hashCode = (hashCode * 59) + this.TestCollectionEndingWithWordList.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES index 4520a7cbbe1..ca00a1d0b12 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES @@ -85,6 +85,8 @@ docs/SimpleQuadrilateral.md docs/SpecialModelName.md docs/StoreApi.md docs/Tag.md +docs/TestCollectionEndingWithWordList.md +docs/TestCollectionEndingWithWordListObject.md docs/Triangle.md docs/TriangleInterface.md docs/User.md @@ -197,6 +199,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md index 8c3ed02c372..9a4d19d4718 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md @@ -237,6 +237,8 @@ Class | Method | HTTP request | Description - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - [Model.Tag](docs/Tag.md) + - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) + - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) - [Model.Triangle](docs/Triangle.md) - [Model.TriangleInterface](docs/TriangleInterface.md) - [Model.User](docs/User.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..0e5568637b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..7213b3ca8d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..4def0dcda9c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..e9df66daf2e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..d205e86eacf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + [DataContract(Name = "TestCollectionEndingWithWordList")] + public partial class TestCollectionEndingWithWordList : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value. + public TestCollectionEndingWithWordList(string value = default(string)) + { + this.Value = value; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets Value + /// + [DataMember(Name = "value", EmitDefaultValue = false)] + public string Value { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordList).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordList instances are equal + /// + /// Instance of TestCollectionEndingWithWordList to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordList input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Value != null) + { + hashCode = (hashCode * 59) + this.Value.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..dc34d9582dc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + [DataContract(Name = "TestCollectionEndingWithWordListObject")] + public partial class TestCollectionEndingWithWordListObject : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList. + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList = default(List)) + { + this.TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [DataMember(Name = "TestCollectionEndingWithWordList", EmitDefaultValue = false)] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordListObject).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordListObject instances are equal + /// + /// Instance of TestCollectionEndingWithWordListObject to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordListObject input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TestCollectionEndingWithWordList != null) + { + hashCode = (hashCode * 59) + this.TestCollectionEndingWithWordList.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES index 4520a7cbbe1..ca00a1d0b12 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES @@ -85,6 +85,8 @@ docs/SimpleQuadrilateral.md docs/SpecialModelName.md docs/StoreApi.md docs/Tag.md +docs/TestCollectionEndingWithWordList.md +docs/TestCollectionEndingWithWordListObject.md docs/Triangle.md docs/TriangleInterface.md docs/User.md @@ -197,6 +199,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md index 8c3ed02c372..9a4d19d4718 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md @@ -237,6 +237,8 @@ Class | Method | HTTP request | Description - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - [Model.Tag](docs/Tag.md) + - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) + - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) - [Model.Triangle](docs/Triangle.md) - [Model.TriangleInterface](docs/TriangleInterface.md) - [Model.User](docs/User.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..0e5568637b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..7213b3ca8d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..4def0dcda9c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..e9df66daf2e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..d205e86eacf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + [DataContract(Name = "TestCollectionEndingWithWordList")] + public partial class TestCollectionEndingWithWordList : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value. + public TestCollectionEndingWithWordList(string value = default(string)) + { + this.Value = value; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets Value + /// + [DataMember(Name = "value", EmitDefaultValue = false)] + public string Value { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordList).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordList instances are equal + /// + /// Instance of TestCollectionEndingWithWordList to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordList input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Value != null) + { + hashCode = (hashCode * 59) + this.Value.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..dc34d9582dc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + [DataContract(Name = "TestCollectionEndingWithWordListObject")] + public partial class TestCollectionEndingWithWordListObject : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList. + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList = default(List)) + { + this.TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [DataMember(Name = "TestCollectionEndingWithWordList", EmitDefaultValue = false)] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordListObject).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordListObject instances are equal + /// + /// Instance of TestCollectionEndingWithWordListObject to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordListObject input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TestCollectionEndingWithWordList != null) + { + hashCode = (hashCode * 59) + this.TestCollectionEndingWithWordList.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES index 4520a7cbbe1..ca00a1d0b12 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES @@ -85,6 +85,8 @@ docs/SimpleQuadrilateral.md docs/SpecialModelName.md docs/StoreApi.md docs/Tag.md +docs/TestCollectionEndingWithWordList.md +docs/TestCollectionEndingWithWordListObject.md docs/Triangle.md docs/TriangleInterface.md docs/User.md @@ -197,6 +199,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md index 8c3ed02c372..9a4d19d4718 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md @@ -237,6 +237,8 @@ Class | Method | HTTP request | Description - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - [Model.Tag](docs/Tag.md) + - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) + - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) - [Model.Triangle](docs/Triangle.md) - [Model.TriangleInterface](docs/TriangleInterface.md) - [Model.User](docs/User.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..0e5568637b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..7213b3ca8d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..4def0dcda9c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..e9df66daf2e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..d205e86eacf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + [DataContract(Name = "TestCollectionEndingWithWordList")] + public partial class TestCollectionEndingWithWordList : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value. + public TestCollectionEndingWithWordList(string value = default(string)) + { + this.Value = value; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets Value + /// + [DataMember(Name = "value", EmitDefaultValue = false)] + public string Value { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordList).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordList instances are equal + /// + /// Instance of TestCollectionEndingWithWordList to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordList input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Value != null) + { + hashCode = (hashCode * 59) + this.Value.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..dc34d9582dc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + [DataContract(Name = "TestCollectionEndingWithWordListObject")] + public partial class TestCollectionEndingWithWordListObject : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList. + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList = default(List)) + { + this.TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [DataMember(Name = "TestCollectionEndingWithWordList", EmitDefaultValue = false)] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordListObject).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordListObject instances are equal + /// + /// Instance of TestCollectionEndingWithWordListObject to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordListObject input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TestCollectionEndingWithWordList != null) + { + hashCode = (hashCode * 59) + this.TestCollectionEndingWithWordList.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES index 1eca9a79f1b..fa47c7aafc2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES @@ -83,6 +83,8 @@ docs/SimpleQuadrilateral.md docs/SpecialModelName.md docs/StoreApi.md docs/Tag.md +docs/TestCollectionEndingWithWordList.md +docs/TestCollectionEndingWithWordListObject.md docs/Triangle.md docs/TriangleInterface.md docs/User.md @@ -193,6 +195,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md index c040309f5a2..7f0b8a19018 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md @@ -211,6 +211,8 @@ Class | Method | HTTP request | Description - [Model.SimpleQuadrilateral](SimpleQuadrilateral.md) - [Model.SpecialModelName](SpecialModelName.md) - [Model.Tag](Tag.md) + - [Model.TestCollectionEndingWithWordList](TestCollectionEndingWithWordList.md) + - [Model.TestCollectionEndingWithWordListObject](TestCollectionEndingWithWordListObject.md) - [Model.Triangle](Triangle.md) - [Model.TriangleInterface](TriangleInterface.md) - [Model.User](User.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..0e5568637b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..7213b3ca8d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..7fd26f4832a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,66 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Test] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Test] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..3eb23f92df8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,66 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Test] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + /// + /// Test the property 'Value' + /// + [Test] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..aa8b827e602 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,118 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + [DataContract(Name = "TestCollectionEndingWithWordList")] + public partial class TestCollectionEndingWithWordList : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// value. + public TestCollectionEndingWithWordList(string value = default(string)) + { + this.Value = value; + } + + /// + /// Gets or Sets Value + /// + [DataMember(Name = "value", EmitDefaultValue = false)] + public string Value { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as TestCollectionEndingWithWordList); + } + + /// + /// Returns true if TestCollectionEndingWithWordList instances are equal + /// + /// Instance of TestCollectionEndingWithWordList to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordList input) + { + if (input == null) + { + return false; + } + return + ( + this.Value == input.Value || + (this.Value != null && + this.Value.Equals(input.Value)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Value != null) + { + hashCode = (hashCode * 59) + this.Value.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..0a0740c31cc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,119 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + [DataContract(Name = "TestCollectionEndingWithWordListObject")] + public partial class TestCollectionEndingWithWordListObject : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList. + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList = default(List)) + { + this.TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [DataMember(Name = "TestCollectionEndingWithWordList", EmitDefaultValue = false)] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as TestCollectionEndingWithWordListObject); + } + + /// + /// Returns true if TestCollectionEndingWithWordListObject instances are equal + /// + /// Instance of TestCollectionEndingWithWordListObject to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordListObject input) + { + if (input == null) + { + return false; + } + return + ( + this.TestCollectionEndingWithWordList == input.TestCollectionEndingWithWordList || + this.TestCollectionEndingWithWordList != null && + input.TestCollectionEndingWithWordList != null && + this.TestCollectionEndingWithWordList.SequenceEqual(input.TestCollectionEndingWithWordList) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TestCollectionEndingWithWordList != null) + { + hashCode = (hashCode * 59) + this.TestCollectionEndingWithWordList.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES index 1002fd3c2f1..28e7c49aedb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES @@ -85,6 +85,8 @@ docs/SimpleQuadrilateral.md docs/SpecialModelName.md docs/StoreApi.md docs/Tag.md +docs/TestCollectionEndingWithWordList.md +docs/TestCollectionEndingWithWordListObject.md docs/Triangle.md docs/TriangleInterface.md docs/User.md @@ -196,6 +198,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md index 439e572e13f..56476d9a949 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md @@ -225,6 +225,8 @@ Class | Method | HTTP request | Description - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - [Model.Tag](docs/Tag.md) + - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) + - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) - [Model.Triangle](docs/Triangle.md) - [Model.TriangleInterface](docs/TriangleInterface.md) - [Model.User](docs/User.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..0e5568637b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..7213b3ca8d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..4def0dcda9c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..e9df66daf2e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..d205e86eacf --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + [DataContract(Name = "TestCollectionEndingWithWordList")] + public partial class TestCollectionEndingWithWordList : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value. + public TestCollectionEndingWithWordList(string value = default(string)) + { + this.Value = value; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets Value + /// + [DataMember(Name = "value", EmitDefaultValue = false)] + public string Value { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordList).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordList instances are equal + /// + /// Instance of TestCollectionEndingWithWordList to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordList input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Value != null) + { + hashCode = (hashCode * 59) + this.Value.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..dc34d9582dc --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,132 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + [DataContract(Name = "TestCollectionEndingWithWordListObject")] + public partial class TestCollectionEndingWithWordListObject : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList. + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList = default(List)) + { + this.TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [DataMember(Name = "TestCollectionEndingWithWordList", EmitDefaultValue = false)] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordListObject).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordListObject instances are equal + /// + /// Instance of TestCollectionEndingWithWordListObject to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordListObject input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TestCollectionEndingWithWordList != null) + { + hashCode = (hashCode * 59) + this.TestCollectionEndingWithWordList.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES index 1002fd3c2f1..28e7c49aedb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES @@ -85,6 +85,8 @@ docs/SimpleQuadrilateral.md docs/SpecialModelName.md docs/StoreApi.md docs/Tag.md +docs/TestCollectionEndingWithWordList.md +docs/TestCollectionEndingWithWordListObject.md docs/Triangle.md docs/TriangleInterface.md docs/User.md @@ -196,6 +198,8 @@ src/Org.OpenAPITools/Model/ShapeOrNull.cs src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs src/Org.OpenAPITools/Model/SpecialModelName.cs src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/Triangle.cs src/Org.OpenAPITools/Model/TriangleInterface.cs src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md index 8c3ed02c372..9a4d19d4718 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md @@ -237,6 +237,8 @@ Class | Method | HTTP request | Description - [Model.SimpleQuadrilateral](docs/SimpleQuadrilateral.md) - [Model.SpecialModelName](docs/SpecialModelName.md) - [Model.Tag](docs/Tag.md) + - [Model.TestCollectionEndingWithWordList](docs/TestCollectionEndingWithWordList.md) + - [Model.TestCollectionEndingWithWordListObject](docs/TestCollectionEndingWithWordListObject.md) - [Model.Triangle](docs/Triangle.md) - [Model.TriangleInterface](docs/TriangleInterface.md) - [Model.User](docs/User.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md new file mode 100644 index 00000000000..0e5568637b8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordList + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Value** | **string** | | [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/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md new file mode 100644 index 00000000000..7213b3ca8d9 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md @@ -0,0 +1,10 @@ +# Org.OpenAPITools.Model.TestCollectionEndingWithWordListObject + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**TestCollectionEndingWithWordList** | [**List<TestCollectionEndingWithWordList>**](TestCollectionEndingWithWordList.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/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs new file mode 100644 index 00000000000..4def0dcda9c --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordListObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordListObject + //private TestCollectionEndingWithWordListObject instance; + + public TestCollectionEndingWithWordListObjectTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordListObject + //instance = new TestCollectionEndingWithWordListObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordListObject + /// + [Fact] + public void TestCollectionEndingWithWordListObjectInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordListObject + //Assert.IsType(instance); + } + + + /// + /// Test the property 'TestCollectionEndingWithWordList' + /// + [Fact] + public void TestCollectionEndingWithWordListTest() + { + // TODO unit test for the property 'TestCollectionEndingWithWordList' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs new file mode 100644 index 00000000000..e9df66daf2e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs @@ -0,0 +1,69 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing TestCollectionEndingWithWordList + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TestCollectionEndingWithWordListTests : IDisposable + { + // TODO uncomment below to declare an instance variable for TestCollectionEndingWithWordList + //private TestCollectionEndingWithWordList instance; + + public TestCollectionEndingWithWordListTests() + { + // TODO uncomment below to create an instance of TestCollectionEndingWithWordList + //instance = new TestCollectionEndingWithWordList(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of TestCollectionEndingWithWordList + /// + [Fact] + public void TestCollectionEndingWithWordListInstanceTest() + { + // TODO uncomment below to test "IsType" TestCollectionEndingWithWordList + //Assert.IsType(instance); + } + + + /// + /// Test the property 'Value' + /// + [Fact] + public void ValueTest() + { + // TODO unit test for the property 'Value' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs new file mode 100644 index 00000000000..f0d809f2153 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -0,0 +1,120 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordList + /// + [DataContract(Name = "TestCollectionEndingWithWordList")] + public partial class TestCollectionEndingWithWordList : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// value. + public TestCollectionEndingWithWordList(string value = default(string)) + { + this.Value = value; + } + + /// + /// Gets or Sets Value + /// + [DataMember(Name = "value", EmitDefaultValue = false)] + public string Value { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordList {\n"); + sb.Append(" Value: ").Append(Value).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordList).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordList instances are equal + /// + /// Instance of TestCollectionEndingWithWordList to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordList input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Value != null) + { + hashCode = (hashCode * 59) + this.Value.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs new file mode 100644 index 00000000000..efc3cca8006 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -0,0 +1,120 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// TestCollectionEndingWithWordListObject + /// + [DataContract(Name = "TestCollectionEndingWithWordListObject")] + public partial class TestCollectionEndingWithWordListObject : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// testCollectionEndingWithWordList. + public TestCollectionEndingWithWordListObject(List testCollectionEndingWithWordList = default(List)) + { + this.TestCollectionEndingWithWordList = testCollectionEndingWithWordList; + } + + /// + /// Gets or Sets TestCollectionEndingWithWordList + /// + [DataMember(Name = "TestCollectionEndingWithWordList", EmitDefaultValue = false)] + public List TestCollectionEndingWithWordList { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class TestCollectionEndingWithWordListObject {\n"); + sb.Append(" TestCollectionEndingWithWordList: ").Append(TestCollectionEndingWithWordList).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as TestCollectionEndingWithWordListObject).AreEqual; + } + + /// + /// Returns true if TestCollectionEndingWithWordListObject instances are equal + /// + /// Instance of TestCollectionEndingWithWordListObject to be compared + /// Boolean + public bool Equals(TestCollectionEndingWithWordListObject input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.TestCollectionEndingWithWordList != null) + { + hashCode = (hashCode * 59) + this.TestCollectionEndingWithWordList.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} From 83ccfb820ca02e3c728582786ad479c7e7325e02 Mon Sep 17 00:00:00 2001 From: Dylan Kwon Date: Tue, 21 Mar 2023 20:45:35 +0900 Subject: [PATCH 069/131] Added useSettingsGradle property in kotlin-client. (#15003) * Added useSettingsGradle property in kotlin-client. * kotlin docs update. - add kotlinx_serialization in serializationLibrary. --- docs/generators/kotlin-server.md | 2 +- docs/generators/kotlin-spring.md | 2 +- docs/generators/kotlin-vertx.md | 2 +- docs/generators/kotlin.md | 3 ++- .../openapitools/codegen/languages/AbstractKotlinCodegen.java | 2 +- .../openapitools/codegen/languages/KotlinClientCodegen.java | 2 ++ .../src/main/resources/kotlin-client/build.gradle.mustache | 2 ++ 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/generators/kotlin-server.md b/docs/generators/kotlin-server.md index 1b25cca82d3..691f53c757a 100644 --- a/docs/generators/kotlin-server.md +++ b/docs/generators/kotlin-server.md @@ -38,7 +38,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |parcelizeModels|toggle "@Parcelize" for generated models| |null| |returnResponse|Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true. This option is currently supported only when using jaxrs-spec library.| |false| |serializableModel|boolean - toggle "implements Serializable" for generated models| |null| -|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson' or 'jackson'| |moshi| +|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson' or 'jackson or 'kotlinx_serialization'| |moshi| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null| |sourceFolder|source folder for generated code| |src/main/kotlin| diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index 8c4f3e6b340..0bf820d705d 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |parcelizeModels|toggle "@Parcelize" for generated models| |null| |reactive|use coroutines for reactive behavior| |false| |serializableModel|boolean - toggle "implements Serializable" for generated models| |null| -|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson' or 'jackson'| |moshi| +|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson' or 'jackson or 'kotlinx_serialization'| |moshi| |serverPort|configuration the port in which the sever is to run on| |8080| |serviceImplementation|generate stub service implementations that extends service interfaces. If this is set to true service interfaces will also be generated| |false| |serviceInterface|generate service interfaces to go alongside controllers. In most cases this option would be used to update an existing project, so not to override implementations. Useful to help facilitate the generation gap pattern| |false| diff --git a/docs/generators/kotlin-vertx.md b/docs/generators/kotlin-vertx.md index 4bd4958a90a..16adee9e440 100644 --- a/docs/generators/kotlin-vertx.md +++ b/docs/generators/kotlin-vertx.md @@ -28,7 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |packageName|Generated artifact package name.| |org.openapitools| |parcelizeModels|toggle "@Parcelize" for generated models| |null| |serializableModel|boolean - toggle "implements Serializable" for generated models| |null| -|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson' or 'jackson'| |moshi| +|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson' or 'jackson or 'kotlinx_serialization'| |moshi| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null| |sourceFolder|source folder for generated code| |src/main/kotlin| diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md index 4c6b25ad394..c9512a849da 100644 --- a/docs/generators/kotlin.md +++ b/docs/generators/kotlin.md @@ -37,7 +37,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |parcelizeModels|toggle "@Parcelize" for generated models| |null| |requestDateConverter|JVM-Option. Defines in how to handle date-time objects that are used for a request (as query or parameter)|
          **toJson**
          [DEFAULT] Date formatter option using a json converter.
          **toString**
          Use the 'toString'-method of the date-time object to retrieve the related string representation.
          |toJson| |serializableModel|boolean - toggle "implements Serializable" for generated models| |null| -|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson' or 'jackson'| |moshi| +|serializationLibrary|What serialization library to use: 'moshi' (default), or 'gson' or 'jackson or 'kotlinx_serialization'| |moshi| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null| |sourceFolder|source folder for generated code| |src/main/kotlin| @@ -46,6 +46,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useRxJava|Whether to use the RxJava adapter with the retrofit2 library. IMPORTANT: this option has been deprecated. Please use `useRxJava3` instead.| |false| |useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: this option has been deprecated. Please use `useRxJava3` instead.| |false| |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library.| |false| +|useSettingsGradle|Whether the project uses settings.gradle.| |false| ## IMPORT MAPPING diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 023a2b412fe..3a06a5b1127 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -44,7 +44,7 @@ import static org.openapitools.codegen.utils.StringUtils.*; public abstract class AbstractKotlinCodegen extends DefaultCodegen implements CodegenConfig { - public static final String SERIALIZATION_LIBRARY_DESC = "What serialization library to use: 'moshi' (default), or 'gson' or 'jackson'"; + public static final String SERIALIZATION_LIBRARY_DESC = "What serialization library to use: 'moshi' (default), or 'gson' or 'jackson or 'kotlinx_serialization'"; public enum SERIALIZATION_LIBRARY_TYPE {moshi, gson, jackson, kotlinx_serialization} diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index 994b4b052cc..447e1c1f889 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -74,6 +74,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { public static final String ROOM_MODEL_PACKAGE = "roomModelPackage"; public static final String OMIT_GRADLE_PLUGIN_VERSIONS = "omitGradlePluginVersions"; public static final String OMIT_GRADLE_WRAPPER = "omitGradleWrapper"; + public static final String USE_SETTINGS_GRADLE = "useSettingsGradle"; public static final String IDEA = "idea"; public static final String DATE_LIBRARY = "dateLibrary"; @@ -238,6 +239,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { cliOptions.add(CliOption.newBoolean(USE_COROUTINES, "Whether to use the Coroutines adapter with the retrofit2 library.")); cliOptions.add(CliOption.newBoolean(OMIT_GRADLE_PLUGIN_VERSIONS, "Whether to declare Gradle plugin versions in build files.")); cliOptions.add(CliOption.newBoolean(OMIT_GRADLE_WRAPPER, "Whether to omit Gradle wrapper for creating a sub project.")); + cliOptions.add(CliOption.newBoolean(USE_SETTINGS_GRADLE, "Whether the project uses settings.gradle.")); cliOptions.add(CliOption.newBoolean(IDEA, "Add IntellJ Idea plugin and mark Kotlin main and test folders as source folders.")); cliOptions.add(CliOption.newBoolean(MOSHI_CODE_GEN, "Whether to enable codegen with the Moshi library. Refer to the [official Moshi doc](https://github.com/square/moshi#codegen) for more info.")); diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache index 51eda6573dc..8b9cf94f26f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache @@ -54,10 +54,12 @@ apply plugin: 'kotlinx-serialization' apply plugin: 'idea' {{/idea}} apply plugin: 'maven-publish' +{{^useSettingsGradle}} repositories { maven { url "https://repo1.maven.org/maven2" } } +{{/useSettingsGradle}} test { useJUnitPlatform() From 88da3649b29fcbef97b0a16d17b93dcf675e5b56 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 21 Mar 2023 22:41:29 +0800 Subject: [PATCH 070/131] [csharp-netcore] Add option skip generating getter for sub-schemas (#15007) * add option skip generating getter for sub-schemas * fix openapi-yaml * update samples * update samples --- .../csharp-netcore-OpenAPIClient-net47.yaml | 1 + docs/generators/ada-server.md | 2 +- docs/generators/ada.md | 2 +- docs/generators/android.md | 2 +- docs/generators/apache2.md | 2 +- docs/generators/apex.md | 2 +- docs/generators/asciidoc.md | 2 +- docs/generators/avro-schema.md | 2 +- docs/generators/bash.md | 2 +- docs/generators/c.md | 2 +- docs/generators/clojure.md | 2 +- docs/generators/cpp-qt-client.md | 2 +- docs/generators/cpp-qt-qhttpengine-server.md | 2 +- docs/generators/cpp-tiny.md | 2 +- docs/generators/cpp-tizen.md | 2 +- docs/generators/cpp-ue4.md | 2 +- docs/generators/crystal.md | 2 +- docs/generators/csharp-netcore.md | 1 + docs/generators/cwiki.md | 2 +- docs/generators/dart-dio.md | 2 +- docs/generators/dart.md | 2 +- docs/generators/dynamic-html.md | 2 +- docs/generators/elixir.md | 2 +- docs/generators/fsharp-functions.md | 2 +- docs/generators/groovy.md | 2 +- docs/generators/haskell-http-client.md | 2 +- docs/generators/haskell-yesod.md | 2 +- docs/generators/haskell.md | 2 +- docs/generators/html.md | 2 +- docs/generators/html2.md | 2 +- docs/generators/java-camel.md | 2 +- docs/generators/java-helidon-client.md | 2 +- docs/generators/java-helidon-server.md | 2 +- docs/generators/java-inflector.md | 2 +- docs/generators/java-micronaut-client.md | 2 +- docs/generators/java-micronaut-server.md | 2 +- docs/generators/java-msf4j.md | 2 +- docs/generators/java-pkmst.md | 2 +- docs/generators/java-play-framework.md | 2 +- docs/generators/java-undertow-server.md | 2 +- docs/generators/java-vertx-web.md | 2 +- docs/generators/java-vertx.md | 2 +- docs/generators/java.md | 2 +- .../javascript-apollo-deprecated.md | 2 +- docs/generators/javascript-closure-angular.md | 2 +- docs/generators/javascript-flowtyped.md | 2 +- docs/generators/javascript.md | 2 +- docs/generators/jaxrs-cxf-cdi.md | 2 +- docs/generators/jaxrs-cxf-client.md | 2 +- docs/generators/jaxrs-cxf-extended.md | 2 +- docs/generators/jaxrs-cxf.md | 2 +- docs/generators/jaxrs-jersey.md | 2 +- docs/generators/jaxrs-resteasy-eap.md | 2 +- docs/generators/jaxrs-resteasy.md | 2 +- docs/generators/jaxrs-spec.md | 2 +- docs/generators/jetbrains-http-client.md | 2 +- docs/generators/jmeter.md | 2 +- docs/generators/k6.md | 2 +- docs/generators/markdown.md | 2 +- docs/generators/nim.md | 2 +- docs/generators/nodejs-express-server.md | 2 +- docs/generators/ocaml.md | 2 +- docs/generators/openapi-yaml.md | 2 +- docs/generators/openapi.md | 2 +- docs/generators/php-dt.md | 2 +- docs/generators/php-laravel.md | 2 +- docs/generators/php-lumen.md | 2 +- docs/generators/php-mezzio-ph.md | 2 +- docs/generators/php-slim-deprecated.md | 2 +- docs/generators/php-slim4.md | 2 +- docs/generators/php-symfony.md | 2 +- docs/generators/php.md | 2 +- docs/generators/plantuml.md | 2 +- docs/generators/python-aiohttp.md | 2 +- docs/generators/python-blueplanet.md | 2 +- docs/generators/python-fastapi.md | 2 +- docs/generators/python-flask.md | 2 +- docs/generators/ruby.md | 2 +- docs/generators/scala-akka-http-server.md | 2 +- docs/generators/scala-akka.md | 2 +- docs/generators/scala-gatling.md | 2 +- .../generators/scala-httpclient-deprecated.md | 2 +- docs/generators/scala-lagom-server.md | 2 +- docs/generators/scala-play-server.md | 2 +- docs/generators/scala-sttp.md | 2 +- docs/generators/scalatra.md | 2 +- docs/generators/scalaz.md | 2 +- docs/generators/spring.md | 2 +- docs/generators/swift5.md | 2 +- docs/generators/typescript-angular.md | 2 +- docs/generators/typescript-aurelia.md | 2 +- docs/generators/typescript-axios.md | 2 +- docs/generators/typescript-fetch.md | 2 +- docs/generators/typescript-inversify.md | 2 +- docs/generators/typescript-jquery.md | 2 +- docs/generators/typescript-nestjs.md | 2 +- docs/generators/typescript-node.md | 2 +- docs/generators/typescript-redux-query.md | 2 +- docs/generators/typescript-rxjs.md | 2 +- docs/generators/typescript.md | 2 +- docs/generators/wsdl-schema.md | 2 +- .../codegen/CodegenConstants.java | 9 +- .../languages/CSharpNetCoreClientCodegen.java | 25 +- .../csharp-netcore/modelOneOf.mustache | 2 + .../api/openapi.yaml | 99 + .../api/openapi.yaml | 2394 +++++++++++++++++ .../api/openapi.yaml | 2394 +++++++++++++++++ .../api/openapi.yaml | 2394 +++++++++++++++++ .../api/openapi.yaml | 76 + .../api/openapi.yaml | 41 + .../api/openapi.yaml | 40 + .../api/openapi.yaml | 2394 +++++++++++++++++ .../OpenAPIClient-httpclient/api/openapi.yaml | 2394 +++++++++++++++++ .../OpenAPIClient-net47/api/openapi.yaml | 2394 +++++++++++++++++ .../src/Org.OpenAPITools/Model/Fruit.cs | 20 - .../src/Org.OpenAPITools/Model/FruitReq.cs | 20 - .../src/Org.OpenAPITools/Model/Mammal.cs | 30 - .../Org.OpenAPITools/Model/NullableShape.cs | 20 - .../src/Org.OpenAPITools/Model/Pig.cs | 20 - .../Model/PolymorphicProperty.cs | 40 - .../Org.OpenAPITools/Model/Quadrilateral.cs | 20 - .../src/Org.OpenAPITools/Model/Shape.cs | 20 - .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 20 - .../src/Org.OpenAPITools/Model/Triangle.cs | 30 - .../OpenAPIClient-net48/api/openapi.yaml | 2394 +++++++++++++++++ .../OpenAPIClient-net5.0/api/openapi.yaml | 2394 +++++++++++++++++ .../api/openapi.yaml | 2394 +++++++++++++++++ .../OpenAPIClient/api/openapi.yaml | 2394 +++++++++++++++++ .../OpenAPIClientCore/api/openapi.yaml | 2394 +++++++++++++++++ .../api/openapi.yaml | 811 ++++++ 130 files changed, 27535 insertions(+), 342 deletions(-) diff --git a/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml b/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml index 35e90e8db71..9ca276977a9 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml +++ b/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml @@ -9,3 +9,4 @@ additionalProperties: disallowAdditionalPropertiesIfNotPresent: false useOneOfDiscriminatorLookup: true targetFramework: net47 + skipOneOfAnyOfGetter: true diff --git a/docs/generators/ada-server.md b/docs/generators/ada-server.md index 4a7ba7d2829..981232aca6d 100644 --- a/docs/generators/ada-server.md +++ b/docs/generators/ada-server.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |httpSupport|The name of the HTTP support library. Possible values include 'curl' or 'aws'.| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |openApiName|The name of the Ada package which provides support for OpenAPI for the generated client and server code. The default is 'Swagger'.| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |projectName|GNAT project name| |defaultProject| diff --git a/docs/generators/ada.md b/docs/generators/ada.md index fa9bb262489..a96c449a244 100644 --- a/docs/generators/ada.md +++ b/docs/generators/ada.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |httpSupport|The name of the HTTP support library. Possible values include 'curl' or 'aws'.| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |openApiName|The name of the Ada package which provides support for OpenAPI for the generated client and server code. The default is 'Swagger'.| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |projectName|GNAT project name| |defaultProject| diff --git a/docs/generators/android.md b/docs/generators/android.md index 2a5cfe46fe3..5b4bebc408e 100644 --- a/docs/generators/android.md +++ b/docs/generators/android.md @@ -30,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |groupId|groupId for use in the generated build.gradle and pom.xml| |null| |invokerPackage|root package for generated code| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template) to use|
          **volley**
          HTTP client: Volley 1.0.19 (default)
          **httpclient**
          HTTP client: Apache HttpClient 4.3.6. JSON processing: Gson 2.3.1. IMPORTANT: Android client using HttpClient is not actively maintained and will be deprecated in the next major release.
          |null| |modelPackage|package for generated models| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/apache2.md b/docs/generators/apache2.md index 40f0a5f3780..46c32f36611 100644 --- a/docs/generators/apache2.md +++ b/docs/generators/apache2.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/apex.md b/docs/generators/apex.md index b1f506ef03a..521e492c35b 100644 --- a/docs/generators/apex.md +++ b/docs/generators/apex.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |namedCredential|The named credential name for the HTTP callouts| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| diff --git a/docs/generators/asciidoc.md b/docs/generators/asciidoc.md index 6b33e759222..f70a727ca4f 100644 --- a/docs/generators/asciidoc.md +++ b/docs/generators/asciidoc.md @@ -31,7 +31,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |infoEmail|an email address to contact for inquiries about the application| |null| |infoUrl|a URL where users can get more information about the application| |null| |invokerPackage|root package for generated code| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseInfo|a short description of the license| |null| |licenseUrl|a URL pointing to the full license| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/avro-schema.md b/docs/generators/avro-schema.md index 4b6691d01e9..57ba424261c 100644 --- a/docs/generators/avro-schema.md +++ b/docs/generators/avro-schema.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |packageName|package for generated classes (where supported)| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| diff --git a/docs/generators/bash.md b/docs/generators/bash.md index 50bffabc718..c48b6707f83 100644 --- a/docs/generators/bash.md +++ b/docs/generators/bash.md @@ -28,7 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateBashCompletion|Whether to generate the Bash completion script| |false| |generateZshCompletion|Whether to generate the Zsh completion script| |false| |hostEnvironmentVariable|Name of environment variable where host can be defined (e.g. PETSTORE_HOST='http://api.openapitools.org:8080')| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |processMarkdown|Convert all Markdown Markup into terminal formatting| |false| |scriptName|The name of the script that will be generated (e.g. petstore-cli)| |null| diff --git a/docs/generators/c.md b/docs/generators/c.md index fa2154d22eb..693f0962774 100644 --- a/docs/generators/c.md +++ b/docs/generators/c.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/clojure.md b/docs/generators/clojure.md index 88f2778755d..98b41478673 100644 --- a/docs/generators/clojure.md +++ b/docs/generators/clojure.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |projectDescription|description of the project (Default: using info.description or "Client library of <projectName>")| |null| |projectLicenseName|name of the license the project uses (Default: using info.license.name or not included in project.clj)| |null| diff --git a/docs/generators/cpp-qt-client.md b/docs/generators/cpp-qt-client.md index 09d65c8ea42..273f3e60bbc 100644 --- a/docs/generators/cpp-qt-client.md +++ b/docs/generators/cpp-qt-client.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelNamePrefix|Prefix that will be prepended to all model names.| |OAI| |optionalProjectFile|Generate client.pri.| |true| |packageName|C++ package (library) name.| |QtOpenAPIClient| diff --git a/docs/generators/cpp-qt-qhttpengine-server.md b/docs/generators/cpp-qt-qhttpengine-server.md index 419bf965dfa..5dee3e0a024 100644 --- a/docs/generators/cpp-qt-qhttpengine-server.md +++ b/docs/generators/cpp-qt-qhttpengine-server.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelNamePrefix|Prefix that will be prepended to all model names.| |OAI| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |reservedWordPrefix|Prefix to prepend to reserved words in order to avoid conflicts| |r_| diff --git a/docs/generators/cpp-tiny.md b/docs/generators/cpp-tiny.md index e292cffecc9..35381b175e8 100644 --- a/docs/generators/cpp-tiny.md +++ b/docs/generators/cpp-tiny.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |reservedWordPrefix|Prefix to prepend to reserved words in order to avoid conflicts| |r_| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| diff --git a/docs/generators/cpp-tizen.md b/docs/generators/cpp-tizen.md index 1759a8e0693..a61e10f3bd5 100644 --- a/docs/generators/cpp-tizen.md +++ b/docs/generators/cpp-tizen.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |reservedWordPrefix|Prefix to prepend to reserved words in order to avoid conflicts| |r_| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| diff --git a/docs/generators/cpp-ue4.md b/docs/generators/cpp-ue4.md index d80c179ff81..430558ba9e2 100644 --- a/docs/generators/cpp-ue4.md +++ b/docs/generators/cpp-ue4.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |optionalProjectFile|Generate Build.cs| |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |reservedWordPrefix|Prefix to prepend to reserved words in order to avoid conflicts| |r_| diff --git a/docs/generators/crystal.md b/docs/generators/crystal.md index 1f3bc4a655f..9040a07f211 100644 --- a/docs/generators/crystal.md +++ b/docs/generators/crystal.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |moduleName|module name (e.g. TwitterClient| |OpenAPIClient| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |shardAuthor|shard author (only one is supported).| |null| diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md index cd7bd66b849..9a00c412d14 100644 --- a/docs/generators/csharp-netcore.md +++ b/docs/generators/csharp-netcore.md @@ -43,6 +43,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |packageVersion|C# package version.| |1.0.0| |releaseNote|Release note, default to 'Minor update'.| |Minor update| |returnICollection|Return ICollection<T> instead of the concrete type.| |false| +|skipOneOfAnyOfGetter|Skip the generation of getter for sub-schemas in oneOf/anyOf models.| |false| |sourceFolder|source folder for generated code| |src| |targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.1`|
          **netstandard1.3**
          .NET Standard 1.3 compatible
          **netstandard1.4**
          .NET Standard 1.4 compatible
          **netstandard1.5**
          .NET Standard 1.5 compatible
          **netstandard1.6**
          .NET Standard 1.6 compatible
          **netstandard2.0**
          .NET Standard 2.0 compatible
          **netstandard2.1**
          .NET Standard 2.1 compatible
          **netcoreapp3.1**
          .NET Core 3.1 compatible (End of Support 13 Dec 2022)
          **net47**
          .NET Framework 4.7 compatible
          **net48**
          .NET Framework 4.8 compatible
          **net6.0**
          .NET 6.0 compatible
          **net7.0**
          .NET 7.0 compatible
          |netstandard2.0| |useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false| diff --git a/docs/generators/cwiki.md b/docs/generators/cwiki.md index c7be7280e65..01f6ef8d55d 100644 --- a/docs/generators/cwiki.md +++ b/docs/generators/cwiki.md @@ -29,7 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |infoEmail|an email address to contact for inquiries about the application| |null| |infoUrl|a URL where users can get more information about the application| |null| |invokerPackage|root package for generated code| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseInfo|a short description of the license| |null| |licenseUrl|a URL pointing to the full license| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/dart-dio.md b/docs/generators/dart-dio.md index 486f4d5b782..4dca343c035 100644 --- a/docs/generators/dart-dio.md +++ b/docs/generators/dart-dio.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |finalProperties|Whether properties are marked as final when using Json Serializable for serialization| |true| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |pubAuthor|Author name in generated pubspec| |Author| |pubAuthorEmail|Email address of the author in generated pubspec| |author@homepage| diff --git a/docs/generators/dart.md b/docs/generators/dart.md index cbc19071638..0d9bf111580 100644 --- a/docs/generators/dart.md +++ b/docs/generators/dart.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |pubAuthor|Author name in generated pubspec| |Author| |pubAuthorEmail|Email address of the author in generated pubspec| |author@homepage| diff --git a/docs/generators/dynamic-html.md b/docs/generators/dynamic-html.md index cdb4ef80cd7..d8f466eb329 100644 --- a/docs/generators/dynamic-html.md +++ b/docs/generators/dynamic-html.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |groupId|groupId in generated pom.xml| |null| |invokerPackage|root package for generated code| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/elixir.md b/docs/generators/elixir.md index e6aae929e43..14209200122 100644 --- a/docs/generators/elixir.md +++ b/docs/generators/elixir.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |invokerPackage|The main namespace to use for all classes. e.g. Yay.Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseHeader|The license header to prepend to the top of all source files.| |null| |packageName|Elixir package name (convention: lowercase).| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/fsharp-functions.md b/docs/generators/fsharp-functions.md index b2961189bed..9f462fcad80 100644 --- a/docs/generators/fsharp-functions.md +++ b/docs/generators/fsharp-functions.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |NoLicense| |licenseUrl|The URL of the license| |http://localhost| |packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI| diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md index 6fb7665f64d..96d30afd73c 100644 --- a/docs/generators/groovy.md +++ b/docs/generators/groovy.md @@ -46,7 +46,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.model| diff --git a/docs/generators/haskell-http-client.md b/docs/generators/haskell-http-client.md index 08e1738d3d6..8cd97834f6f 100644 --- a/docs/generators/haskell-http-client.md +++ b/docs/generators/haskell-http-client.md @@ -39,7 +39,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateModelConstructors|Generate smart constructors (only supply required fields) for models| |true| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| |inlineMimeTypes|Inline (hardcode) the content-type and accept parameters on operations, when there is only 1 option| |true| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelDeriving|Additional classes to include in the deriving() clause of Models| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |queryExtraUnreserved|Configures additional querystring characters which must not be URI encoded, e.g. '+' or ':'| |null| diff --git a/docs/generators/haskell-yesod.md b/docs/generators/haskell-yesod.md index 89540052792..d84dda4cee8 100644 --- a/docs/generators/haskell-yesod.md +++ b/docs/generators/haskell-yesod.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |projectName|name of the project (Default: generated from info.title or "openapi-haskell-yesod-server")| |null| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| diff --git a/docs/generators/haskell.md b/docs/generators/haskell.md index 59cef6a6bde..a7bc269ed0d 100644 --- a/docs/generators/haskell.md +++ b/docs/generators/haskell.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |serveStatic|serve will serve files from the directory 'static'.| |true| diff --git a/docs/generators/html.md b/docs/generators/html.md index ee3d6caa564..c30e0ece496 100644 --- a/docs/generators/html.md +++ b/docs/generators/html.md @@ -29,7 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |infoEmail|an email address to contact for inquiries about the application| |null| |infoUrl|a URL where users can get more information about the application| |null| |invokerPackage|root package for generated code| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseInfo|a short description of the license| |null| |licenseUrl|a URL pointing to the full license| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/html2.md b/docs/generators/html2.md index d83c97311d5..3ff67ecd853 100644 --- a/docs/generators/html2.md +++ b/docs/generators/html2.md @@ -29,7 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |infoEmail|an email address to contact for inquiries about the application| |null| |infoUrl|a URL where users can get more information about the application| |null| |invokerPackage|root package for generated code| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseInfo|a short description of the license| |null| |licenseUrl|a URL pointing to the full license| |null| |packageName|C# package name| |null| diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index 73a542695ea..e53dd2a92ce 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -65,7 +65,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template)|
          **spring-boot**
          Spring-boot Server application.
          **spring-cloud**
          Spring-Cloud-Feign client with Spring-Boot auto-configured settings.
          **spring-http-interface**
          Spring 6 HTTP interfaces (testing)
          |spring-boot| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/java-helidon-client.md b/docs/generators/java-helidon-client.md index 485eb65eac1..d5a6aeaf3ac 100644 --- a/docs/generators/java-helidon-client.md +++ b/docs/generators/java-helidon-client.md @@ -46,7 +46,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.client| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template) to use|
          **mp**
          Helidon MP Client
          **se**
          Helidon SE Client
          |mp| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/java-helidon-server.md b/docs/generators/java-helidon-server.md index 276a7ebc863..793fe5ba68f 100644 --- a/docs/generators/java-helidon-server.md +++ b/docs/generators/java-helidon-server.md @@ -46,7 +46,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.server| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template) to use|
          **mp**
          Helidon MP Server
          **se**
          Helidon SE Server
          **nima**
          Helidon NIMA Server
          **nima-annotations**
          Helidon NIMA Annotations Server
          |se| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md index d1d6d4ae89f..2cd610b6ead 100644 --- a/docs/generators/java-inflector.md +++ b/docs/generators/java-inflector.md @@ -48,7 +48,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.controllers| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.model| diff --git a/docs/generators/java-micronaut-client.md b/docs/generators/java-micronaut-client.md index 2d5e5585050..4b3b98490f6 100644 --- a/docs/generators/java-micronaut-client.md +++ b/docs/generators/java-micronaut-client.md @@ -56,7 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |micronautVersion|Micronaut version, only >=3.0.0 versions are supported| |3.4.3| diff --git a/docs/generators/java-micronaut-server.md b/docs/generators/java-micronaut-server.md index 5aecff1e6a0..043552d6a98 100644 --- a/docs/generators/java-micronaut-server.md +++ b/docs/generators/java-micronaut-server.md @@ -57,7 +57,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |micronautVersion|Micronaut version, only >=3.0.0 versions are supported| |3.4.3| diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md index 7d4532cab34..307fb0dbecf 100644 --- a/docs/generators/java-msf4j.md +++ b/docs/generators/java-msf4j.md @@ -49,7 +49,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template)|
          **jersey1**
          Jersey core 1.x
          **jersey2**
          Jersey core 2.x
          |jersey2| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md index 0a5ee14c224..9a598a78627 100644 --- a/docs/generators/java-pkmst.md +++ b/docs/generators/java-pkmst.md @@ -50,7 +50,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |com.prokarma.pkmst.controller| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |com.prokarma.pkmst.model| diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md index e41abb5b575..8bd602c41cf 100644 --- a/docs/generators/java-play-framework.md +++ b/docs/generators/java-play-framework.md @@ -52,7 +52,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |apimodels| diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md index a4a74abd19a..678b683ec81 100644 --- a/docs/generators/java-undertow-server.md +++ b/docs/generators/java-undertow-server.md @@ -48,7 +48,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.handler| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |null| diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md index 93f60ef39ca..99aac21f25b 100644 --- a/docs/generators/java-vertx-web.md +++ b/docs/generators/java-vertx-web.md @@ -48,7 +48,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.vertxweb.server| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.vertxweb.server.model| diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md index 063da873d5b..4961536ce7b 100644 --- a/docs/generators/java-vertx.md +++ b/docs/generators/java-vertx.md @@ -48,7 +48,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.server.api.model| diff --git a/docs/generators/java.md b/docs/generators/java.md index 55bc644c86b..4579c86a538 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -56,7 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.client| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template) to use|
          **jersey1**
          HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey3' or other HTTP libraries instead.
          **jersey2**
          HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x
          **jersey3**
          HTTP client: Jersey client 3.x. JSON processing: Jackson 2.x
          **feign**
          HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x. or Gson 2.x
          **okhttp-gson**
          [DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.
          **retrofit2**
          HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)
          **resttemplate**
          HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x
          **webclient**
          HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x
          **resteasy**
          HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x
          **vertx**
          HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x
          **google-api-client**
          HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x
          **rest-assured**
          HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8
          **native**
          HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+
          **microprofile**
          HTTP client: Microprofile client 1.x. JSON processing: JSON-B or Jackson 2.9.x
          **apache-httpclient**
          HTTP client: Apache httpclient 5.x
          |okhttp-gson| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/javascript-apollo-deprecated.md b/docs/generators/javascript-apollo-deprecated.md index ffc30f726ab..26948b3b3fa 100644 --- a/docs/generators/javascript-apollo-deprecated.md +++ b/docs/generators/javascript-apollo-deprecated.md @@ -27,7 +27,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| |invokerPackage|root package for generated code| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|name of the license the project uses (Default: using info.license.name)| |null| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| diff --git a/docs/generators/javascript-closure-angular.md b/docs/generators/javascript-closure-angular.md index f85f22cb96d..baf0382872d 100644 --- a/docs/generators/javascript-closure-angular.md +++ b/docs/generators/javascript-closure-angular.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/javascript-flowtyped.md b/docs/generators/javascript-flowtyped.md index 5dc6a58c6d9..d4dfde07653 100644 --- a/docs/generators/javascript-flowtyped.md +++ b/docs/generators/javascript-flowtyped.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| diff --git a/docs/generators/javascript.md b/docs/generators/javascript.md index b9259f14ab6..3e04e8ee7b7 100644 --- a/docs/generators/javascript.md +++ b/docs/generators/javascript.md @@ -27,7 +27,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| |invokerPackage|root package for generated code| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template)|
          **javascript**
          JavaScript client library
          **apollo**
          Apollo REST DataSource
          |javascript| |licenseName|name of the license the project uses (Default: using info.license.name)| |null| |modelPackage|package for generated models| |null| diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md index aac09068b9b..422852f3ad5 100644 --- a/docs/generators/jaxrs-cxf-cdi.md +++ b/docs/generators/jaxrs-cxf-cdi.md @@ -52,7 +52,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template)|
          **<default>**
          JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)
          **quarkus**
          Server using Quarkus
          **thorntail**
          Server using Thorntail
          **openliberty**
          Server using Open Liberty
          **helidon**
          Server using Helidon
          **kumuluzee**
          Server using KumuluzEE
          |<default>| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md index a9f89032ebe..92d8a8adccb 100644 --- a/docs/generators/jaxrs-cxf-client.md +++ b/docs/generators/jaxrs-cxf-client.md @@ -48,7 +48,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.model| diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md index dc00f40d577..823e01e26f3 100644 --- a/docs/generators/jaxrs-cxf-extended.md +++ b/docs/generators/jaxrs-cxf-extended.md @@ -55,7 +55,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |loadTestDataFromFile|Load test data from a generated JSON file| |false| diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md index f1b0b294f79..4ea4dc3e41e 100644 --- a/docs/generators/jaxrs-cxf.md +++ b/docs/generators/jaxrs-cxf.md @@ -54,7 +54,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.model| diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md index be59dac624b..0c9717146af 100644 --- a/docs/generators/jaxrs-jersey.md +++ b/docs/generators/jaxrs-jersey.md @@ -49,7 +49,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template)|
          **jersey1**
          Jersey core 1.x
          **jersey2**
          Jersey core 2.x
          |jersey2| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md index 0f5e5eed3d0..531aa13e351 100644 --- a/docs/generators/jaxrs-resteasy-eap.md +++ b/docs/generators/jaxrs-resteasy-eap.md @@ -50,7 +50,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.model| diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md index ce4320fc60d..6bf76fbd837 100644 --- a/docs/generators/jaxrs-resteasy.md +++ b/docs/generators/jaxrs-resteasy.md @@ -50,7 +50,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false| |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.model| diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md index 076c45813a1..314b14c158c 100644 --- a/docs/generators/jaxrs-spec.md +++ b/docs/generators/jaxrs-spec.md @@ -52,7 +52,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template)|
          **<default>**
          JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)
          **quarkus**
          Server using Quarkus
          **thorntail**
          Server using Thorntail
          **openliberty**
          Server using Open Liberty
          **helidon**
          Server using Helidon
          **kumuluzee**
          Server using KumuluzEE
          |<default>| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/jetbrains-http-client.md b/docs/generators/jetbrains-http-client.md index 44da9dc6631..829686878d1 100644 --- a/docs/generators/jetbrains-http-client.md +++ b/docs/generators/jetbrains-http-client.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/jmeter.md b/docs/generators/jmeter.md index 90ee80172ab..2c7bc25a908 100644 --- a/docs/generators/jmeter.md +++ b/docs/generators/jmeter.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/k6.md b/docs/generators/k6.md index f9de52fa699..e8574baee66 100644 --- a/docs/generators/k6.md +++ b/docs/generators/k6.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/markdown.md b/docs/generators/markdown.md index 75f0538b6bf..e3dbfbaff41 100644 --- a/docs/generators/markdown.md +++ b/docs/generators/markdown.md @@ -21,7 +21,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/nim.md b/docs/generators/nim.md index 5612b294c21..1bff3d78f21 100644 --- a/docs/generators/nim.md +++ b/docs/generators/nim.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/nodejs-express-server.md b/docs/generators/nodejs-express-server.md index 18df0f28853..3cba8860f38 100644 --- a/docs/generators/nodejs-express-server.md +++ b/docs/generators/nodejs-express-server.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |serverPort|TCP port to listen on.| |null| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| diff --git a/docs/generators/ocaml.md b/docs/generators/ocaml.md index 196059ffba1..25ebea30c1c 100644 --- a/docs/generators/ocaml.md +++ b/docs/generators/ocaml.md @@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/openapi-yaml.md b/docs/generators/openapi-yaml.md index bb9d06115fc..dd4a50965d3 100644 --- a/docs/generators/openapi-yaml.md +++ b/docs/generators/openapi-yaml.md @@ -21,7 +21,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |outputFile|Output filename| |openapi/openapi.yaml| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| diff --git a/docs/generators/openapi.md b/docs/generators/openapi.md index ed0420aa2bb..bee7b600ae1 100644 --- a/docs/generators/openapi.md +++ b/docs/generators/openapi.md @@ -21,7 +21,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |outputFileName|Output file name| |openapi.json| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| diff --git a/docs/generators/php-dt.md b/docs/generators/php-dt.md index 7f9d0789bd5..2388f5caabf 100644 --- a/docs/generators/php-dt.md +++ b/docs/generators/php-dt.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modern|use modern language features (generated code will require PHP 8.0)| |false| |packageName|The main package name for classes. e.g. GeneratedPetstore| |null| diff --git a/docs/generators/php-laravel.md b/docs/generators/php-laravel.md index 9c606506d75..b50da3ce223 100644 --- a/docs/generators/php-laravel.md +++ b/docs/generators/php-laravel.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |packageName|The main package name for classes. e.g. GeneratedPetstore| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/php-lumen.md b/docs/generators/php-lumen.md index 28ac527eef4..71879cd494c 100644 --- a/docs/generators/php-lumen.md +++ b/docs/generators/php-lumen.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |packageName|The main package name for classes. e.g. GeneratedPetstore| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/php-mezzio-ph.md b/docs/generators/php-mezzio-ph.md index 01cb9eb6ccd..e119ff6148f 100644 --- a/docs/generators/php-mezzio-ph.md +++ b/docs/generators/php-mezzio-ph.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modern|use modern language features (generated code will require PHP 8.0)| |false| |packageName|The main package name for classes. e.g. GeneratedPetstore| |null| diff --git a/docs/generators/php-slim-deprecated.md b/docs/generators/php-slim-deprecated.md index f5844cd7096..1f30fd54381 100644 --- a/docs/generators/php-slim-deprecated.md +++ b/docs/generators/php-slim-deprecated.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |packageName|The main package name for classes. e.g. GeneratedPetstore| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/php-slim4.md b/docs/generators/php-slim4.md index fd30427de47..0b0b47c39cb 100644 --- a/docs/generators/php-slim4.md +++ b/docs/generators/php-slim4.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |packageName|The main package name for classes. e.g. GeneratedPetstore| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/php-symfony.md b/docs/generators/php-symfony.md index f818259b0e8..6112f3ae3c2 100644 --- a/docs/generators/php-symfony.md +++ b/docs/generators/php-symfony.md @@ -30,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |packageName|The main package name for classes. e.g. GeneratedPetstore| |null| |phpLegacySupport|Should the generated code be compatible with PHP 5.x?| |true| diff --git a/docs/generators/php.md b/docs/generators/php.md index 298d059c381..15d5513c024 100644 --- a/docs/generators/php.md +++ b/docs/generators/php.md @@ -26,7 +26,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |hideGenerationTimestamp|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |true| |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |packageName|The main package name for classes. e.g. GeneratedPetstore| |null| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/plantuml.md b/docs/generators/plantuml.md index 847f0d65463..b1af2d30537 100644 --- a/docs/generators/plantuml.md +++ b/docs/generators/plantuml.md @@ -21,7 +21,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| diff --git a/docs/generators/python-aiohttp.md b/docs/generators/python-aiohttp.md index 2f6f7e4e510..f3c3874a7b0 100644 --- a/docs/generators/python-aiohttp.md +++ b/docs/generators/python-aiohttp.md @@ -26,7 +26,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |featureCORS|use flask-cors for handling CORS requests| |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |packageName|python package name (convention: snake_case).| |openapi_server| |packageVersion|python package version.| |1.0.0| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/python-blueplanet.md b/docs/generators/python-blueplanet.md index ce4b7ae98dd..71fc3cf2e96 100644 --- a/docs/generators/python-blueplanet.md +++ b/docs/generators/python-blueplanet.md @@ -26,7 +26,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |featureCORS|use flask-cors for handling CORS requests| |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |packageName|python package name (convention: snake_case).| |openapi_server| |packageVersion|python package version.| |1.0.0| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/python-fastapi.md b/docs/generators/python-fastapi.md index ecb7fe8f237..20cd0ab9e82 100644 --- a/docs/generators/python-fastapi.md +++ b/docs/generators/python-fastapi.md @@ -23,7 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |packageName|python package name (convention: snake_case).| |openapi_server| |packageVersion|python package version.| |1.0.0| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/python-flask.md b/docs/generators/python-flask.md index 5624ecb8a04..d7f3df3f22f 100644 --- a/docs/generators/python-flask.md +++ b/docs/generators/python-flask.md @@ -26,7 +26,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |featureCORS|use flask-cors for handling CORS requests| |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |packageName|python package name (convention: snake_case).| |openapi_server| |packageVersion|python package version.| |1.0.0| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/ruby.md b/docs/generators/ruby.md index 2200cadf241..918c8811374 100644 --- a/docs/generators/ruby.md +++ b/docs/generators/ruby.md @@ -32,7 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |gemSummary|gem summary. | |A ruby wrapper for the REST APIs| |gemVersion|gem version.| |1.0.0| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|HTTP library template (sub-template) to use|
          **faraday**
          Faraday >= 1.0.1 (https://github.com/lostisland/faraday)
          **typhoeus**
          Typhoeus >= 1.0.1 (https://github.com/typhoeus/typhoeus)
          |typhoeus| |moduleName|top module name (convention: CamelCase, usually corresponding to gem name).| |OpenAPIClient| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/scala-akka-http-server.md b/docs/generators/scala-akka-http-server.md index 322c4ed1e2f..95677bd7270 100644 --- a/docs/generators/scala-akka-http-server.md +++ b/docs/generators/scala-akka-http-server.md @@ -30,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |groupId|groupId in generated pom.xml| |org.openapitools| |invokerPackage|root package for generated code| |org.openapitools.server| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/scala-akka.md b/docs/generators/scala-akka.md index e840955e1d5..dd560c4c508 100644 --- a/docs/generators/scala-akka.md +++ b/docs/generators/scala-akka.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| diff --git a/docs/generators/scala-gatling.md b/docs/generators/scala-gatling.md index 54c7969f011..b5577af03c0 100644 --- a/docs/generators/scala-gatling.md +++ b/docs/generators/scala-gatling.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/scala-httpclient-deprecated.md b/docs/generators/scala-httpclient-deprecated.md index 5d9e403e85e..4767f3deb91 100644 --- a/docs/generators/scala-httpclient-deprecated.md +++ b/docs/generators/scala-httpclient-deprecated.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/scala-lagom-server.md b/docs/generators/scala-lagom-server.md index c2ab2adcf16..5a994270421 100644 --- a/docs/generators/scala-lagom-server.md +++ b/docs/generators/scala-lagom-server.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/scala-play-server.md b/docs/generators/scala-play-server.md index e0f60f0531c..d769de40550 100644 --- a/docs/generators/scala-play-server.md +++ b/docs/generators/scala-play-server.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |generateCustomExceptions|If set, generates custom exception types.| |true| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/scala-sttp.md b/docs/generators/scala-sttp.md index c56f756df9e..0d4040f356b 100644 --- a/docs/generators/scala-sttp.md +++ b/docs/generators/scala-sttp.md @@ -27,7 +27,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |jodaTimeVersion|The version of joda-time library| |2.10.13| |json4sVersion|The version of json4s library| |3.6.11| |jsonLibrary|Json library to use. Possible values are: json4s and circe.| |json4s| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| diff --git a/docs/generators/scalatra.md b/docs/generators/scalatra.md index 25d057cf1c6..a859d74ed3f 100644 --- a/docs/generators/scalatra.md +++ b/docs/generators/scalatra.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/scalaz.md b/docs/generators/scalaz.md index a986e4bb8f6..e84b0971bab 100644 --- a/docs/generators/scalaz.md +++ b/docs/generators/scalaz.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index 39080e801ca..67fe63275f1 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -58,7 +58,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null| |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false| |invokerPackage|root package for generated code| |org.openapitools.api| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |library|library template (sub-template)|
          **spring-boot**
          Spring-boot Server application.
          **spring-cloud**
          Spring-Cloud-Feign client with Spring-Boot auto-configured settings.
          **spring-http-interface**
          Spring 6 HTTP interfaces (testing)
          |spring-boot| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md index 474ff6b0629..7a87a498db4 100644 --- a/docs/generators/swift5.md +++ b/docs/generators/swift5.md @@ -26,7 +26,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateModelAdditionalProperties|Generate model additional properties (default: true)| |true| |hashableModels|Make hashable models (default: true)| |true| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |lenientTypeCast|Accept and cast values for simple types (string->bool, string->int, int->string)| |false| |library|Library template (sub-template) to use|
          **urlsession**
          [DEFAULT] HTTP client: URLSession
          **alamofire**
          HTTP client: Alamofire
          **vapor**
          HTTP client: Vapor
          |urlsession| |mapFileBinaryToData|[WARNING] This option will be removed and enabled by default in the future once we've enhanced the code to work with `Data` in all the different situations. Map File and Binary to Data (default: false)| |false| diff --git a/docs/generators/typescript-angular.md b/docs/generators/typescript-angular.md index be23681e750..b2846a50170 100644 --- a/docs/generators/typescript-angular.md +++ b/docs/generators/typescript-angular.md @@ -27,7 +27,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |fileNaming|Naming convention for the output files: 'camelCase', 'kebab-case'.| |camelCase| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelFileSuffix|The suffix of the file of the generated model (model<suffix>.ts).| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original| |modelSuffix|The suffix of the generated model.| |null| diff --git a/docs/generators/typescript-aurelia.md b/docs/generators/typescript-aurelia.md index 8d93a174bcc..9ccc318558d 100644 --- a/docs/generators/typescript-aurelia.md +++ b/docs/generators/typescript-aurelia.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmVersion|The version of your npm package. If not provided, using the version from the OpenAPI specification file.| |1.0.0| diff --git a/docs/generators/typescript-axios.md b/docs/generators/typescript-axios.md index 156dab7cd72..1220a97c104 100644 --- a/docs/generators/typescript-axios.md +++ b/docs/generators/typescript-axios.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPackage|package for generated models| |null| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url of your private npmRepo in the package.json| |null| diff --git a/docs/generators/typescript-fetch.md b/docs/generators/typescript-fetch.md index 4901df93ed8..8edbba72705 100644 --- a/docs/generators/typescript-fetch.md +++ b/docs/generators/typescript-fetch.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| diff --git a/docs/generators/typescript-inversify.md b/docs/generators/typescript-inversify.md index bf1c2f146df..51194066ea0 100644 --- a/docs/generators/typescript-inversify.md +++ b/docs/generators/typescript-inversify.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| diff --git a/docs/generators/typescript-jquery.md b/docs/generators/typescript-jquery.md index 3e0310ccfbe..2db1621c6a5 100644 --- a/docs/generators/typescript-jquery.md +++ b/docs/generators/typescript-jquery.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |jqueryAlreadyImported|When using this in legacy app using mix of typescript and javascript, this will only declare jquery and not import it| |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| diff --git a/docs/generators/typescript-nestjs.md b/docs/generators/typescript-nestjs.md index 38720fb9411..b681019d04f 100644 --- a/docs/generators/typescript-nestjs.md +++ b/docs/generators/typescript-nestjs.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |fileNaming|Naming convention for the output files: 'camelCase', 'kebab-case'.| |camelCase| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelFileSuffix|The suffix of the file of the generated model (model<suffix>.ts).| |null| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original| |modelSuffix|The suffix of the generated model.| |null| diff --git a/docs/generators/typescript-node.md b/docs/generators/typescript-node.md index 28945f81c48..b043554815a 100644 --- a/docs/generators/typescript-node.md +++ b/docs/generators/typescript-node.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| diff --git a/docs/generators/typescript-redux-query.md b/docs/generators/typescript-redux-query.md index 67a6fffcb53..1d589468b6a 100644 --- a/docs/generators/typescript-redux-query.md +++ b/docs/generators/typescript-redux-query.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| diff --git a/docs/generators/typescript-rxjs.md b/docs/generators/typescript-rxjs.md index 24d906d8f23..0b1abc33ea8 100644 --- a/docs/generators/typescript-rxjs.md +++ b/docs/generators/typescript-rxjs.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| diff --git a/docs/generators/typescript.md b/docs/generators/typescript.md index b0dead39be5..58e50f191f2 100644 --- a/docs/generators/typescript.md +++ b/docs/generators/typescript.md @@ -25,7 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |fileContentDataType|Specifies the type to use for the content of a file - i.e. Blob (Browser, Deno) / Buffer (node)| |Buffer| |framework|Specify the framework which should be used in the client code.|
          **fetch-api**
          fetch-api
          **jquery**
          jquery
          |fetch-api| |importFileExtension|File extension to use with relative imports. Set it to '.js' or '.mjs' when using [ESM](https://nodejs.org/api/esm.html). Defaults to '.ts' when 'platform' is set to 'deno'.| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| diff --git a/docs/generators/wsdl-schema.md b/docs/generators/wsdl-schema.md index f9df093aa0c..08ba6899a19 100644 --- a/docs/generators/wsdl-schema.md +++ b/docs/generators/wsdl-schema.md @@ -24,7 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |hostname|the hostname of the service| |null| -|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| +|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
          **true**
          The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
          **false**
          The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
          |true| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |serviceName|service name for the wsdl| |null| |soapPath|basepath of the soap services| |null| 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 2ee0c5474f8..841adbf3b6d 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 @@ -378,8 +378,11 @@ public class CodegenConstants { public static final String REMOVE_ENUM_VALUE_PREFIX = "removeEnumValuePrefix"; public static final String REMOVE_ENUM_VALUE_PREFIX_DESC = "Remove the common prefix of enum values"; + public static final String SKIP_ONEOF_ANYOF_GETTER = "skipOneOfAnyOfGetter"; + public static final String SKIP_ONEOF_ANYOF_GETTER_DESC = "Skip the generation of getter for sub-schemas in oneOf/anyOf models."; + public static final String LEGACY_DISCRIMINATOR_BEHAVIOR = "legacyDiscriminatorBehavior"; - public static final String LEGACY_DISCRIMINATOR_BEHAVIOR_DESC = "Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default)."; + public static final String LEGACY_DISCRIMINATOR_BEHAVIOR_DESC = "Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default)."; public static final String USE_SINGLE_REQUEST_PARAMETER = "useSingleRequestParameter"; public static final String USE_SINGLE_REQUEST_PARAMETER_DESC = "Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter."; @@ -388,10 +391,12 @@ public class CodegenConstants { public static final String DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT_DESC = "If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. " + "If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default."; + public static final String UNSUPPORTED_V310_SPEC_MSG = "Generation using 3.1.0 specs is in development and is not officially supported yet. " + "If you would like to expedite development, please consider woking on the open issues in the 3.1.0 project: https://github.com/orgs/OpenAPITools/projects/4/views/1 " + "and reach out to our team on Slack at https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g"; + public static final String ENUM_UNKNOWN_DEFAULT_CASE = "enumUnknownDefaultCase"; public static final String ENUM_UNKNOWN_DEFAULT_CASE_DESC = "If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response." + @@ -399,13 +404,13 @@ public class CodegenConstants { public static final String USE_ONEOF_DISCRIMINATOR_LOOKUP = "useOneOfDiscriminatorLookup"; public static final String USE_ONEOF_DISCRIMINATOR_LOOKUP_DESC = "Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped."; + public static final String INIT_REQUIRED_VARS = "initRequiredVars"; public static final String INIT_REQUIRED_VARS_DESC = "If set to true then the required variables are included as positional arguments in __init__ and _from_openapi_data methods. Note: this can break some composition use cases. To learn more read PR #8802."; public static final String ERROR_OBJECT_TYPE = "errorObjectType"; public static final String NON_COMPLIANT_USE_DISCR_IF_COMPOSITION_FAILS = "nonCompliantUseDiscriminatorIfCompositionFails"; - public static final String NON_COMPLIANT_USE_DISCR_IF_COMPOSITION_FAILS_DESC = "When true, If the payload fails to validate against composed schemas (allOf/anyOf/oneOf/not) and a " + "discriminator is present, then ignore the composition validation errors and attempt to use the " + diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index a93477ed25d..6f2e45208ef 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -117,6 +117,10 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { protected boolean needsCustomHttpMethod = false; protected boolean needsUriBuilder = false; + // skip generation of getter for oneOf/anyOf sub-schemas to avoid duplicate getter + // when the subschemas are of the same type but with different constraints (e.g. array of string) + protected boolean skipOneOfAnyOfGetter = false; + public CSharpNetCoreClientCodegen() { super(); @@ -321,12 +325,16 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { addSwitch(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP_DESC, - this.caseInsensitiveResponseHeaders); + this.useOneOfDiscriminatorLookup); addSwitch(CodegenConstants.CASE_INSENSITIVE_RESPONSE_HEADERS, CodegenConstants.CASE_INSENSITIVE_RESPONSE_HEADERS_DESC, this.caseInsensitiveResponseHeaders); + addSwitch(CodegenConstants.SKIP_ONEOF_ANYOF_GETTER, + CodegenConstants.SKIP_ONEOF_ANYOF_GETTER_DESC, + this.skipOneOfAnyOfGetter); + regexModifiers = new HashMap<>(); regexModifiers.put('i', "IgnoreCase"); regexModifiers.put('m', "Multiline"); @@ -798,6 +806,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { syncBooleanProperty(additionalProperties, CodegenConstants.OPTIONAL_METHOD_ARGUMENT, this::setOptionalMethodArgumentFlag, optionalMethodArgumentFlag); syncBooleanProperty(additionalProperties, CodegenConstants.NON_PUBLIC_API, this::setNonPublicApi, isNonPublicApi()); syncBooleanProperty(additionalProperties, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, this::setUseOneOfDiscriminatorLookup, this.useOneOfDiscriminatorLookup); + syncBooleanProperty(additionalProperties, CodegenConstants.SKIP_ONEOF_ANYOF_GETTER, this::setSkipOneOfAnyOfGetter, this.skipOneOfAnyOfGetter); syncBooleanProperty(additionalProperties, "supportsFileParameters", this::setSupportsFileParameters, this.supportsFileParameters); final String testPackageName = testPackageName(); @@ -1178,6 +1187,14 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { return this.useOneOfDiscriminatorLookup; } + public void setSkipOneOfAnyOfGetter(boolean skipOneOfAnyOfGetter) { + this.skipOneOfAnyOfGetter = skipOneOfAnyOfGetter; + } + + public boolean getSkipOneOfAnyOfGetter() { + return this.skipOneOfAnyOfGetter; + } + @Override public String toEnumVarName(String value, String datatype) { if (value.length() == 0) { @@ -1645,4 +1662,10 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { // process 'additionalProperties' setAddProps(schema, m); } + + @Override + public Map postProcessSupportingFileData(Map objs) { + generateYAMLSpecFile(objs); + return objs; + } } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache index a7756c16045..3497bf5344a 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache @@ -65,6 +65,7 @@ } } } + {{^skipOneOfAnyOfGetter}} {{#composedSchemas.oneOf}} {{^isNull}} @@ -79,6 +80,7 @@ } {{/isNull}} {{/composedSchemas.oneOf}} + {{/skipOneOfAnyOfGetter}} /// /// Returns the string presentation of the object diff --git a/samples/client/others/csharp-netcore-complex-files/api/openapi.yaml b/samples/client/others/csharp-netcore-complex-files/api/openapi.yaml index 8b137891791..ad6066f3a3b 100644 --- a/samples/client/others/csharp-netcore-complex-files/api/openapi.yaml +++ b/samples/client/others/csharp-netcore-complex-files/api/openapi.yaml @@ -1 +1,100 @@ +openapi: 3.0.1 +info: + title: MultipartFile test + version: 1.0.0 +servers: +- url: / +paths: + /multipart-array: + post: + description: MultipartFile array test + operationId: multipartArray + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/multipartArray_request' + responses: + "204": + description: Successful operation + tags: + - multipart + /multipart-single: + post: + description: Single MultipartFile test + operationId: multipartSingle + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/multipartSingle_request' + responses: + "204": + description: Successful operation + tags: + - multipart + /multipart-mixed: + post: + description: Mixed MultipartFile test + operationId: multipartMixed + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/multipartMixed_request' + responses: + "204": + description: Successful operation + tags: + - multipart +components: + schemas: + MultipartMixedStatus: + description: additional field as Enum + enum: + - ALLOWED + - IN_PROGRESS + - REJECTED + example: REJECTED + type: string + multipartArray_request: + properties: + files: + description: Many files + items: + format: binary + type: string + type: array + type: object + multipartSingle_request: + properties: + file: + description: One file + format: binary + type: string + type: object + multipartMixed_request_marker: + description: additional object + properties: + name: + type: string + type: object + multipartMixed_request: + properties: + status: + $ref: '#/components/schemas/MultipartMixedStatus' + marker: + $ref: '#/components/schemas/multipartMixed_request_marker' + file: + description: a file + format: binary + type: string + statusArray: + items: + $ref: '#/components/schemas/MultipartMixedStatus' + type: array + required: + - file + - status + type: object diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml index 8b137891791..9c001848c5e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml @@ -1 +1,77 @@ +openapi: 3.0.1 +info: + license: + name: MIT + title: Example + version: 1.0.0 +servers: +- url: http://api.example.xyz/v1 +paths: + /person/display/{personId}: + get: + operationId: list + parameters: + - description: The id of the person to retrieve + explode: false + in: path + name: personId + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Person' + description: OK +components: + schemas: + Person: + discriminator: + mapping: + a: '#/components/schemas/Adult' + c: Child + propertyName: $_type + example: + lastName: lastName + firstName: firstName + $_type: $_type + properties: + $_type: + type: string + lastName: + type: string + firstName: + type: string + type: object + Adult: + allOf: + - $ref: '#/components/schemas/Person' + - $ref: '#/components/schemas/Adult_allOf' + description: A representation of an adult + Child: + allOf: + - $ref: '#/components/schemas/Child_allOf' + - $ref: '#/components/schemas/Person' + description: A representation of a child + properties: + boosterSeat: + type: boolean + Adult_allOf: + properties: + children: + items: + $ref: '#/components/schemas/Child' + type: array + type: object + example: null + Child_allOf: + properties: + age: + format: int32 + type: integer + type: object + example: null diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml index 8b137891791..25b9adb5f50 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml @@ -1 +1,42 @@ +openapi: 3.0.1 +info: + title: fruity + version: 0.0.1 +servers: +- url: / +paths: + /: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/fruit' + description: desc +components: + schemas: + fruit: + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + example: + color: color + properties: + color: + type: string + title: fruit + type: object + apple: + properties: + kind: + type: string + title: apple + type: object + banana: + properties: + count: + type: number + title: banana + type: object diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml index 8b137891791..06fd58be740 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml @@ -1 +1,41 @@ +openapi: 3.0.1 +info: + title: fruity + version: 0.0.1 +servers: +- url: / +paths: + /: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/fruit' + description: desc +components: + schemas: + fruit: + example: + color: color + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + title: fruit + apple: + properties: + kind: + type: string + title: apple + type: object + banana: + properties: + count: + type: number + title: banana + type: object diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs index 726b1e8f72e..c2199aefd08 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs @@ -87,26 +87,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `Apple`. If the actual instance is not `Apple`, - /// the InvalidClassException will be thrown - /// - /// An instance of Apple - public Apple GetApple() - { - return (Apple)this.ActualInstance; - } - - /// - /// Get the actual instance of `Banana`. If the actual instance is not `Banana`, - /// the InvalidClassException will be thrown - /// - /// An instance of Banana - public Banana GetBanana() - { - return (Banana)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs index 548da490def..125ac4f8a3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs @@ -96,26 +96,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `AppleReq`. If the actual instance is not `AppleReq`, - /// the InvalidClassException will be thrown - /// - /// An instance of AppleReq - public AppleReq GetAppleReq() - { - return (AppleReq)this.ActualInstance; - } - - /// - /// Get the actual instance of `BananaReq`. If the actual instance is not `BananaReq`, - /// the InvalidClassException will be thrown - /// - /// An instance of BananaReq - public BananaReq GetBananaReq() - { - return (BananaReq)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs index 8630f21bba4..1fde96c460b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs @@ -104,36 +104,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `Whale`. If the actual instance is not `Whale`, - /// the InvalidClassException will be thrown - /// - /// An instance of Whale - public Whale GetWhale() - { - return (Whale)this.ActualInstance; - } - - /// - /// Get the actual instance of `Zebra`. If the actual instance is not `Zebra`, - /// the InvalidClassException will be thrown - /// - /// An instance of Zebra - public Zebra GetZebra() - { - return (Zebra)this.ActualInstance; - } - - /// - /// Get the actual instance of `Pig`. If the actual instance is not `Pig`, - /// the InvalidClassException will be thrown - /// - /// An instance of Pig - public Pig GetPig() - { - return (Pig)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs index 01cedb8807b..27eed4515c1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs @@ -97,26 +97,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `Triangle`. If the actual instance is not `Triangle`, - /// the InvalidClassException will be thrown - /// - /// An instance of Triangle - public Triangle GetTriangle() - { - return (Triangle)this.ActualInstance; - } - - /// - /// Get the actual instance of `Quadrilateral`. If the actual instance is not `Quadrilateral`, - /// the InvalidClassException will be thrown - /// - /// An instance of Quadrilateral - public Quadrilateral GetQuadrilateral() - { - return (Quadrilateral)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs index c599574b1ce..e6efb45fdf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs @@ -88,26 +88,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `BasquePig`. If the actual instance is not `BasquePig`, - /// the InvalidClassException will be thrown - /// - /// An instance of BasquePig - public BasquePig GetBasquePig() - { - return (BasquePig)this.ActualInstance; - } - - /// - /// Get the actual instance of `DanishPig`. If the actual instance is not `DanishPig`, - /// the InvalidClassException will be thrown - /// - /// An instance of DanishPig - public DanishPig GetDanishPig() - { - return (DanishPig)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 0ce4e18eb2e..35df3197770 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -119,46 +119,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `bool`. If the actual instance is not `bool`, - /// the InvalidClassException will be thrown - /// - /// An instance of bool - public bool GetBool() - { - return (bool)this.ActualInstance; - } - - /// - /// Get the actual instance of `string`. If the actual instance is not `string`, - /// the InvalidClassException will be thrown - /// - /// An instance of string - public string GetString() - { - return (string)this.ActualInstance; - } - - /// - /// Get the actual instance of `Object`. If the actual instance is not `Object`, - /// the InvalidClassException will be thrown - /// - /// An instance of Object - public Object GetObject() - { - return (Object)this.ActualInstance; - } - - /// - /// Get the actual instance of `List<string>`. If the actual instance is not `List<string>`, - /// the InvalidClassException will be thrown - /// - /// An instance of List<string> - public List GetListString() - { - return (List)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs index 2e4fc5cb041..8a9ed990945 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -88,26 +88,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `SimpleQuadrilateral`. If the actual instance is not `SimpleQuadrilateral`, - /// the InvalidClassException will be thrown - /// - /// An instance of SimpleQuadrilateral - public SimpleQuadrilateral GetSimpleQuadrilateral() - { - return (SimpleQuadrilateral)this.ActualInstance; - } - - /// - /// Get the actual instance of `ComplexQuadrilateral`. If the actual instance is not `ComplexQuadrilateral`, - /// the InvalidClassException will be thrown - /// - /// An instance of ComplexQuadrilateral - public ComplexQuadrilateral GetComplexQuadrilateral() - { - return (ComplexQuadrilateral)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs index bc73c0d68a7..466c0ccd3e1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs @@ -88,26 +88,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `Triangle`. If the actual instance is not `Triangle`, - /// the InvalidClassException will be thrown - /// - /// An instance of Triangle - public Triangle GetTriangle() - { - return (Triangle)this.ActualInstance; - } - - /// - /// Get the actual instance of `Quadrilateral`. If the actual instance is not `Quadrilateral`, - /// the InvalidClassException will be thrown - /// - /// An instance of Quadrilateral - public Quadrilateral GetQuadrilateral() - { - return (Quadrilateral)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs index a6d3624c26f..aa1fb62e47f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -97,26 +97,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `Triangle`. If the actual instance is not `Triangle`, - /// the InvalidClassException will be thrown - /// - /// An instance of Triangle - public Triangle GetTriangle() - { - return (Triangle)this.ActualInstance; - } - - /// - /// Get the actual instance of `Quadrilateral`. If the actual instance is not `Quadrilateral`, - /// the InvalidClassException will be thrown - /// - /// An instance of Quadrilateral - public Quadrilateral GetQuadrilateral() - { - return (Quadrilateral)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs index a68563c154d..27730f8acad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs @@ -104,36 +104,6 @@ namespace Org.OpenAPITools.Model } } - /// - /// Get the actual instance of `EquilateralTriangle`. If the actual instance is not `EquilateralTriangle`, - /// the InvalidClassException will be thrown - /// - /// An instance of EquilateralTriangle - public EquilateralTriangle GetEquilateralTriangle() - { - return (EquilateralTriangle)this.ActualInstance; - } - - /// - /// Get the actual instance of `IsoscelesTriangle`. If the actual instance is not `IsoscelesTriangle`, - /// the InvalidClassException will be thrown - /// - /// An instance of IsoscelesTriangle - public IsoscelesTriangle GetIsoscelesTriangle() - { - return (IsoscelesTriangle)this.ActualInstance; - } - - /// - /// Get the actual instance of `ScaleneTriangle`. If the actual instance is not `ScaleneTriangle`, - /// the InvalidClassException will be thrown - /// - /// An instance of ScaleneTriangle - public ScaleneTriangle GetScaleneTriangle() - { - return (ScaleneTriangle)this.ActualInstance; - } - /// /// Returns the string presentation of the object /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml index 8b137891791..ad369a25587 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml @@ -1 +1,2395 @@ +openapi: 3.0.0 +info: + description: "This spec is mainly for testing Petstore server and contains fake\ + \ endpoints, models. Please do not use this for any other purpose. Special characters:\ + \ \" \\" + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- description: petstore server + url: "http://{server}.swagger.io:{port}/v2" + variables: + server: + default: petstore + enum: + - petstore + - qa-petstore + - dev-petstore + port: + default: "80" + enum: + - "80" + - "8080" +- description: The local server + url: "https://localhost:8080/{version}" + variables: + version: + default: v2 + enum: + - v1 + - v2 +- description: The local server without variables + url: https://127.0.0.1/no_variable +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /hello: + get: + description: Hello + operationId: Hello + responses: + "200": + content: + application/json: + schema: + items: + format: uuid + type: string + type: array + description: UUIDs + summary: Hello + /foo: + get: + responses: + default: + content: + application/json: + schema: + $ref: '#/components/schemas/_foo_get_default_response' + description: response + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "405": + description: Invalid input + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + servers: + - url: http://petstore.swagger.io/v2 + - url: http://path-server-test.petstore.local/v2 + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - http_signature_test: [] + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{order_id}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: order_id + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: order_id + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + summary: Updated user + tags: + - user + /fake_classname_test: + patch: + description: To test class name in snake case + operationId: testClassname + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + security: + - api_key_query: [] + summary: To test class name in snake case + tags: + - fake_classname_tags 123#$%^ + /fake: + delete: + description: Fake endpoint to test group parameters (optional) + operationId: testGroupParameters + parameters: + - description: Required String in group parameters + explode: true + in: query + name: required_string_group + required: true + schema: + type: integer + style: form + - description: Required Boolean in group parameters + explode: false + in: header + name: required_boolean_group + required: true + schema: + type: boolean + style: simple + - description: Required Integer in group parameters + explode: true + in: query + name: required_int64_group + required: true + schema: + format: int64 + type: integer + style: form + - description: String in group parameters + explode: true + in: query + name: string_group + required: false + schema: + type: integer + style: form + - description: Boolean in group parameters + explode: false + in: header + name: boolean_group + required: false + schema: + type: boolean + style: simple + - description: Integer in group parameters + explode: true + in: query + name: int64_group + required: false + schema: + format: int64 + type: integer + style: form + responses: + "400": + description: Something wrong + security: + - bearer_test: [] + summary: Fake endpoint to test group parameters (optional) + tags: + - fake + x-group-parameters: true + get: + description: To test enum parameters + operationId: testEnumParameters + parameters: + - description: Header parameter enum test (string array) + explode: false + in: header + name: enum_header_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: simple + - description: Header parameter enum test (string) + explode: false + in: header + name: enum_header_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: simple + - description: Query parameter enum test (string array) + explode: true + in: query + name: enum_query_string_array + required: false + schema: + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + style: form + - description: Query parameter enum test (string) + explode: true + in: query + name: enum_query_string + required: false + schema: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_integer + required: false + schema: + enum: + - 1 + - -2 + format: int32 + type: integer + style: form + - description: Query parameter enum test (double) + explode: true + in: query + name: enum_query_double + required: false + schema: + enum: + - 1.1 + - -1.2 + format: double + type: number + style: form + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEnumParameters_request' + responses: + "400": + description: Invalid request + "404": + description: Not found + summary: To test enum parameters + tags: + - fake + patch: + description: To test "client" model + operationId: testClientModel + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test "client" model + tags: + - fake + post: + description: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + operationId: testEndpointParameters + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testEndpointParameters_request' + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - http_basic_test: [] + summary: | + Fake endpoint for testing various parameters + 假端點 + 偽のエンドポイント + 가짜 엔드 포인트 + tags: + - fake + /fake/outer/number: + post: + description: Test serialization of outer number types + operationId: fakeOuterNumberSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterNumber' + description: Input number as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterNumber' + description: Output number + tags: + - fake + /fake/outer/string: + post: + description: Test serialization of outer string types + operationId: fakeOuterStringSerialize + parameters: + - description: Required UUID String + explode: true + in: query + name: required_string_uuid + required: true + schema: + format: uuid + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterString' + description: Input string as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterString' + description: Output string + tags: + - fake + /fake/outer/boolean: + post: + description: Test serialization of outer boolean types + operationId: fakeOuterBooleanSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Input boolean as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterBoolean' + description: Output boolean + tags: + - fake + /fake/outer/composite: + post: + description: Test serialization of object with outer number type + operationId: fakeOuterCompositeSerialize + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/OuterComposite' + description: Input composite as post body + responses: + "200": + content: + '*/*': + schema: + $ref: '#/components/schemas/OuterComposite' + description: Output composite + tags: + - fake + /fake/jsonFormData: + get: + description: "" + operationId: testJsonFormData + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/testJsonFormData_request' + responses: + "200": + description: successful operation + summary: test json serialization of form data + tags: + - fake + /fake/inline-additionalProperties: + post: + description: "" + operationId: testInlineAdditionalProperties + requestBody: + content: + application/json: + schema: + additionalProperties: + type: string + type: object + description: request body + required: true + responses: + "200": + description: successful operation + summary: test inline additionalProperties + tags: + - fake + /fake/body-with-query-params: + put: + operationId: testBodyWithQueryParams + parameters: + - explode: true + in: query + name: query + required: true + schema: + type: string + style: form + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + required: true + responses: + "200": + description: Success + tags: + - fake + /another-fake/dummy: + patch: + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags + requestBody: + $ref: '#/components/requestBodies/Client' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: successful operation + summary: To test special tags + tags: + - $another-fake? + /fake/body-with-file-schema: + put: + description: "For this test, the body for this request much reference a schema\ + \ named `File`." + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + "200": + description: Success + tags: + - fake + /fake/test-query-parameters: + put: + description: To test the collection format in query parameters + operationId: testQueryParameterCollectionFormat + parameters: + - explode: true + in: query + name: pipe + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: ioutil + required: true + schema: + items: + type: string + type: array + style: form + - explode: false + in: query + name: http + required: true + schema: + items: + type: string + type: array + style: spaceDelimited + - explode: false + in: query + name: url + required: true + schema: + items: + type: string + type: array + style: form + - explode: true + in: query + name: context + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + description: Success + tags: + - fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + description: "" + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + /fake/health: + get: + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/HealthCheckResult' + description: The instance started successfully + summary: Health check endpoint + tags: + - fake + /fake/array-of-enums: + get: + operationId: getArrayOfEnums + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ArrayOfEnums' + description: Got named array of enums + summary: Array of Enums + tags: + - fake + /country: + post: + operationId: getCountry + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/getCountry_request' + responses: + "200": + description: OK +components: + requestBodies: + UserArray: + content: + application/json: + examples: + simple-list: + description: Should not get into code examples + summary: Simple list example + value: + - username: foo + - username: bar + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Client: + content: + application/json: + schema: + $ref: '#/components/schemas/Client' + description: client model + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Foo: + example: + bar: bar + properties: + bar: + default: bar + type: string + type: object + Bar: + default: bar + type: string + Order: + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2020-02-02T20:20:20.000222Z + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + example: 2020-02-02T20:20:20.000222Z + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + type: object + xml: + name: Order + Category: + example: + name: default-name + id: 6 + properties: + id: + format: int64 + type: integer + name: + default: default-name + type: string + required: + - name + type: object + xml: + name: Category + User: + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + objectWithNoDeclaredPropsNullable: "{}" + phone: phone + objectWithNoDeclaredProps: "{}" + id: 0 + anyTypePropNullable: "" + email: email + anyTypeProp: "" + username: username + properties: + id: + format: int64 + type: integer + x-is-unique: true + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + objectWithNoDeclaredProps: + description: test code generation for objects Value must be a map of strings + to values. It cannot be the 'null' value. + type: object + objectWithNoDeclaredPropsNullable: + description: test code generation for nullable objects. Value must be a + map of strings to values or the 'null' value. + nullable: true + type: object + anyTypeProp: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389" + anyTypePropNullable: + description: "test code generation for any type Here the 'type' attribute\ + \ is not specified, which means the value can be anything, including the\ + \ null value, string, number, boolean, array or object. The 'nullable'\ + \ attribute does not change the allowed values." + nullable: true + type: object + xml: + name: User + Tag: + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + type: object + xml: + name: Tag + Pet: + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: default-name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + x-is-unique: true + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + type: object + xml: + name: Pet + ApiResponse: + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + type: object + Return: + description: Model for testing reserved words + properties: + return: + format: int32 + type: integer + xml: + name: Return + Name: + description: Model for testing model name same as property name + properties: + name: + format: int32 + type: integer + snake_case: + format: int32 + readOnly: true + type: integer + property: + type: string + "123Number": + readOnly: true + type: integer + required: + - name + xml: + name: Name + "200_response": + description: Model for testing model name starting with number + properties: + name: + format: int32 + type: integer + class: + type: string + xml: + name: Name + ClassModel: + description: Model for testing model with "_class" property + properties: + _class: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Dog_allOf' + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - $ref: '#/components/schemas/Address' + - $ref: '#/components/schemas/Cat_allOf' + Address: + additionalProperties: + type: integer + type: object + Animal: + discriminator: + propertyName: className + properties: + className: + type: string + color: + default: red + type: string + required: + - className + type: object + AnimalFarm: + items: + $ref: '#/components/schemas/Animal' + type: array + format_test: + properties: + integer: + maximum: 100 + minimum: 10 + multipleOf: 2 + type: integer + int32: + format: int32 + maximum: 200 + minimum: 20 + type: integer + unsigned_integer: + format: int32 + maximum: 200 + minimum: 20 + type: integer + x-unsigned: true + int64: + format: int64 + type: integer + unsigned_long: + format: int64 + type: integer + x-unsigned: true + number: + maximum: 543.2 + minimum: 32.1 + multipleOf: 32.5 + type: number + float: + format: float + maximum: 987.6 + minimum: 54.3 + type: number + double: + format: double + maximum: 123.4 + minimum: 67.8 + type: number + decimal: + format: number + type: string + string: + pattern: "/[a-z]/i" + type: string + byte: + format: byte + type: string + binary: + format: binary + type: string + date: + example: 2020-02-02 + format: date + type: string + dateTime: + example: 2007-12-03T10:15:30+01:00 + format: date-time + type: string + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + type: string + password: + format: password + maxLength: 64 + minLength: 10 + type: string + pattern_with_digits: + description: A string that is a 10 digit number. Can have leading zeros. + pattern: "^\\d{10}$" + type: string + pattern_with_digits_and_delimiter: + description: A string starting with 'image_' (case insensitive) and one + to three digits following i.e. Image_01. + pattern: "/^image_\\d{1,3}$/i" + type: string + required: + - byte + - date + - number + - password + type: object + EnumClass: + default: -efg + enum: + - _abc + - -efg + - (xyz) + type: string + Enum_Test: + properties: + enum_string: + enum: + - UPPER + - lower + - "" + type: string + enum_string_required: + enum: + - UPPER + - lower + - "" + type: string + enum_integer: + enum: + - 1 + - -1 + format: int32 + type: integer + enum_integer_only: + enum: + - 2 + - -2 + type: integer + enum_number: + enum: + - 1.1 + - -1.2 + format: double + type: number + outerEnum: + $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' + required: + - enum_string_required + type: object + AdditionalPropertiesClass: + properties: + map_property: + additionalProperties: + type: string + type: object + map_of_map_property: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + anytype_1: {} + map_with_undeclared_properties_anytype_1: + type: object + map_with_undeclared_properties_anytype_2: + properties: {} + type: object + map_with_undeclared_properties_anytype_3: + additionalProperties: true + type: object + empty_map: + additionalProperties: false + description: "an object with no declared properties and no undeclared properties,\ + \ hence it's an empty map." + type: object + map_with_undeclared_properties_string: + additionalProperties: + type: string + type: object + type: object + MixedPropertiesAndAdditionalPropertiesClass: + properties: + uuid_with_pattern: + format: uuid + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + type: string + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + List: + properties: + "123-list": + type: string + type: object + Client: + example: + client: client + properties: + client: + type: string + type: object + ReadOnlyFirst: + properties: + bar: + readOnly: true + type: string + baz: + type: string + type: object + hasOnlyReadOnly: + properties: + bar: + readOnly: true + type: string + foo: + readOnly: true + type: string + type: object + Capitalization: + properties: + smallCamel: + type: string + CapitalCamel: + type: string + small_Snake: + type: string + Capital_Snake: + type: string + SCA_ETH_Flow_Points: + type: string + ATT_NAME: + description: | + Name of the pet + type: string + type: object + MapTest: + properties: + map_map_of_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_of_enum_string: + additionalProperties: + enum: + - UPPER + - lower + type: string + type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + additionalProperties: + type: boolean + type: object + type: object + ArrayTest: + properties: + array_of_string: + items: + type: string + type: array + array_array_of_integer: + items: + items: + format: int64 + type: integer + type: array + type: array + array_array_of_model: + items: + items: + $ref: '#/components/schemas/ReadOnlyFirst' + type: array + type: array + type: object + NumberOnly: + properties: + JustNumber: + type: number + type: object + x-cls-compliant: true + x-com-visible: true + ArrayOfNumberOnly: + properties: + ArrayNumber: + items: + type: number + type: array + type: object + ArrayOfArrayOfNumberOnly: + properties: + ArrayArrayNumber: + items: + items: + type: number + type: array + type: array + type: object + EnumArrays: + properties: + just_symbol: + enum: + - '>=' + - $ + type: string + array_enum: + items: + enum: + - fish + - crab + type: string + type: array + type: object + OuterEnum: + enum: + - placed + - approved + - delivered + nullable: true + type: string + OuterEnumInteger: + enum: + - 0 + - 1 + - 2 + type: integer + OuterEnumDefaultValue: + default: placed + enum: + - placed + - approved + - delivered + type: string + OuterEnumIntegerDefaultValue: + default: 0 + enum: + - 0 + - 1 + - 2 + type: integer + OuterComposite: + example: + my_string: my_string + my_number: 0.8008281904610115 + my_boolean: true + properties: + my_number: + type: number + my_string: + type: string + my_boolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + type: object + OuterNumber: + type: number + OuterString: + type: string + OuterBoolean: + type: boolean + x-codegen-body-parameter-name: boolean_post_body + StringBooleanMap: + additionalProperties: + type: boolean + type: object + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object + _special_model.name_: + properties: + $special[property.name]: + format: int64 + type: integer + _special_model.name_: + type: string + xml: + name: "$special[model.name]" + HealthCheckResult: + description: Just a string to inform instance is up and running. Make it nullable + in hope to get it as pointer in generated model. + example: + NullableMessage: NullableMessage + properties: + NullableMessage: + nullable: true + type: string + type: object + NullableClass: + additionalProperties: + nullable: true + type: object + properties: + integer_prop: + nullable: true + type: integer + number_prop: + nullable: true + type: number + boolean_prop: + nullable: true + type: boolean + string_prop: + nullable: true + type: string + date_prop: + format: date + nullable: true + type: string + datetime_prop: + format: date-time + nullable: true + type: string + array_nullable_prop: + items: + type: object + nullable: true + type: array + array_and_items_nullable_prop: + items: + nullable: true + type: object + nullable: true + type: array + array_items_nullable: + items: + nullable: true + type: object + type: array + object_nullable_prop: + additionalProperties: + type: object + nullable: true + type: object + object_and_items_nullable_prop: + additionalProperties: + nullable: true + type: object + nullable: true + type: object + object_items_nullable: + additionalProperties: + nullable: true + type: object + type: object + type: object + fruit: + additionalProperties: false + oneOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + apple: + nullable: true + properties: + cultivar: + pattern: "^[a-zA-Z\\s]*$" + type: string + origin: + pattern: "/^[A-Z\\s]*$/i" + type: string + type: object + banana: + properties: + lengthCm: + type: number + type: object + mammal: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/whale' + - $ref: '#/components/schemas/zebra' + - $ref: '#/components/schemas/Pig' + whale: + properties: + hasBaleen: + type: boolean + hasTeeth: + type: boolean + className: + type: string + required: + - className + type: object + zebra: + additionalProperties: true + properties: + type: + enum: + - plains + - mountain + - grevys + type: string + className: + type: string + required: + - className + type: object + Pig: + discriminator: + propertyName: className + oneOf: + - $ref: '#/components/schemas/BasquePig' + - $ref: '#/components/schemas/DanishPig' + BasquePig: + properties: + className: + type: string + required: + - className + type: object + DanishPig: + properties: + className: + type: string + required: + - className + type: object + gmFruit: + additionalProperties: false + anyOf: + - $ref: '#/components/schemas/apple' + - $ref: '#/components/schemas/banana' + properties: + color: + type: string + fruitReq: + additionalProperties: false + oneOf: + - type: "null" + - $ref: '#/components/schemas/appleReq' + - $ref: '#/components/schemas/bananaReq' + appleReq: + additionalProperties: false + properties: + cultivar: + type: string + mealy: + type: boolean + required: + - cultivar + type: object + bananaReq: + additionalProperties: false + properties: + lengthCm: + type: number + sweet: + type: boolean + required: + - lengthCm + type: object + Drawing: + additionalProperties: + $ref: '#/components/schemas/fruit' + properties: + mainShape: + $ref: '#/components/schemas/Shape' + shapeOrNull: + $ref: '#/components/schemas/ShapeOrNull' + nullableShape: + $ref: '#/components/schemas/NullableShape' + shapes: + items: + $ref: '#/components/schemas/Shape' + type: array + type: object + Shape: + discriminator: + propertyName: shapeType + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeOrNull: + description: The value may be a shape or the 'null' value. This is introduced + in OAS schema >= 3.1. + discriminator: + propertyName: shapeType + oneOf: + - type: "null" + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + NullableShape: + description: The value may be a shape or the 'null' value. The 'nullable' attribute + was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema + >= 3.1. + discriminator: + propertyName: shapeType + nullable: true + oneOf: + - $ref: '#/components/schemas/Triangle' + - $ref: '#/components/schemas/Quadrilateral' + ShapeInterface: + properties: + shapeType: + type: string + required: + - shapeType + TriangleInterface: + properties: + triangleType: + type: string + required: + - triangleType + Triangle: + discriminator: + propertyName: triangleType + oneOf: + - $ref: '#/components/schemas/EquilateralTriangle' + - $ref: '#/components/schemas/IsoscelesTriangle' + - $ref: '#/components/schemas/ScaleneTriangle' + EquilateralTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + IsoscelesTriangle: + additionalProperties: false + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + ScaleneTriangle: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/TriangleInterface' + QuadrilateralInterface: + properties: + quadrilateralType: + type: string + required: + - quadrilateralType + Quadrilateral: + discriminator: + propertyName: quadrilateralType + oneOf: + - $ref: '#/components/schemas/SimpleQuadrilateral' + - $ref: '#/components/schemas/ComplexQuadrilateral' + SimpleQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + ComplexQuadrilateral: + allOf: + - $ref: '#/components/schemas/ShapeInterface' + - $ref: '#/components/schemas/QuadrilateralInterface' + GrandparentAnimal: + discriminator: + propertyName: pet_type + properties: + pet_type: + type: string + required: + - pet_type + type: object + ParentPet: + allOf: + - $ref: '#/components/schemas/GrandparentAnimal' + type: object + ChildCat: + allOf: + - $ref: '#/components/schemas/ParentPet' + - $ref: '#/components/schemas/ChildCat_allOf' + ArrayOfEnums: + items: + $ref: '#/components/schemas/OuterEnum' + type: array + DateTimeTest: + default: 2010-01-01T10:10:10.000111+01:00 + example: 2010-01-01T10:10:10.000111+01:00 + format: date-time + type: string + DeprecatedObject: + deprecated: true + properties: + name: + type: string + type: object + ObjectWithDeprecatedFields: + properties: + uuid: + type: string + id: + deprecated: true + type: number + deprecatedRef: + $ref: '#/components/schemas/DeprecatedObject' + bars: + deprecated: true + items: + $ref: '#/components/schemas/Bar' + type: array + type: object + PolymorphicProperty: + oneOf: + - type: boolean + - type: string + - type: object + - items: + $ref: '#/components/schemas/StringArrayItem' + type: array + StringArrayItem: + format: string + type: string + Activity: + description: test map of maps + properties: + activity_outputs: + additionalProperties: + $ref: '#/components/schemas/ActivityOutputRepresentation' + type: object + type: object + ActivityOutputRepresentation: + items: + $ref: '#/components/schemas/ActivityOutputElementRepresentation' + type: array + ActivityOutputElementRepresentation: + properties: + prop1: + type: string + prop2: + type: object + type: object + NullableGuidClass: + properties: + uuid: + example: 72f98069-206d-4f12-9f12-3d1e525a8e84 + format: uuid + nullable: true + type: string + type: object + DateOnlyClass: + properties: + dateOnlyProperty: + example: 2017-07-21 + format: date + type: string + type: object + TestCollectionEndingWithWordListObject: + properties: + TestCollectionEndingWithWordList: + items: + $ref: '#/components/schemas/TestCollectionEndingWithWordList' + type: array + type: object + TestCollectionEndingWithWordList: + properties: + value: + type: string + type: object + _foo_get_default_response: + example: + string: + bar: bar + properties: + string: + $ref: '#/components/schemas/Foo' + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + type: object + testEndpointParameters_request: + properties: + integer: + description: None + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + default: 2010-02-01T10:20:10.11111+01:00 + description: None + example: 2020-02-02T20:20:20.22222Z + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + type: object + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + type: object + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile + type: object + getCountry_request_allOf: + properties: + country: + type: string + required: + - country + type: object + getCountry_request: + allOf: + - $ref: '#/components/schemas/getCountry_request_allOf' + Dog_allOf: + properties: + breed: + type: string + type: object + example: null + Cat_allOf: + properties: + declawed: + type: boolean + type: object + example: null + ChildCat_allOf: + properties: + name: + type: string + pet_type: + default: ChildCat + enum: + - ChildCat + type: string + x-enum-as-string: true + type: object + example: null + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey + api_key_query: + in: query + name: api_key_query + type: apiKey + http_basic_test: + scheme: basic + type: http + bearer_test: + bearerFormat: JWT + scheme: bearer + type: http + http_signature_test: + scheme: signature + type: http diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml index 8b137891791..869c894b5dd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml @@ -1 +1,812 @@ +openapi: 3.0.0 +info: + description: "This is a sample server Petstore server. For this sample, you can\ + \ use the api key `special-key` to test the authorization filters." + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +externalDocs: + description: Find out more about Swagger + url: http://swagger.io +servers: +- url: http://petstore.swagger.io/v2 +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + put: + description: "" + externalDocs: + description: API documentation for the updatePet operation + url: http://petstore.swagger.io/v2/doc/updatePet + operationId: updatePet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + "405": + description: Validation exception + security: + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - deprecated: true + description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid status value + security: + - petstore_auth: + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + application/json: + schema: + items: + $ref: '#/components/schemas/Pet' + type: array + description: successful operation + "400": + description: Invalid tag value + security: + - petstore_auth: + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + description: "" + operationId: deletePet + parameters: + - explode: false + in: header + name: api_key + required: false + schema: + type: string + style: simple + - description: Pet id to delete + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "400": + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + description: "" + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/updatePetWithForm_request' + responses: + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + description: "" + operationId: uploadFile + parameters: + - description: ID of pet to update + explode: false + in: path + name: petId + required: true + schema: + format: int64 + type: integer + style: simple + requestBody: + content: + multipart/form-data: + schema: + $ref: '#/components/schemas/uploadFile_request' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + description: "" + operationId: placeOrder + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid Order + summary: Place an order for a pet + tags: + - store + /store/order/{orderId}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + explode: false + in: path + name: orderId + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + explode: false + in: path + name: orderId + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + description: successful operation + "400": + description: Invalid ID supplied + "404": + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Create user + tags: + - user + /user/createWithArray: + post: + description: "" + operationId: createUsersWithArrayInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Creates list of users with given input array + tags: + - user + /user/createWithList: + post: + description: "" + operationId: createUsersWithListInput + requestBody: + $ref: '#/components/requestBodies/UserArray' + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Creates list of users with given input array + tags: + - user + /user/login: + get: + description: "" + operationId: loginUser + parameters: + - description: The user name for login + explode: true + in: query + name: username + required: true + schema: + pattern: "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$" + type: string + style: form + - description: The password for login in clear text + explode: true + in: query + name: password + required: true + schema: + type: string + style: form + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + Set-Cookie: + description: Cookie authentication key for use with the `api_key` apiKey + authentication. + explode: false + schema: + example: AUTH_KEY=abcde12345; Path=/; HttpOnly + type: string + style: simple + X-Rate-Limit: + description: calls per hour allowed by the user + explode: false + schema: + format: int32 + type: integer + style: simple + X-Expires-After: + description: date in UTC when token expires + explode: false + schema: + format: date-time + type: string + style: simple + "400": + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + description: "" + operationId: logoutUser + responses: + default: + description: successful operation + security: + - api_key: [] + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "400": + description: Invalid username supplied + "404": + description: User not found + security: + - api_key: [] + summary: Delete user + tags: + - user + get: + description: "" + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + description: successful operation + "400": + description: Invalid username supplied + "404": + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + explode: false + in: path + name: username + required: true + schema: + type: string + style: simple + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + responses: + "400": + description: Invalid user supplied + "404": + description: User not found + security: + - api_key: [] + summary: Updated user + tags: + - user +components: + requestBodies: + UserArray: + content: + application/json: + schema: + items: + $ref: '#/components/schemas/User' + type: array + description: List of user object + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Order: + description: An order for a pets from the pet store + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2000-01-23T04:56:07.000+00:00 + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + title: Pet Order + type: object + xml: + name: Order + Category: + description: A category for a pet + example: + name: name + id: 6 + properties: + id: + format: int64 + type: integer + name: + pattern: "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$" + type: string + title: Pet category + type: object + xml: + name: Category + User: + description: A User who is purchasing from the pet store + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + phone: phone + id: 0 + email: email + username: username + properties: + id: + format: int64 + type: integer + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + title: a User + type: object + xml: + name: User + Tag: + description: A tag for a pet + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + title: Pet Tag + type: object + xml: + name: Tag + Pet: + description: A pet for sale in the pet store + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + deprecated: true + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + title: a Pet + type: object + xml: + name: Pet + ApiResponse: + description: Describes the result of uploading an image resource + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + title: An uploaded response + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey From cf432522aa699a7f0780b0b8e52564f8d2fef6b1 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 21 Mar 2023 23:59:26 +0800 Subject: [PATCH 071/131] [python-nextgen] fix optional dict in property (#15009) * fix optional dict in property * update samples --- .../python-nextgen/model_generic.mustache | 2 +- ...ith-fake-endpoints-models-for-testing.yaml | 14 +++ .../.openapi-generator/FILES | 4 + .../petstore/python-nextgen-aiohttp/README.md | 2 + .../docs/InnerDictWithProperty.md | 28 ++++++ .../docs/ParentWithOptionalDict.md | 28 ++++++ .../petstore_api/__init__.py | 2 + .../petstore_api/models/__init__.py | 2 + .../models/inner_dict_with_property.py | 70 +++++++++++++++ ...perties_and_additional_properties_class.py | 2 +- .../models/parent_with_optional_dict.py | 78 ++++++++++++++++ .../test/test_inner_dict_with_property.py | 56 ++++++++++++ .../test/test_parent_with_optional_dict.py | 59 ++++++++++++ .../python-nextgen/.openapi-generator/FILES | 4 + .../client/petstore/python-nextgen/README.md | 2 + .../docs/InnerDictWithProperty.md | 28 ++++++ .../docs/ParentWithOptionalDict.md | 28 ++++++ .../python-nextgen/petstore_api/__init__.py | 2 + .../petstore_api/models/__init__.py | 2 + .../models/inner_dict_with_property.py | 82 +++++++++++++++++ ...perties_and_additional_properties_class.py | 2 +- .../models/parent_with_optional_dict.py | 90 +++++++++++++++++++ .../test/test_inner_dict_with_property.py | 56 ++++++++++++ .../test/test_parent_with_optional_dict.py | 59 ++++++++++++ .../python-nextgen/tests/test_model.py | 6 ++ 25 files changed, 705 insertions(+), 3 deletions(-) create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/InnerDictWithProperty.md create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/ParentWithOptionalDict.md create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/inner_dict_with_property.py create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/parent_with_optional_dict.py create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_inner_dict_with_property.py create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_parent_with_optional_dict.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/docs/InnerDictWithProperty.md create mode 100644 samples/openapi3/client/petstore/python-nextgen/docs/ParentWithOptionalDict.md create mode 100644 samples/openapi3/client/petstore/python-nextgen/petstore_api/models/inner_dict_with_property.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/petstore_api/models/parent_with_optional_dict.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/test/test_inner_dict_with_property.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/test/test_parent_with_optional_dict.py diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache index 575e5940f5c..6e27b44bb2f 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache @@ -220,7 +220,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}} {{#isMap}} {{^items.isPrimitiveType}} {{^items.isEnumOrRef}} - "{{{name}}}": dict((_k, {{{dataType}}}.from_dict(_v)) for _k, _v in obj.get("{{{baseName}}}").items()){{^-last}},{{/-last}} + "{{{name}}}": dict((_k, {{{dataType}}}.from_dict(_v)) for _k, _v in obj.get("{{{baseName}}}").items()) if obj.get("{{{baseName}}}") is not None else None{{^-last}},{{/-last}} {{/items.isEnumOrRef}} {{#items.isEnumOrRef}} "{{{name}}}": dict((_k, _v) for _k, _v in obj.get("{{{baseName}}}").items()){{^-last}},{{/-last}} diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml index ac9df8980a4..128fc52b403 100644 --- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml @@ -2109,3 +2109,17 @@ components: - $ref: '#/components/schemas/RgbColor' - $ref: '#/components/schemas/RgbaColor' - $ref: '#/components/schemas/HexColor' + InnerDictWithProperty: + type: object + properties: + aProperty: + type: object + DictWithAdditionalProperties: + type: object + additionalProperties: + $ref: "#/components/schemas/InnerDictWithProperty" + ParentWithOptionalDict: + type: object + properties: + optionalDict: + $ref: "#/components/schemas/DictWithAdditionalProperties" diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES index 8e90f16b24f..5d9cf72b28b 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES @@ -39,6 +39,7 @@ docs/FooGetDefaultResponse.md docs/FormatTest.md docs/HasOnlyReadOnly.md docs/HealthCheckResult.md +docs/InnerDictWithProperty.md docs/List.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -55,6 +56,7 @@ docs/OuterEnumDefaultValue.md docs/OuterEnumInteger.md docs/OuterEnumIntegerDefaultValue.md docs/OuterObjectWithEnumProperty.md +docs/ParentWithOptionalDict.md docs/Pet.md docs/PetApi.md docs/Pig.md @@ -115,6 +117,7 @@ petstore_api/models/foo_get_default_response.py petstore_api/models/format_test.py petstore_api/models/has_only_read_only.py petstore_api/models/health_check_result.py +petstore_api/models/inner_dict_with_property.py petstore_api/models/list.py petstore_api/models/map_test.py petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -131,6 +134,7 @@ petstore_api/models/outer_enum_default_value.py petstore_api/models/outer_enum_integer.py petstore_api/models/outer_enum_integer_default_value.py petstore_api/models/outer_object_with_enum_property.py +petstore_api/models/parent_with_optional_dict.py petstore_api/models/pet.py petstore_api/models/pig.py petstore_api/models/read_only_first.py diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md index be281eb9946..9a72457e234 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md @@ -164,6 +164,7 @@ Class | Method | HTTP request | Description - [FormatTest](docs/FormatTest.md) - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md) - [HealthCheckResult](docs/HealthCheckResult.md) + - [InnerDictWithProperty](docs/InnerDictWithProperty.md) - [List](docs/List.md) - [MapTest](docs/MapTest.md) - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) @@ -180,6 +181,7 @@ Class | Method | HTTP request | Description - [OuterEnumInteger](docs/OuterEnumInteger.md) - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md) - [OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md) + - [ParentWithOptionalDict](docs/ParentWithOptionalDict.md) - [Pet](docs/Pet.md) - [Pig](docs/Pig.md) - [ReadOnlyFirst](docs/ReadOnlyFirst.md) diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/InnerDictWithProperty.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/InnerDictWithProperty.md new file mode 100644 index 00000000000..45d76ad458c --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/InnerDictWithProperty.md @@ -0,0 +1,28 @@ +# InnerDictWithProperty + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**a_property** | **object** | | [optional] + +## Example + +```python +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty + +# TODO update the JSON string below +json = "{}" +# create an instance of InnerDictWithProperty from a JSON string +inner_dict_with_property_instance = InnerDictWithProperty.from_json(json) +# print the JSON string representation of the object +print InnerDictWithProperty.to_json() + +# convert the object into a dict +inner_dict_with_property_dict = inner_dict_with_property_instance.to_dict() +# create an instance of InnerDictWithProperty from a dict +inner_dict_with_property_form_dict = inner_dict_with_property.from_dict(inner_dict_with_property_dict) +``` +[[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-nextgen-aiohttp/docs/ParentWithOptionalDict.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/ParentWithOptionalDict.md new file mode 100644 index 00000000000..04bf9494201 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/ParentWithOptionalDict.md @@ -0,0 +1,28 @@ +# ParentWithOptionalDict + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**optional_dict** | [**Dict[str, InnerDictWithProperty]**](InnerDictWithProperty.md) | | [optional] + +## Example + +```python +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict + +# TODO update the JSON string below +json = "{}" +# create an instance of ParentWithOptionalDict from a JSON string +parent_with_optional_dict_instance = ParentWithOptionalDict.from_json(json) +# print the JSON string representation of the object +print ParentWithOptionalDict.to_json() + +# convert the object into a dict +parent_with_optional_dict_dict = parent_with_optional_dict_instance.to_dict() +# create an instance of ParentWithOptionalDict from a dict +parent_with_optional_dict_form_dict = parent_with_optional_dict.from_dict(parent_with_optional_dict_dict) +``` +[[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-nextgen-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py index 4b74838606e..bbf50585f34 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py @@ -69,6 +69,7 @@ from petstore_api.models.foo_get_default_response import FooGetDefaultResponse from petstore_api.models.format_test import FormatTest from petstore_api.models.has_only_read_only import HasOnlyReadOnly from petstore_api.models.health_check_result import HealthCheckResult +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty from petstore_api.models.list import List from petstore_api.models.map_test import MapTest from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass @@ -85,6 +86,7 @@ from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue from petstore_api.models.outer_enum_integer import OuterEnumInteger from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict from petstore_api.models.pet import Pet from petstore_api.models.pig import Pig from petstore_api.models.read_only_first import ReadOnlyFirst diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py index c1bd7823cfb..5f313ba72ae 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py @@ -48,6 +48,7 @@ from petstore_api.models.foo_get_default_response import FooGetDefaultResponse from petstore_api.models.format_test import FormatTest from petstore_api.models.has_only_read_only import HasOnlyReadOnly from petstore_api.models.health_check_result import HealthCheckResult +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty from petstore_api.models.list import List from petstore_api.models.map_test import MapTest from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass @@ -64,6 +65,7 @@ from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue from petstore_api.models.outer_enum_integer import OuterEnumInteger from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict from petstore_api.models.pet import Pet from petstore_api.models.pig import Pig from petstore_api.models.read_only_first import ReadOnlyFirst diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/inner_dict_with_property.py new file mode 100644 index 00000000000..8bce01a25b4 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/inner_dict_with_property.py @@ -0,0 +1,70 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Any, Dict, Optional +from pydantic import BaseModel, Field + +class InnerDictWithProperty(BaseModel): + """ + InnerDictWithProperty + """ + a_property: Optional[Dict[str, Any]] = Field(None, alias="aProperty") + __properties = ["aProperty"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> InnerDictWithProperty: + """Create an instance of InnerDictWithProperty from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + }, + exclude_none=True) + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> InnerDictWithProperty: + """Create an instance of InnerDictWithProperty from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return InnerDictWithProperty.parse_obj(obj) + + _obj = InnerDictWithProperty.parse_obj({ + "a_property": obj.get("aProperty") + }) + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py index 01f82a8d827..28122bd3b75 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -76,7 +76,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): _obj = MixedPropertiesAndAdditionalPropertiesClass.parse_obj({ "uuid": obj.get("uuid"), "date_time": obj.get("dateTime"), - "map": dict((_k, Dict[str, Animal].from_dict(_v)) for _k, _v in obj.get("map").items()) + "map": dict((_k, Dict[str, Animal].from_dict(_v)) for _k, _v in obj.get("map").items()) if obj.get("map") is not None else None }) return _obj diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/parent_with_optional_dict.py new file mode 100644 index 00000000000..84843058284 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/parent_with_optional_dict.py @@ -0,0 +1,78 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Dict, Optional +from pydantic import BaseModel, Field +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty + +class ParentWithOptionalDict(BaseModel): + """ + ParentWithOptionalDict + """ + optional_dict: Optional[Dict[str, InnerDictWithProperty]] = Field(None, alias="optionalDict") + __properties = ["optionalDict"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> ParentWithOptionalDict: + """Create an instance of ParentWithOptionalDict from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + }, + exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of each value in optional_dict (dict) + _field_dict = {} + if self.optional_dict: + for _key in self.optional_dict: + if self.optional_dict[_key]: + _field_dict[_key] = self.optional_dict[_key].to_dict() + _dict['optionalDict'] = _field_dict + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> ParentWithOptionalDict: + """Create an instance of ParentWithOptionalDict from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return ParentWithOptionalDict.parse_obj(obj) + + _obj = ParentWithOptionalDict.parse_obj({ + "optional_dict": dict((_k, Dict[str, InnerDictWithProperty].from_dict(_v)) for _k, _v in obj.get("optionalDict").items()) if obj.get("optionalDict") is not None else None + }) + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_inner_dict_with_property.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_inner_dict_with_property.py new file mode 100644 index 00000000000..8a63b70d552 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_inner_dict_with_property.py @@ -0,0 +1,56 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty # noqa: E501 +from petstore_api.rest import ApiException + +class TestInnerDictWithProperty(unittest.TestCase): + """InnerDictWithProperty unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test InnerDictWithProperty + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `InnerDictWithProperty` + """ + model = petstore_api.models.inner_dict_with_property.InnerDictWithProperty() # noqa: E501 + if include_optional : + return InnerDictWithProperty( + a_property = None + ) + else : + return InnerDictWithProperty( + ) + """ + + def testInnerDictWithProperty(self): + """Test InnerDictWithProperty""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_parent_with_optional_dict.py new file mode 100644 index 00000000000..25b769e3d39 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_parent_with_optional_dict.py @@ -0,0 +1,59 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict # noqa: E501 +from petstore_api.rest import ApiException + +class TestParentWithOptionalDict(unittest.TestCase): + """ParentWithOptionalDict unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test ParentWithOptionalDict + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `ParentWithOptionalDict` + """ + model = petstore_api.models.parent_with_optional_dict.ParentWithOptionalDict() # noqa: E501 + if include_optional : + return ParentWithOptionalDict( + optional_dict = { + 'key' : petstore_api.models.inner_dict_with_property.InnerDictWithProperty( + a_property = petstore_api.models.a_property.aProperty(), ) + } + ) + else : + return ParentWithOptionalDict( + ) + """ + + def testParentWithOptionalDict(self): + """Test ParentWithOptionalDict""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES index 0bd7787dea2..c84577aa151 100755 --- a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES @@ -39,6 +39,7 @@ docs/FooGetDefaultResponse.md docs/FormatTest.md docs/HasOnlyReadOnly.md docs/HealthCheckResult.md +docs/InnerDictWithProperty.md docs/List.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -55,6 +56,7 @@ docs/OuterEnumDefaultValue.md docs/OuterEnumInteger.md docs/OuterEnumIntegerDefaultValue.md docs/OuterObjectWithEnumProperty.md +docs/ParentWithOptionalDict.md docs/Pet.md docs/PetApi.md docs/Pig.md @@ -115,6 +117,7 @@ petstore_api/models/foo_get_default_response.py petstore_api/models/format_test.py petstore_api/models/has_only_read_only.py petstore_api/models/health_check_result.py +petstore_api/models/inner_dict_with_property.py petstore_api/models/list.py petstore_api/models/map_test.py petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -131,6 +134,7 @@ petstore_api/models/outer_enum_default_value.py petstore_api/models/outer_enum_integer.py petstore_api/models/outer_enum_integer_default_value.py petstore_api/models/outer_object_with_enum_property.py +petstore_api/models/parent_with_optional_dict.py petstore_api/models/pet.py petstore_api/models/pig.py petstore_api/models/read_only_first.py diff --git a/samples/openapi3/client/petstore/python-nextgen/README.md b/samples/openapi3/client/petstore/python-nextgen/README.md index c5e730e2862..e64a6743b26 100755 --- a/samples/openapi3/client/petstore/python-nextgen/README.md +++ b/samples/openapi3/client/petstore/python-nextgen/README.md @@ -164,6 +164,7 @@ Class | Method | HTTP request | Description - [FormatTest](docs/FormatTest.md) - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md) - [HealthCheckResult](docs/HealthCheckResult.md) + - [InnerDictWithProperty](docs/InnerDictWithProperty.md) - [List](docs/List.md) - [MapTest](docs/MapTest.md) - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) @@ -180,6 +181,7 @@ Class | Method | HTTP request | Description - [OuterEnumInteger](docs/OuterEnumInteger.md) - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md) - [OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md) + - [ParentWithOptionalDict](docs/ParentWithOptionalDict.md) - [Pet](docs/Pet.md) - [Pig](docs/Pig.md) - [ReadOnlyFirst](docs/ReadOnlyFirst.md) diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/InnerDictWithProperty.md b/samples/openapi3/client/petstore/python-nextgen/docs/InnerDictWithProperty.md new file mode 100644 index 00000000000..45d76ad458c --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/docs/InnerDictWithProperty.md @@ -0,0 +1,28 @@ +# InnerDictWithProperty + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**a_property** | **object** | | [optional] + +## Example + +```python +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty + +# TODO update the JSON string below +json = "{}" +# create an instance of InnerDictWithProperty from a JSON string +inner_dict_with_property_instance = InnerDictWithProperty.from_json(json) +# print the JSON string representation of the object +print InnerDictWithProperty.to_json() + +# convert the object into a dict +inner_dict_with_property_dict = inner_dict_with_property_instance.to_dict() +# create an instance of InnerDictWithProperty from a dict +inner_dict_with_property_form_dict = inner_dict_with_property.from_dict(inner_dict_with_property_dict) +``` +[[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-nextgen/docs/ParentWithOptionalDict.md b/samples/openapi3/client/petstore/python-nextgen/docs/ParentWithOptionalDict.md new file mode 100644 index 00000000000..04bf9494201 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/docs/ParentWithOptionalDict.md @@ -0,0 +1,28 @@ +# ParentWithOptionalDict + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**optional_dict** | [**Dict[str, InnerDictWithProperty]**](InnerDictWithProperty.md) | | [optional] + +## Example + +```python +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict + +# TODO update the JSON string below +json = "{}" +# create an instance of ParentWithOptionalDict from a JSON string +parent_with_optional_dict_instance = ParentWithOptionalDict.from_json(json) +# print the JSON string representation of the object +print ParentWithOptionalDict.to_json() + +# convert the object into a dict +parent_with_optional_dict_dict = parent_with_optional_dict_instance.to_dict() +# create an instance of ParentWithOptionalDict from a dict +parent_with_optional_dict_form_dict = parent_with_optional_dict.from_dict(parent_with_optional_dict_dict) +``` +[[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-nextgen/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py index 4b74838606e..bbf50585f34 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py @@ -69,6 +69,7 @@ from petstore_api.models.foo_get_default_response import FooGetDefaultResponse from petstore_api.models.format_test import FormatTest from petstore_api.models.has_only_read_only import HasOnlyReadOnly from petstore_api.models.health_check_result import HealthCheckResult +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty from petstore_api.models.list import List from petstore_api.models.map_test import MapTest from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass @@ -85,6 +86,7 @@ from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue from petstore_api.models.outer_enum_integer import OuterEnumInteger from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict from petstore_api.models.pet import Pet from petstore_api.models.pig import Pig from petstore_api.models.read_only_first import ReadOnlyFirst diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py index c1bd7823cfb..5f313ba72ae 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py @@ -48,6 +48,7 @@ from petstore_api.models.foo_get_default_response import FooGetDefaultResponse from petstore_api.models.format_test import FormatTest from petstore_api.models.has_only_read_only import HasOnlyReadOnly from petstore_api.models.health_check_result import HealthCheckResult +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty from petstore_api.models.list import List from petstore_api.models.map_test import MapTest from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass @@ -64,6 +65,7 @@ from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue from petstore_api.models.outer_enum_integer import OuterEnumInteger from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict from petstore_api.models.pet import Pet from petstore_api.models.pig import Pig from petstore_api.models.read_only_first import ReadOnlyFirst diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/inner_dict_with_property.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/inner_dict_with_property.py new file mode 100644 index 00000000000..23cc8e6a3a1 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/inner_dict_with_property.py @@ -0,0 +1,82 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Any, Dict, Optional +from pydantic import BaseModel, Field + +class InnerDictWithProperty(BaseModel): + """ + InnerDictWithProperty + """ + a_property: Optional[Dict[str, Any]] = Field(None, alias="aProperty") + additional_properties: Dict[str, Any] = {} + __properties = ["aProperty"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> InnerDictWithProperty: + """Create an instance of InnerDictWithProperty from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + "additional_properties" + }, + exclude_none=True) + # puts key-value pairs in additional_properties in the top level + if self.additional_properties is not None: + for _key, _value in self.additional_properties.items(): + _dict[_key] = _value + + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> InnerDictWithProperty: + """Create an instance of InnerDictWithProperty from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return InnerDictWithProperty.parse_obj(obj) + + _obj = InnerDictWithProperty.parse_obj({ + "a_property": obj.get("aProperty") + }) + # store additional fields in additional_properties + for _key in obj.keys(): + if _key not in cls.__properties: + _obj.additional_properties[_key] = obj.get(_key) + + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py index b3b259b688f..2ea8cad7e4f 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -83,7 +83,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): _obj = MixedPropertiesAndAdditionalPropertiesClass.parse_obj({ "uuid": obj.get("uuid"), "date_time": obj.get("dateTime"), - "map": dict((_k, Dict[str, Animal].from_dict(_v)) for _k, _v in obj.get("map").items()) + "map": dict((_k, Dict[str, Animal].from_dict(_v)) for _k, _v in obj.get("map").items()) if obj.get("map") is not None else None }) # store additional fields in additional_properties for _key in obj.keys(): diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/parent_with_optional_dict.py new file mode 100644 index 00000000000..3e9e08375b8 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/parent_with_optional_dict.py @@ -0,0 +1,90 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Dict, Optional +from pydantic import BaseModel, Field +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty + +class ParentWithOptionalDict(BaseModel): + """ + ParentWithOptionalDict + """ + optional_dict: Optional[Dict[str, InnerDictWithProperty]] = Field(None, alias="optionalDict") + additional_properties: Dict[str, Any] = {} + __properties = ["optionalDict"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> ParentWithOptionalDict: + """Create an instance of ParentWithOptionalDict from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + "additional_properties" + }, + exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of each value in optional_dict (dict) + _field_dict = {} + if self.optional_dict: + for _key in self.optional_dict: + if self.optional_dict[_key]: + _field_dict[_key] = self.optional_dict[_key].to_dict() + _dict['optionalDict'] = _field_dict + # puts key-value pairs in additional_properties in the top level + if self.additional_properties is not None: + for _key, _value in self.additional_properties.items(): + _dict[_key] = _value + + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> ParentWithOptionalDict: + """Create an instance of ParentWithOptionalDict from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return ParentWithOptionalDict.parse_obj(obj) + + _obj = ParentWithOptionalDict.parse_obj({ + "optional_dict": dict((_k, Dict[str, InnerDictWithProperty].from_dict(_v)) for _k, _v in obj.get("optionalDict").items()) if obj.get("optionalDict") is not None else None + }) + # store additional fields in additional_properties + for _key in obj.keys(): + if _key not in cls.__properties: + _obj.additional_properties[_key] = obj.get(_key) + + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen/test/test_inner_dict_with_property.py b/samples/openapi3/client/petstore/python-nextgen/test/test_inner_dict_with_property.py new file mode 100644 index 00000000000..8a63b70d552 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/test/test_inner_dict_with_property.py @@ -0,0 +1,56 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.inner_dict_with_property import InnerDictWithProperty # noqa: E501 +from petstore_api.rest import ApiException + +class TestInnerDictWithProperty(unittest.TestCase): + """InnerDictWithProperty unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test InnerDictWithProperty + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `InnerDictWithProperty` + """ + model = petstore_api.models.inner_dict_with_property.InnerDictWithProperty() # noqa: E501 + if include_optional : + return InnerDictWithProperty( + a_property = None + ) + else : + return InnerDictWithProperty( + ) + """ + + def testInnerDictWithProperty(self): + """Test InnerDictWithProperty""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen/test/test_parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-nextgen/test/test_parent_with_optional_dict.py new file mode 100644 index 00000000000..25b769e3d39 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/test/test_parent_with_optional_dict.py @@ -0,0 +1,59 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict # noqa: E501 +from petstore_api.rest import ApiException + +class TestParentWithOptionalDict(unittest.TestCase): + """ParentWithOptionalDict unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test ParentWithOptionalDict + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `ParentWithOptionalDict` + """ + model = petstore_api.models.parent_with_optional_dict.ParentWithOptionalDict() # noqa: E501 + if include_optional : + return ParentWithOptionalDict( + optional_dict = { + 'key' : petstore_api.models.inner_dict_with_property.InnerDictWithProperty( + a_property = petstore_api.models.a_property.aProperty(), ) + } + ) + else : + return ParentWithOptionalDict( + ) + """ + + def testParentWithOptionalDict(self): + """Test ParentWithOptionalDict""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py index 3fbcbc493ac..29f332642b2 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py @@ -387,3 +387,9 @@ class ModelTests(unittest.TestCase): enum_test = petstore_api.EnumTest(enum_string_required="lower") self.assertEqual(enum_test.enum_integer_default, 5) + def test_object_with_optional_dict(self): + # for https://github.com/OpenAPITools/openapi-generator/issues/14913 + # shouldn't throw exception by the optional dict property + a = petstore_api.ParentWithOptionalDict.from_dict({}) + self.assertFalse(a is None) + From 849708dc0dde9a676435912d424f4694ff8286a5 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 22 Mar 2023 00:13:23 +0800 Subject: [PATCH 072/131] better null check in import logic (default codegen) (#14989) --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 758ea86e33e..241e0626b78 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 @@ -5618,6 +5618,10 @@ public class DefaultCodegen implements CodegenConfig { * @param modelName model name */ protected void addImport(ComposedSchema composed, Schema childSchema, CodegenModel model, String modelName ) { + if (composed == null || childSchema == null) { + return; + } + // import only if it's not allOf composition schema (without discriminator) if (!(composed.getAllOf() != null && childSchema.getDiscriminator() == null)) { addImport(model, modelName); From fc91fca737c4a1a162f7438dfb1fb290087e7065 Mon Sep 17 00:00:00 2001 From: David Weinstein Date: Tue, 21 Mar 2023 12:23:57 -0400 Subject: [PATCH 073/131] [erlang-client] fix URL paths (#14988) * integers parameters in URL did not work as expected * so now, if the parameter is an integer, we convert it to binary before passing to `hackney_url:make_url/3` --- .../main/resources/erlang-client/api.mustache | 4 +- .../resources/erlang-client/utils.mustache | 11 +++++- .../erlang-client/.openapi-generator/VERSION | 2 +- .../erlang-client/src/petstore_pet_api.erl | 37 +++++++++++-------- .../erlang-client/src/petstore_store_api.erl | 17 +++++---- .../erlang-client/src/petstore_user_api.erl | 37 +++++++++++-------- .../erlang-client/src/petstore_utils.erl | 19 +++++++--- 7 files changed, 78 insertions(+), 49 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/erlang-client/api.mustache b/modules/openapi-generator/src/main/resources/erlang-client/api.mustache index 04019e4439d..292cff3fb52 100644 --- a/modules/openapi-generator/src/main/resources/erlang-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/erlang-client/api.mustache @@ -21,14 +21,14 @@ Cfg = maps:get(cfg, Optional, application:get_env({{packageName}}_api, config, #{})), Method = {{httpMethod}}, - Path = ["{{{replacedPathName}}}"], + Path = [?BASE_URL, "{{{replacedPathName}}}"], QS = {{#queryParams.isEmpty}}[]{{/queryParams.isEmpty}}{{^queryParams.isEmpty}}lists:flatten([{{#joinWithComma}}{{#queryParams}}{{#required}}{{#qsEncode}}{{this}}{{/qsEncode}} {{/required}}{{/queryParams}}{{/joinWithComma}}])++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#queryParams}}{{^required}} '{{baseName}}'{{/required}}{{/queryParams}}{{/joinWithComma}}], _OptionalParams){{/queryParams.isEmpty}}, Headers = {{#headerParams.isEmpty}}[]{{/headerParams.isEmpty}}{{^headerParams.isEmpty}}[{{#headerParams}}{{#required}} {<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/headerParams}}]++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#headerParams}}{{^required}} '{{baseName}}'{{/required}}{{/headerParams}}{{/joinWithComma}}], _OptionalParams){{/headerParams.isEmpty}}, Body1 = {{^formParams.isEmpty}}{form, [{{#joinWithComma}}{{#formParams}}{{#required}} {<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/formParams}}{{/joinWithComma}}]++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#formParams}}{{^required}} '{{baseName}}'{{/required}}{{/formParams}}{{/joinWithComma}}], _OptionalParams)}{{/formParams.isEmpty}}{{#formParams.isEmpty}}{{#bodyParams.isEmpty}}[]{{/bodyParams.isEmpty}}{{^bodyParams.isEmpty}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/bodyParams.isEmpty}}{{/formParams.isEmpty}}, ContentTypeHeader = {{packageName}}_utils:select_header_content_type([{{#consumes}}{{^-first}}, {{/-first}}<<"{{mediaType}}">>{{/consumes}}]), Opts = maps:get(hackney_opts, Optional, []), - {{packageName}}_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + {{packageName}}_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/erlang-client/utils.mustache b/modules/openapi-generator/src/main/resources/erlang-client/utils.mustache index 6336a321e67..ed3d3e109b1 100644 --- a/modules/openapi-generator/src/main/resources/erlang-client/utils.mustache +++ b/modules/openapi-generator/src/main/resources/erlang-client/utils.mustache @@ -11,7 +11,8 @@ request(_Ctx, Method, Path, QS, Headers, Body, Opts, Cfg) -> {Headers1, QS1} = update_params_with_auth(Cfg, Headers, QS), Host = maps:get(host, Cfg, "localhost:8001"), - Url = hackney_url:make_url(Host, Path, QS1), + Path1 = prepare_path(Path), + Url = hackney_url:make_url(Host, Path1, QS1), ConfigHackneyOpts = maps:get(hackney_opts, Cfg, []), Body1 = case lists:keyfind(<<"Content-Type">>, 1, Headers1) of @@ -38,6 +39,14 @@ request(_Ctx, Method, Path, QS, Headers, Body, Opts, Cfg) -> headers => RespHeaders}} end. +prepare_path(Path) -> + lists:map(fun convert/1, Path). + +convert(PathPart) when is_integer(PathPart) -> + integer_to_binary(PathPart); +convert(PathPart) when is_list(PathPart) or is_binary(PathPart) -> + PathPart. + decode_response(Headers, Body) -> case lists:keyfind(<<"Content-Type">>, 1, Headers) of {_, <<"application/json", _/binary>>} -> diff --git a/samples/client/petstore/erlang-client/.openapi-generator/VERSION b/samples/client/petstore/erlang-client/.openapi-generator/VERSION index 7f4d792ec2c..4b448de535c 100644 --- a/samples/client/petstore/erlang-client/.openapi-generator/VERSION +++ b/samples/client/petstore/erlang-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +5.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/erlang-client/src/petstore_pet_api.erl b/samples/client/petstore/erlang-client/src/petstore_pet_api.erl index c4df7b91ac6..e406257a76e 100644 --- a/samples/client/petstore/erlang-client/src/petstore_pet_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_pet_api.erl @@ -12,6 +12,7 @@ -define(BASE_URL, <<"/v2">>). %% @doc Add a new pet to the store +%% -spec add_pet(ctx:ctx(), petstore_pet:petstore_pet()) -> {ok, petstore_pet:petstore_pet(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. add_pet(Ctx, PetstorePet) -> add_pet(Ctx, PetstorePet, #{}). @@ -22,16 +23,17 @@ add_pet(Ctx, PetstorePet, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = ["/pet"], + Path = [?BASE_URL, "/pet"], QS = [], Headers = [], Body1 = PetstorePet, ContentTypeHeader = petstore_utils:select_header_content_type([<<"application/json">>, <<"application/xml">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Deletes a pet +%% -spec delete_pet(ctx:ctx(), integer()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. delete_pet(Ctx, PetId) -> delete_pet(Ctx, PetId, #{}). @@ -42,14 +44,14 @@ delete_pet(Ctx, PetId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = delete, - Path = ["/pet/", PetId, ""], + Path = [?BASE_URL, "/pet/", PetId, ""], QS = [], Headers = []++petstore_utils:optional_params(['api_key'], _OptionalParams), Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Finds Pets by status %% Multiple status values can be provided with comma separated strings @@ -63,14 +65,14 @@ find_pets_by_status(Ctx, Status, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = ["/pet/findByStatus"], + Path = [?BASE_URL, "/pet/findByStatus"], QS = lists:flatten([[{<<"status">>, X} || X <- Status]])++petstore_utils:optional_params([], _OptionalParams), Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Finds Pets by tags %% Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. @@ -84,14 +86,14 @@ find_pets_by_tags(Ctx, Tags, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = ["/pet/findByTags"], + Path = [?BASE_URL, "/pet/findByTags"], QS = lists:flatten([[{<<"tags">>, X} || X <- Tags]])++petstore_utils:optional_params([], _OptionalParams), Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Find pet by ID %% Returns a single pet @@ -105,16 +107,17 @@ get_pet_by_id(Ctx, PetId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = ["/pet/", PetId, ""], + Path = [?BASE_URL, "/pet/", PetId, ""], QS = [], Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Update an existing pet +%% -spec update_pet(ctx:ctx(), petstore_pet:petstore_pet()) -> {ok, petstore_pet:petstore_pet(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. update_pet(Ctx, PetstorePet) -> update_pet(Ctx, PetstorePet, #{}). @@ -125,16 +128,17 @@ update_pet(Ctx, PetstorePet, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = put, - Path = ["/pet"], + Path = [?BASE_URL, "/pet"], QS = [], Headers = [], Body1 = PetstorePet, ContentTypeHeader = petstore_utils:select_header_content_type([<<"application/json">>, <<"application/xml">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Updates a pet in the store with form data +%% -spec update_pet_with_form(ctx:ctx(), integer()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. update_pet_with_form(Ctx, PetId) -> update_pet_with_form(Ctx, PetId, #{}). @@ -145,16 +149,17 @@ update_pet_with_form(Ctx, PetId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = ["/pet/", PetId, ""], + Path = [?BASE_URL, "/pet/", PetId, ""], QS = [], Headers = [], Body1 = {form, []++petstore_utils:optional_params(['name', 'status'], _OptionalParams)}, ContentTypeHeader = petstore_utils:select_header_content_type([<<"application/x-www-form-urlencoded">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc uploads an image +%% -spec upload_file(ctx:ctx(), integer()) -> {ok, petstore_api_response:petstore_api_response(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. upload_file(Ctx, PetId) -> upload_file(Ctx, PetId, #{}). @@ -165,13 +170,13 @@ upload_file(Ctx, PetId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = ["/pet/", PetId, "/uploadImage"], + Path = [?BASE_URL, "/pet/", PetId, "/uploadImage"], QS = [], Headers = [], Body1 = {form, []++petstore_utils:optional_params(['additionalMetadata', 'file'], _OptionalParams)}, ContentTypeHeader = petstore_utils:select_header_content_type([<<"multipart/form-data">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). diff --git a/samples/client/petstore/erlang-client/src/petstore_store_api.erl b/samples/client/petstore/erlang-client/src/petstore_store_api.erl index 5bebc5574ad..bc45dce6a7d 100644 --- a/samples/client/petstore/erlang-client/src/petstore_store_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_store_api.erl @@ -19,14 +19,14 @@ delete_order(Ctx, OrderId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = delete, - Path = ["/store/order/", OrderId, ""], + Path = [?BASE_URL, "/store/order/", OrderId, ""], QS = [], Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Returns pet inventories by status %% Returns a map of status codes to quantities @@ -40,14 +40,14 @@ get_inventory(Ctx, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = ["/store/inventory"], + Path = [?BASE_URL, "/store/inventory"], QS = [], Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Find purchase order by ID %% For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions @@ -61,16 +61,17 @@ get_order_by_id(Ctx, OrderId, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = ["/store/order/", OrderId, ""], + Path = [?BASE_URL, "/store/order/", OrderId, ""], QS = [], Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Place an order for a pet +%% -spec place_order(ctx:ctx(), petstore_order:petstore_order()) -> {ok, petstore_order:petstore_order(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. place_order(Ctx, PetstoreOrder) -> place_order(Ctx, PetstoreOrder, #{}). @@ -81,13 +82,13 @@ place_order(Ctx, PetstoreOrder, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = ["/store/order"], + Path = [?BASE_URL, "/store/order"], QS = [], Headers = [], Body1 = PetstoreOrder, ContentTypeHeader = petstore_utils:select_header_content_type([<<"application/json">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). diff --git a/samples/client/petstore/erlang-client/src/petstore_user_api.erl b/samples/client/petstore/erlang-client/src/petstore_user_api.erl index 6f6a5b13593..14c52af676f 100644 --- a/samples/client/petstore/erlang-client/src/petstore_user_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_user_api.erl @@ -23,16 +23,17 @@ create_user(Ctx, PetstoreUser, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = ["/user"], + Path = [?BASE_URL, "/user"], QS = [], Headers = [], Body1 = PetstoreUser, ContentTypeHeader = petstore_utils:select_header_content_type([<<"application/json">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Creates list of users with given input array +%% -spec create_users_with_array_input(ctx:ctx(), list()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. create_users_with_array_input(Ctx, PetstoreUserArray) -> create_users_with_array_input(Ctx, PetstoreUserArray, #{}). @@ -43,16 +44,17 @@ create_users_with_array_input(Ctx, PetstoreUserArray, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = ["/user/createWithArray"], + Path = [?BASE_URL, "/user/createWithArray"], QS = [], Headers = [], Body1 = PetstoreUserArray, ContentTypeHeader = petstore_utils:select_header_content_type([<<"application/json">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Creates list of users with given input array +%% -spec create_users_with_list_input(ctx:ctx(), list()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. create_users_with_list_input(Ctx, PetstoreUserArray) -> create_users_with_list_input(Ctx, PetstoreUserArray, #{}). @@ -63,14 +65,14 @@ create_users_with_list_input(Ctx, PetstoreUserArray, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = post, - Path = ["/user/createWithList"], + Path = [?BASE_URL, "/user/createWithList"], QS = [], Headers = [], Body1 = PetstoreUserArray, ContentTypeHeader = petstore_utils:select_header_content_type([<<"application/json">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Delete user %% This can only be done by the logged in user. @@ -84,16 +86,17 @@ delete_user(Ctx, Username, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = delete, - Path = ["/user/", Username, ""], + Path = [?BASE_URL, "/user/", Username, ""], QS = [], Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Get user by user name +%% -spec get_user_by_name(ctx:ctx(), binary()) -> {ok, petstore_user:petstore_user(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. get_user_by_name(Ctx, Username) -> get_user_by_name(Ctx, Username, #{}). @@ -104,16 +107,17 @@ get_user_by_name(Ctx, Username, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = ["/user/", Username, ""], + Path = [?BASE_URL, "/user/", Username, ""], QS = [], Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Logs user into the system +%% -spec login_user(ctx:ctx(), binary(), binary()) -> {ok, binary(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. login_user(Ctx, Username, Password) -> login_user(Ctx, Username, Password, #{}). @@ -124,16 +128,17 @@ login_user(Ctx, Username, Password, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = ["/user/login"], + Path = [?BASE_URL, "/user/login"], QS = lists:flatten([{<<"username">>, Username}, {<<"password">>, Password}])++petstore_utils:optional_params([], _OptionalParams), Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Logs out current logged in user session +%% -spec logout_user(ctx:ctx()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. logout_user(Ctx) -> logout_user(Ctx, #{}). @@ -144,14 +149,14 @@ logout_user(Ctx, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = get, - Path = ["/user/logout"], + Path = [?BASE_URL, "/user/logout"], QS = [], Headers = [], Body1 = [], ContentTypeHeader = petstore_utils:select_header_content_type([]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Updated user %% This can only be done by the logged in user. @@ -165,13 +170,13 @@ update_user(Ctx, Username, PetstoreUser, Optional) -> Cfg = maps:get(cfg, Optional, application:get_env(petstore_api, config, #{})), Method = put, - Path = ["/user/", Username, ""], + Path = [?BASE_URL, "/user/", Username, ""], QS = [], Headers = [], Body1 = PetstoreUser, ContentTypeHeader = petstore_utils:select_header_content_type([<<"application/json">>]), Opts = maps:get(hackney_opts, Optional, []), - petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). + petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). diff --git a/samples/client/petstore/erlang-client/src/petstore_utils.erl b/samples/client/petstore/erlang-client/src/petstore_utils.erl index 24598b36764..e2d843841f9 100644 --- a/samples/client/petstore/erlang-client/src/petstore_utils.erl +++ b/samples/client/petstore/erlang-client/src/petstore_utils.erl @@ -11,7 +11,8 @@ request(_Ctx, Method, Path, QS, Headers, Body, Opts, Cfg) -> {Headers1, QS1} = update_params_with_auth(Cfg, Headers, QS), Host = maps:get(host, Cfg, "localhost:8001"), - Url = hackney_url:make_url(Host, Path, QS1), + Path1 = prepare_path(Path), + Url = hackney_url:make_url(Host, Path1, QS1), ConfigHackneyOpts = maps:get(hackney_opts, Cfg, []), Body1 = case lists:keyfind(<<"Content-Type">>, 1, Headers1) of @@ -38,6 +39,14 @@ request(_Ctx, Method, Path, QS, Headers, Body, Opts, Cfg) -> headers => RespHeaders}} end. +prepare_path(Path) -> + lists:map(fun convert/1, Path). + +convert(PathPart) when is_integer(PathPart) -> + integer_to_binary(PathPart); +convert(PathPart) when is_list(PathPart) or is_binary(PathPart) -> + PathPart. + decode_response(Headers, Body) -> case lists:keyfind(<<"Content-Type">>, 1, Headers) of {_, <<"application/json", _/binary>>} -> @@ -72,12 +81,12 @@ auth_with_prefix(Cfg, Key, Token) -> update_params_with_auth(Cfg, Headers, QS) -> AuthSettings = maps:get(auth, Cfg, #{}), - Auths = #{ 'petstore_auth' => - #{type => 'oauth2', - key => <<"Authorization">>, - in => header}, 'api_key' => + Auths = #{ 'api_key' => #{type => 'apiKey', key => <<"api_key">>, + in => header}, 'petstore_auth' => + #{type => 'oauth2', + key => <<"Authorization">>, in => header}}, maps:fold(fun(AuthName, #{type := _Type, From 38d9dc1f36bf5b1f1d5ccd1ee1e25ebdab68ada3 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 22 Mar 2023 00:26:36 +0800 Subject: [PATCH 074/131] update erlang samples --- .../petstore/erlang-client/.openapi-generator/VERSION | 2 +- .../petstore/erlang-client/src/petstore_pet_api.erl | 5 ----- .../petstore/erlang-client/src/petstore_store_api.erl | 1 - .../petstore/erlang-client/src/petstore_user_api.erl | 5 ----- .../client/petstore/erlang-client/src/petstore_utils.erl | 8 ++++---- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/samples/client/petstore/erlang-client/.openapi-generator/VERSION b/samples/client/petstore/erlang-client/.openapi-generator/VERSION index 4b448de535c..7f4d792ec2c 100644 --- a/samples/client/petstore/erlang-client/.openapi-generator/VERSION +++ b/samples/client/petstore/erlang-client/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.5.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/erlang-client/src/petstore_pet_api.erl b/samples/client/petstore/erlang-client/src/petstore_pet_api.erl index e406257a76e..7466253bb67 100644 --- a/samples/client/petstore/erlang-client/src/petstore_pet_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_pet_api.erl @@ -12,7 +12,6 @@ -define(BASE_URL, <<"/v2">>). %% @doc Add a new pet to the store -%% -spec add_pet(ctx:ctx(), petstore_pet:petstore_pet()) -> {ok, petstore_pet:petstore_pet(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. add_pet(Ctx, PetstorePet) -> add_pet(Ctx, PetstorePet, #{}). @@ -33,7 +32,6 @@ add_pet(Ctx, PetstorePet, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Deletes a pet -%% -spec delete_pet(ctx:ctx(), integer()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. delete_pet(Ctx, PetId) -> delete_pet(Ctx, PetId, #{}). @@ -117,7 +115,6 @@ get_pet_by_id(Ctx, PetId, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Update an existing pet -%% -spec update_pet(ctx:ctx(), petstore_pet:petstore_pet()) -> {ok, petstore_pet:petstore_pet(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. update_pet(Ctx, PetstorePet) -> update_pet(Ctx, PetstorePet, #{}). @@ -138,7 +135,6 @@ update_pet(Ctx, PetstorePet, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Updates a pet in the store with form data -%% -spec update_pet_with_form(ctx:ctx(), integer()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. update_pet_with_form(Ctx, PetId) -> update_pet_with_form(Ctx, PetId, #{}). @@ -159,7 +155,6 @@ update_pet_with_form(Ctx, PetId, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc uploads an image -%% -spec upload_file(ctx:ctx(), integer()) -> {ok, petstore_api_response:petstore_api_response(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. upload_file(Ctx, PetId) -> upload_file(Ctx, PetId, #{}). diff --git a/samples/client/petstore/erlang-client/src/petstore_store_api.erl b/samples/client/petstore/erlang-client/src/petstore_store_api.erl index bc45dce6a7d..6000a98469b 100644 --- a/samples/client/petstore/erlang-client/src/petstore_store_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_store_api.erl @@ -71,7 +71,6 @@ get_order_by_id(Ctx, OrderId, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Place an order for a pet -%% -spec place_order(ctx:ctx(), petstore_order:petstore_order()) -> {ok, petstore_order:petstore_order(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. place_order(Ctx, PetstoreOrder) -> place_order(Ctx, PetstoreOrder, #{}). diff --git a/samples/client/petstore/erlang-client/src/petstore_user_api.erl b/samples/client/petstore/erlang-client/src/petstore_user_api.erl index 14c52af676f..b1fea505c62 100644 --- a/samples/client/petstore/erlang-client/src/petstore_user_api.erl +++ b/samples/client/petstore/erlang-client/src/petstore_user_api.erl @@ -33,7 +33,6 @@ create_user(Ctx, PetstoreUser, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Creates list of users with given input array -%% -spec create_users_with_array_input(ctx:ctx(), list()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. create_users_with_array_input(Ctx, PetstoreUserArray) -> create_users_with_array_input(Ctx, PetstoreUserArray, #{}). @@ -54,7 +53,6 @@ create_users_with_array_input(Ctx, PetstoreUserArray, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Creates list of users with given input array -%% -spec create_users_with_list_input(ctx:ctx(), list()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. create_users_with_list_input(Ctx, PetstoreUserArray) -> create_users_with_list_input(Ctx, PetstoreUserArray, #{}). @@ -96,7 +94,6 @@ delete_user(Ctx, Username, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Get user by user name -%% -spec get_user_by_name(ctx:ctx(), binary()) -> {ok, petstore_user:petstore_user(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. get_user_by_name(Ctx, Username) -> get_user_by_name(Ctx, Username, #{}). @@ -117,7 +114,6 @@ get_user_by_name(Ctx, Username, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Logs user into the system -%% -spec login_user(ctx:ctx(), binary(), binary()) -> {ok, binary(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. login_user(Ctx, Username, Password) -> login_user(Ctx, Username, Password, #{}). @@ -138,7 +134,6 @@ login_user(Ctx, Username, Password, Optional) -> petstore_utils:request(Ctx, Method, Path, QS, ContentTypeHeader++Headers, Body1, Opts, Cfg). %% @doc Logs out current logged in user session -%% -spec logout_user(ctx:ctx()) -> {ok, [], petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}. logout_user(Ctx) -> logout_user(Ctx, #{}). diff --git a/samples/client/petstore/erlang-client/src/petstore_utils.erl b/samples/client/petstore/erlang-client/src/petstore_utils.erl index e2d843841f9..ec44cf3068b 100644 --- a/samples/client/petstore/erlang-client/src/petstore_utils.erl +++ b/samples/client/petstore/erlang-client/src/petstore_utils.erl @@ -81,12 +81,12 @@ auth_with_prefix(Cfg, Key, Token) -> update_params_with_auth(Cfg, Headers, QS) -> AuthSettings = maps:get(auth, Cfg, #{}), - Auths = #{ 'api_key' => - #{type => 'apiKey', - key => <<"api_key">>, - in => header}, 'petstore_auth' => + Auths = #{ 'petstore_auth' => #{type => 'oauth2', key => <<"Authorization">>, + in => header}, 'api_key' => + #{type => 'apiKey', + key => <<"api_key">>, in => header}}, maps:fold(fun(AuthName, #{type := _Type, From 1c75997677bbe889701f5750188e2a62f52cc642 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 22 Mar 2023 02:08:31 +0800 Subject: [PATCH 075/131] fix optional dict of object (#15018) --- .../src/main/resources/python-nextgen/model_generic.mustache | 2 +- .../models/mixed_properties_and_additional_properties_class.py | 2 +- .../petstore_api/models/parent_with_optional_dict.py | 2 +- .../models/mixed_properties_and_additional_properties_class.py | 2 +- .../petstore_api/models/parent_with_optional_dict.py | 2 +- .../client/petstore/python-nextgen/tests/test_model.py | 3 +++ 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache index 6e27b44bb2f..ee8118cbc04 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache @@ -220,7 +220,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}} {{#isMap}} {{^items.isPrimitiveType}} {{^items.isEnumOrRef}} - "{{{name}}}": dict((_k, {{{dataType}}}.from_dict(_v)) for _k, _v in obj.get("{{{baseName}}}").items()) if obj.get("{{{baseName}}}") is not None else None{{^-last}},{{/-last}} + "{{{name}}}": dict((_k, {{{items.dataType}}}.from_dict(_v)) for _k, _v in obj.get("{{{baseName}}}").items()) if obj.get("{{{baseName}}}") is not None else None{{^-last}},{{/-last}} {{/items.isEnumOrRef}} {{#items.isEnumOrRef}} "{{{name}}}": dict((_k, _v) for _k, _v in obj.get("{{{baseName}}}").items()){{^-last}},{{/-last}} diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py index 28122bd3b75..5c96c891435 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -76,7 +76,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): _obj = MixedPropertiesAndAdditionalPropertiesClass.parse_obj({ "uuid": obj.get("uuid"), "date_time": obj.get("dateTime"), - "map": dict((_k, Dict[str, Animal].from_dict(_v)) for _k, _v in obj.get("map").items()) if obj.get("map") is not None else None + "map": dict((_k, Animal.from_dict(_v)) for _k, _v in obj.get("map").items()) if obj.get("map") is not None else None }) return _obj diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/parent_with_optional_dict.py index 84843058284..e886b75bd08 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/parent_with_optional_dict.py @@ -72,7 +72,7 @@ class ParentWithOptionalDict(BaseModel): return ParentWithOptionalDict.parse_obj(obj) _obj = ParentWithOptionalDict.parse_obj({ - "optional_dict": dict((_k, Dict[str, InnerDictWithProperty].from_dict(_v)) for _k, _v in obj.get("optionalDict").items()) if obj.get("optionalDict") is not None else None + "optional_dict": dict((_k, InnerDictWithProperty.from_dict(_v)) for _k, _v in obj.get("optionalDict").items()) if obj.get("optionalDict") is not None else None }) return _obj diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py index 2ea8cad7e4f..cd9c0204841 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/mixed_properties_and_additional_properties_class.py @@ -83,7 +83,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(BaseModel): _obj = MixedPropertiesAndAdditionalPropertiesClass.parse_obj({ "uuid": obj.get("uuid"), "date_time": obj.get("dateTime"), - "map": dict((_k, Dict[str, Animal].from_dict(_v)) for _k, _v in obj.get("map").items()) if obj.get("map") is not None else None + "map": dict((_k, Animal.from_dict(_v)) for _k, _v in obj.get("map").items()) if obj.get("map") is not None else None }) # store additional fields in additional_properties for _key in obj.keys(): diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/parent_with_optional_dict.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/parent_with_optional_dict.py index 3e9e08375b8..9c18456d3b8 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/parent_with_optional_dict.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/parent_with_optional_dict.py @@ -79,7 +79,7 @@ class ParentWithOptionalDict(BaseModel): return ParentWithOptionalDict.parse_obj(obj) _obj = ParentWithOptionalDict.parse_obj({ - "optional_dict": dict((_k, Dict[str, InnerDictWithProperty].from_dict(_v)) for _k, _v in obj.get("optionalDict").items()) if obj.get("optionalDict") is not None else None + "optional_dict": dict((_k, InnerDictWithProperty.from_dict(_v)) for _k, _v in obj.get("optionalDict").items()) if obj.get("optionalDict") is not None else None }) # store additional fields in additional_properties for _key in obj.keys(): diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py index 29f332642b2..935c489dada 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py @@ -393,3 +393,6 @@ class ModelTests(unittest.TestCase): a = petstore_api.ParentWithOptionalDict.from_dict({}) self.assertFalse(a is None) + b = petstore_api.ParentWithOptionalDict.from_dict({"optionalDict": {"key": {"aProperty": {"a": "b"}}}}) + self.assertFalse(b is None) + self.assertEqual(b.optional_dict["key"].a_property["a"], "b") From a60100245135a4591e99637f2de4d474cc4c539b Mon Sep 17 00:00:00 2001 From: Kuzma <57258237+ksvirkou-hubspot@users.noreply.github.com> Date: Wed, 22 Mar 2023 17:19:17 +0300 Subject: [PATCH 076/131] [Typescript] Nullable (#15026) --- .../codegen/languages/TypeScriptClientCodegen.java | 6 +++++- .../src/main/resources/typescript/model/model.mustache | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java index 64a8f256e3a..d346d903063 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java @@ -887,7 +887,11 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return this.getSchemaType(p) + "<" + this.getTypeDeclaration(unaliasSchema(inner)) + ">"; } else if (ModelUtils.isMapSchema(p)) { inner = getSchemaAdditionalProperties(p); - return "{ [key: string]: " + this.getTypeDeclaration(unaliasSchema(inner)) + "; }"; + String postfix = ""; + if (Boolean.TRUE.equals(inner.getNullable())) { + postfix = " | null"; + } + return "{ [key: string]: " + this.getTypeDeclaration(unaliasSchema(inner)) + postfix + "; }"; } else if (ModelUtils.isFileSchema(p)) { return "HttpFile"; } else if (ModelUtils.isBinarySchema(p)) { diff --git a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache index bff4adc5f79..20782a320a0 100644 --- a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache @@ -19,7 +19,7 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ * {{{.}}} */ {{/description}} - '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}; + '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}}; {{/vars}} {{#discriminator}} From d1f92acaea83996010d8e10b5eeef0a918c9f3b2 Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Fri, 24 Mar 2023 11:32:04 +0200 Subject: [PATCH 077/131] [Java][Spring] fix reactive method with only implicit headers (#15019) (fix #14907) --- .../languages/AbstractJavaCodegen.java | 1 + .../java/spring/SpringCodegenTest.java | 31 +++++++++++ .../src/test/resources/bugs/issue_14907.yaml | 54 +++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 modules/openapi-generator/src/test/resources/bugs/issue_14907.yaml diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 3f966c439e4..662a3d68e80 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -2287,6 +2287,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code operation.allParams.add(p); } } + operation.hasParams = !operation.allParams.isEmpty(); } private boolean shouldBeImplicitHeader(CodegenParameter parameter) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index b3e139db21c..c71997ce09e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -915,6 +915,37 @@ public class SpringCodegenTest { assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/api/SomeApiDelegate.java"), "Mono"); } + @Test + public void shouldGenerateValidCodeForReactiveControllerWithoutParams_issue14907() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/bugs/issue_14907.yaml"); + final SpringCodegen codegen = new SpringCodegen(); + codegen.setOpenAPI(openAPI); + codegen.setOutputDir(output.getAbsolutePath()); + + codegen.additionalProperties().put(SpringCodegen.REACTIVE, "true"); + codegen.additionalProperties().put(USE_TAGS, "true"); + codegen.additionalProperties().put(SpringCodegen.DATE_LIBRARY, "java8"); + codegen.additionalProperties().put(INTERFACE_ONLY, "true"); + codegen.additionalProperties().put(SKIP_DEFAULT_INTERFACE, "true"); + codegen.additionalProperties().put(IMPLICIT_HEADERS, "true"); + codegen.additionalProperties().put(OPENAPI_NULLABLE, "false"); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + + Map files = generator.opts(input).generate().stream() + .collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("ConsentControllerApi.java")) + .assertMethod("readAgreements", "ServerWebExchange"); + } + @Test public void shouldEscapeReservedKeyWordsForRequestParameters_7506_Regression() throws Exception { final SpringCodegen codegen = new SpringCodegen(); diff --git a/modules/openapi-generator/src/test/resources/bugs/issue_14907.yaml b/modules/openapi-generator/src/test/resources/bugs/issue_14907.yaml new file mode 100644 index 00000000000..9222f2afccc --- /dev/null +++ b/modules/openapi-generator/src/test/resources/bugs/issue_14907.yaml @@ -0,0 +1,54 @@ +openapi: 3.0.1 +info: + title: TEST + description: |- + ## TEST + version: 1.0.0 + +servers: + - url: /v3 + description: Major version of service + +tags: + - name: consent-controller + description: Consent API + + +paths: + /agreements: + parameters: + - $ref: '#/components/parameters/x-client-ismobile' + get: + tags: + - consent-controller + operationId: readAgreements + responses: + "200": + description: OK + content: + '*/*': + schema: + $ref: '#/components/schemas/ListResponseResponseAgreement' +components: + schemas: + ResponseAgreement: + type: object + properties: + agreementId: + type: string + ListResponseResponseAgreement: + type: object + properties: + list: + type: array + items: + $ref: '#/components/schemas/ResponseAgreement' + parameters: + x-client-ismobile: + name: x-client-ismobile + in: header + description: | + blabla + schema: + type: boolean + required: false \ No newline at end of file From bde5c10092d0bbc96ec2fc2232598ef0be55ca3b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 24 Mar 2023 18:25:20 +0800 Subject: [PATCH 078/131] update optional parameters in jsdoc (#15032) --- .../Javascript/libraries/apollo/api.mustache | 2 +- .../libraries/javascript/api.mustache | 2 +- .../javascript-apollo/src/api/FakeApi.js | 58 +++++++++---------- .../javascript-apollo/src/api/PetApi.js | 12 ++-- .../javascript-es6/src/api/FakeApi.js | 58 +++++++++---------- .../petstore/javascript-es6/src/api/PetApi.js | 12 ++-- .../javascript-promise-es6/src/api/FakeApi.js | 58 +++++++++---------- .../javascript-promise-es6/src/api/PetApi.js | 12 ++-- 8 files changed, 107 insertions(+), 107 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Javascript/libraries/apollo/api.mustache b/modules/openapi-generator/src/main/resources/Javascript/libraries/apollo/api.mustache index 82ab5f8c99c..a18b4148790 100644 --- a/modules/openapi-generator/src/main/resources/Javascript/libraries/apollo/api.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript/libraries/apollo/api.mustache @@ -29,7 +29,7 @@ export default class <&classname> extends ApiClient { * <¬es><#allParams><#required> * @param {<&vendorExtensions.x-jsdoc-type>} <¶mName> <&description><#hasOptionalParams> * @param {Object} opts Optional parameters<#allParams><^required> - * @param {<&vendorExtensions.x-jsdoc-type>} opts.<¶mName> <&description><#defaultValue> (default to <&.>) + * @param {<&vendorExtensions.x-jsdoc-type>} [<¶mName><#defaultValue> = <&.>] <&description> * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} <=| |=>* @return {Promise|#returnType|<|&vendorExtensions.x-jsdoc-type|>|/returnType|}|=< >=| */ diff --git a/modules/openapi-generator/src/main/resources/Javascript/libraries/javascript/api.mustache b/modules/openapi-generator/src/main/resources/Javascript/libraries/javascript/api.mustache index 84b2386c24a..cbe441ca08c 100644 --- a/modules/openapi-generator/src/main/resources/Javascript/libraries/javascript/api.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript/libraries/javascript/api.mustache @@ -38,7 +38,7 @@ export default class <&classname> { * <¬es><#allParams><#required> * @param {<&vendorExtensions.x-jsdoc-type>} <¶mName> <&description><#hasOptionalParams> * @param {Object} opts Optional parameters<#allParams><^required> - * @param {<&vendorExtensions.x-jsdoc-type>} opts.<¶mName> <&description><#defaultValue> (default to <&.>)<^usePromises> + * @param {<&vendorExtensions.x-jsdoc-type>} [<¶mName><#defaultValue> = <&.>)] <&description><^usePromises> * @param {module:<#invokerPackage><&invokerPackage>/<#apiPackage><&apiPackage>/<&classname>~<&operationId>Callback} callback The callback function, accepting three arguments: error, data, response<#returnType> * data is of type: {@link <&vendorExtensions.x-jsdoc-type>}<#usePromises> * @return {Promise} a {@link https://www.promisejs.org/|Promise}<#returnType>, with an object containing data of type {@link <&vendorExtensions.x-jsdoc-type>} and HTTP response<^returnType>, with an object containing HTTP response diff --git a/samples/client/petstore/javascript-apollo/src/api/FakeApi.js b/samples/client/petstore/javascript-apollo/src/api/FakeApi.js index c29506203b1..e1302f477b7 100644 --- a/samples/client/petstore/javascript-apollo/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-apollo/src/api/FakeApi.js @@ -74,8 +74,8 @@ export default class FakeApi extends ApiClient { * test http signature authentication * @param {module:model/Pet} pet Pet object that needs to be added to the store * @param {Object} opts Optional parameters - * @param {String} opts.query1 query parameter - * @param {String} opts.header1 header parameter + * @param {String} [query1] query parameter + * @param {String} [header1] header parameter * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -114,7 +114,7 @@ export default class FakeApi extends ApiClient { /** * Test serialization of outer boolean types * @param {Object} opts Optional parameters - * @param {Boolean} opts.body Input boolean as post body + * @param {Boolean} [body] Input boolean as post body * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -147,7 +147,7 @@ export default class FakeApi extends ApiClient { /** * Test serialization of object with outer number type * @param {Object} opts Optional parameters - * @param {module:model/OuterComposite} opts.outerComposite Input composite as post body + * @param {module:model/OuterComposite} [outerComposite] Input composite as post body * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -180,7 +180,7 @@ export default class FakeApi extends ApiClient { /** * Test serialization of outer number types * @param {Object} opts Optional parameters - * @param {Number} opts.body Input number as post body + * @param {Number} [body] Input number as post body * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -213,7 +213,7 @@ export default class FakeApi extends ApiClient { /** * Test serialization of outer string types * @param {Object} opts Optional parameters - * @param {String} opts.body Input string as post body + * @param {String} [body] Input string as post body * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -432,16 +432,16 @@ export default class FakeApi extends ApiClient { * @param {String} patternWithoutDelimiter None * @param {Blob} _byte None * @param {Object} opts Optional parameters - * @param {Number} opts.integer None - * @param {Number} opts.int32 None - * @param {Number} opts.int64 None - * @param {Number} opts._float None - * @param {String} opts.string None - * @param {File} opts.binary None - * @param {Date} opts.date None - * @param {Date} opts.dateTime None - * @param {String} opts.password None - * @param {String} opts.callback None + * @param {Number} [integer] None + * @param {Number} [int32] None + * @param {Number} [int64] None + * @param {Number} [_float] None + * @param {String} [string] None + * @param {File} [binary] None + * @param {Date} [date] None + * @param {Date} [dateTime] None + * @param {String} [password] None + * @param {String} [callback] None * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -505,15 +505,15 @@ export default class FakeApi extends ApiClient { * To test enum parameters * To test enum parameters * @param {Object} opts Optional parameters - * @param {Array.} opts.enumHeaderStringArray Header parameter enum test (string array) - * @param {module:model/String} opts.enumHeaderString Header parameter enum test (string) (default to '-efg') - * @param {Array.} opts.enumQueryStringArray Query parameter enum test (string array) - * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') - * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) - * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumQueryModelArray - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') - * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') + * @param {Array.} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {module:model/String} [enumHeaderString = '-efg'] Header parameter enum test (string) + * @param {Array.} [enumQueryStringArray] Query parameter enum test (string array) + * @param {module:model/String} [enumQueryString = '-efg'] Query parameter enum test (string) + * @param {module:model/Number} [enumQueryInteger] Query parameter enum test (double) + * @param {module:model/Number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array.} [enumQueryModelArray] + * @param {Array.} [enumFormStringArray = '$'] Form parameter enum test (string array) + * @param {module:model/String} [enumFormString = '-efg'] Form parameter enum test (string) * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -559,9 +559,9 @@ export default class FakeApi extends ApiClient { * @param {Boolean} requiredBooleanGroup Required Boolean in group parameters * @param {Number} requiredInt64Group Required Integer in group parameters * @param {Object} opts Optional parameters - * @param {Number} opts.stringGroup String in group parameters - * @param {Boolean} opts.booleanGroup Boolean in group parameters - * @param {Number} opts.int64Group Integer in group parameters + * @param {Number} [stringGroup] String in group parameters + * @param {Boolean} [booleanGroup] Boolean in group parameters + * @param {Number} [int64Group] Integer in group parameters * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -697,7 +697,7 @@ export default class FakeApi extends ApiClient { * @param {Array.} context * @param {String} allowEmpty * @param {Object} opts Optional parameters - * @param {Object.} opts.language + * @param {Object.} [language] * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ diff --git a/samples/client/petstore/javascript-apollo/src/api/PetApi.js b/samples/client/petstore/javascript-apollo/src/api/PetApi.js index d1e65785eb2..ce40188aa76 100644 --- a/samples/client/petstore/javascript-apollo/src/api/PetApi.js +++ b/samples/client/petstore/javascript-apollo/src/api/PetApi.js @@ -85,7 +85,7 @@ export default class PetApi extends ApiClient { * * @param {Number} petId Pet id to delete * @param {Object} opts Optional parameters - * @param {String} opts.apiKey + * @param {String} [apiKey] * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -283,8 +283,8 @@ export default class PetApi extends ApiClient { * * @param {Number} petId ID of pet that needs to be updated * @param {Object} opts Optional parameters - * @param {String} opts.name Updated name of the pet - * @param {String} opts.status Updated status of the pet + * @param {String} [name] Updated name of the pet + * @param {String} [status] Updated status of the pet * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -326,8 +326,8 @@ export default class PetApi extends ApiClient { * * @param {Number} petId ID of pet to update * @param {Object} opts Optional parameters - * @param {String} opts.additionalMetadata Additional data to pass to server - * @param {File} opts.file file to upload + * @param {String} [additionalMetadata] Additional data to pass to server + * @param {File} [file] file to upload * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ @@ -370,7 +370,7 @@ export default class PetApi extends ApiClient { * @param {Number} petId ID of pet to update * @param {File} requiredFile file to upload * @param {Object} opts Optional parameters - * @param {String} opts.additionalMetadata Additional data to pass to server + * @param {String} [additionalMetadata] Additional data to pass to server * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277} * @return {Promise} */ diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js index d19a521f8a4..b80b6c6e81f 100644 --- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js @@ -89,8 +89,8 @@ export default class FakeApi { * test http signature authentication * @param {module:model/Pet} pet Pet object that needs to be added to the store * @param {Object} opts Optional parameters - * @param {String} opts.query1 query parameter - * @param {String} opts.header1 header parameter + * @param {String} [query1] query parameter + * @param {String} [header1] header parameter * @param {module:api/FakeApi~fakeHttpSignatureTestCallback} callback The callback function, accepting three arguments: error, data, response */ fakeHttpSignatureTest(pet, opts, callback) { @@ -134,7 +134,7 @@ export default class FakeApi { /** * Test serialization of outer boolean types * @param {Object} opts Optional parameters - * @param {Boolean} opts.body Input boolean as post body + * @param {Boolean} [body] Input boolean as post body * @param {module:api/FakeApi~fakeOuterBooleanSerializeCallback} callback The callback function, accepting three arguments: error, data, response * data is of type: {@link Boolean} */ @@ -173,7 +173,7 @@ export default class FakeApi { /** * Test serialization of object with outer number type * @param {Object} opts Optional parameters - * @param {module:model/OuterComposite} opts.outerComposite Input composite as post body + * @param {module:model/OuterComposite} [outerComposite] Input composite as post body * @param {module:api/FakeApi~fakeOuterCompositeSerializeCallback} callback The callback function, accepting three arguments: error, data, response * data is of type: {@link module:model/OuterComposite} */ @@ -212,7 +212,7 @@ export default class FakeApi { /** * Test serialization of outer number types * @param {Object} opts Optional parameters - * @param {Number} opts.body Input number as post body + * @param {Number} [body] Input number as post body * @param {module:api/FakeApi~fakeOuterNumberSerializeCallback} callback The callback function, accepting three arguments: error, data, response * data is of type: {@link Number} */ @@ -251,7 +251,7 @@ export default class FakeApi { /** * Test serialization of outer string types * @param {Object} opts Optional parameters - * @param {String} opts.body Input string as post body + * @param {String} [body] Input string as post body * @param {module:api/FakeApi~fakeOuterStringSerializeCallback} callback The callback function, accepting three arguments: error, data, response * data is of type: {@link String} */ @@ -503,16 +503,16 @@ export default class FakeApi { * @param {String} patternWithoutDelimiter None * @param {Blob} _byte None * @param {Object} opts Optional parameters - * @param {Number} opts.integer None - * @param {Number} opts.int32 None - * @param {Number} opts.int64 None - * @param {Number} opts._float None - * @param {String} opts.string None - * @param {File} opts.binary None - * @param {Date} opts.date None - * @param {Date} opts.dateTime None - * @param {String} opts.password None - * @param {String} opts.callback None + * @param {Number} [integer] None + * @param {Number} [int32] None + * @param {Number} [int64] None + * @param {Number} [_float] None + * @param {String} [string] None + * @param {File} [binary] None + * @param {Date} [date] None + * @param {Date} [dateTime] None + * @param {String} [password] None + * @param {String} [callback] None * @param {module:api/FakeApi~testEndpointParametersCallback} callback The callback function, accepting three arguments: error, data, response */ testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts, callback) { @@ -581,15 +581,15 @@ export default class FakeApi { * To test enum parameters * To test enum parameters * @param {Object} opts Optional parameters - * @param {Array.} opts.enumHeaderStringArray Header parameter enum test (string array) - * @param {module:model/String} opts.enumHeaderString Header parameter enum test (string) (default to '-efg') - * @param {Array.} opts.enumQueryStringArray Query parameter enum test (string array) - * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') - * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) - * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumQueryModelArray - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') - * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') + * @param {Array.} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {module:model/String} [enumHeaderString = '-efg')] Header parameter enum test (string) + * @param {Array.} [enumQueryStringArray] Query parameter enum test (string array) + * @param {module:model/String} [enumQueryString = '-efg')] Query parameter enum test (string) + * @param {module:model/Number} [enumQueryInteger] Query parameter enum test (double) + * @param {module:model/Number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array.} [enumQueryModelArray] + * @param {Array.} [enumFormStringArray = '$')] Form parameter enum test (string array) + * @param {module:model/String} [enumFormString = '-efg')] Form parameter enum test (string) * @param {module:api/FakeApi~testEnumParametersCallback} callback The callback function, accepting three arguments: error, data, response */ testEnumParameters(opts, callback) { @@ -640,9 +640,9 @@ export default class FakeApi { * @param {Boolean} requiredBooleanGroup Required Boolean in group parameters * @param {Number} requiredInt64Group Required Integer in group parameters * @param {Object} opts Optional parameters - * @param {Number} opts.stringGroup String in group parameters - * @param {Boolean} opts.booleanGroup Boolean in group parameters - * @param {Number} opts.int64Group Integer in group parameters + * @param {Number} [stringGroup] String in group parameters + * @param {Boolean} [booleanGroup] Boolean in group parameters + * @param {Number} [int64Group] Integer in group parameters * @param {module:api/FakeApi~testGroupParametersCallback} callback The callback function, accepting three arguments: error, data, response */ testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, opts, callback) { @@ -793,7 +793,7 @@ export default class FakeApi { * @param {Array.} context * @param {String} allowEmpty * @param {Object} opts Optional parameters - * @param {Object.} opts.language + * @param {Object.} [language] * @param {module:api/FakeApi~testQueryParameterCollectionFormatCallback} callback The callback function, accepting three arguments: error, data, response */ testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, allowEmpty, opts, callback) { diff --git a/samples/client/petstore/javascript-es6/src/api/PetApi.js b/samples/client/petstore/javascript-es6/src/api/PetApi.js index 6aba5f184db..8b0bdf9333d 100644 --- a/samples/client/petstore/javascript-es6/src/api/PetApi.js +++ b/samples/client/petstore/javascript-es6/src/api/PetApi.js @@ -99,7 +99,7 @@ export default class PetApi { * * @param {Number} petId Pet id to delete * @param {Object} opts Optional parameters - * @param {String} opts.apiKey + * @param {String} [apiKey] * @param {module:api/PetApi~deletePetCallback} callback The callback function, accepting three arguments: error, data, response */ deletePet(petId, opts, callback) { @@ -325,8 +325,8 @@ export default class PetApi { * * @param {Number} petId ID of pet that needs to be updated * @param {Object} opts Optional parameters - * @param {String} opts.name Updated name of the pet - * @param {String} opts.status Updated status of the pet + * @param {String} [name] Updated name of the pet + * @param {String} [status] Updated status of the pet * @param {module:api/PetApi~updatePetWithFormCallback} callback The callback function, accepting three arguments: error, data, response */ updatePetWithForm(petId, opts, callback) { @@ -373,8 +373,8 @@ export default class PetApi { * * @param {Number} petId ID of pet to update * @param {Object} opts Optional parameters - * @param {String} opts.additionalMetadata Additional data to pass to server - * @param {File} opts.file file to upload + * @param {String} [additionalMetadata] Additional data to pass to server + * @param {File} [file] file to upload * @param {module:api/PetApi~uploadFileCallback} callback The callback function, accepting three arguments: error, data, response * data is of type: {@link module:model/ApiResponse} */ @@ -423,7 +423,7 @@ export default class PetApi { * @param {Number} petId ID of pet to update * @param {File} requiredFile file to upload * @param {Object} opts Optional parameters - * @param {String} opts.additionalMetadata Additional data to pass to server + * @param {String} [additionalMetadata] Additional data to pass to server * @param {module:api/PetApi~uploadFileWithRequiredFileCallback} callback The callback function, accepting three arguments: error, data, response * data is of type: {@link module:model/ApiResponse} */ diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js index 3fb9c81307d..d173cf111a4 100644 --- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js @@ -85,8 +85,8 @@ export default class FakeApi { * test http signature authentication * @param {module:model/Pet} pet Pet object that needs to be added to the store * @param {Object} opts Optional parameters - * @param {String} opts.query1 query parameter - * @param {String} opts.header1 header parameter + * @param {String} [query1] query parameter + * @param {String} [header1] header parameter * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ fakeHttpSignatureTestWithHttpInfo(pet, opts) { @@ -138,7 +138,7 @@ export default class FakeApi { /** * Test serialization of outer boolean types * @param {Object} opts Optional parameters - * @param {Boolean} opts.body Input boolean as post body + * @param {Boolean} [body] Input boolean as post body * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link Boolean} and HTTP response */ fakeOuterBooleanSerializeWithHttpInfo(opts) { @@ -182,7 +182,7 @@ export default class FakeApi { /** * Test serialization of object with outer number type * @param {Object} opts Optional parameters - * @param {module:model/OuterComposite} opts.outerComposite Input composite as post body + * @param {module:model/OuterComposite} [outerComposite] Input composite as post body * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/OuterComposite} and HTTP response */ fakeOuterCompositeSerializeWithHttpInfo(opts) { @@ -226,7 +226,7 @@ export default class FakeApi { /** * Test serialization of outer number types * @param {Object} opts Optional parameters - * @param {Number} opts.body Input number as post body + * @param {Number} [body] Input number as post body * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link Number} and HTTP response */ fakeOuterNumberSerializeWithHttpInfo(opts) { @@ -270,7 +270,7 @@ export default class FakeApi { /** * Test serialization of outer string types * @param {Object} opts Optional parameters - * @param {String} opts.body Input string as post body + * @param {String} [body] Input string as post body * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link String} and HTTP response */ fakeOuterStringSerializeWithHttpInfo(opts) { @@ -551,16 +551,16 @@ export default class FakeApi { * @param {String} patternWithoutDelimiter None * @param {Blob} _byte None * @param {Object} opts Optional parameters - * @param {Number} opts.integer None - * @param {Number} opts.int32 None - * @param {Number} opts.int64 None - * @param {Number} opts._float None - * @param {String} opts.string None - * @param {File} opts.binary None - * @param {Date} opts.date None - * @param {Date} opts.dateTime None - * @param {String} opts.password None - * @param {String} opts.callback None + * @param {Number} [integer] None + * @param {Number} [int32] None + * @param {Number} [int64] None + * @param {Number} [_float] None + * @param {String} [string] None + * @param {File} [binary] None + * @param {Date} [date] None + * @param {Date} [dateTime] None + * @param {String} [password] None + * @param {String} [callback] None * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, opts) { @@ -649,15 +649,15 @@ export default class FakeApi { * To test enum parameters * To test enum parameters * @param {Object} opts Optional parameters - * @param {Array.} opts.enumHeaderStringArray Header parameter enum test (string array) - * @param {module:model/String} opts.enumHeaderString Header parameter enum test (string) (default to '-efg') - * @param {Array.} opts.enumQueryStringArray Query parameter enum test (string array) - * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') - * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) - * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumQueryModelArray - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') - * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') + * @param {Array.} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {module:model/String} [enumHeaderString = '-efg')] Header parameter enum test (string) + * @param {Array.} [enumQueryStringArray] Query parameter enum test (string array) + * @param {module:model/String} [enumQueryString = '-efg')] Query parameter enum test (string) + * @param {module:model/Number} [enumQueryInteger] Query parameter enum test (double) + * @param {module:model/Number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array.} [enumQueryModelArray] + * @param {Array.} [enumFormStringArray = '$')] Form parameter enum test (string array) + * @param {module:model/String} [enumFormString = '-efg')] Form parameter enum test (string) * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ testEnumParametersWithHttpInfo(opts) { @@ -723,9 +723,9 @@ export default class FakeApi { * @param {Boolean} requiredBooleanGroup Required Boolean in group parameters * @param {Number} requiredInt64Group Required Integer in group parameters * @param {Object} opts Optional parameters - * @param {Number} opts.stringGroup String in group parameters - * @param {Boolean} opts.booleanGroup Boolean in group parameters - * @param {Number} opts.int64Group Integer in group parameters + * @param {Number} [stringGroup] String in group parameters + * @param {Boolean} [booleanGroup] Boolean in group parameters + * @param {Number} [int64Group] Integer in group parameters * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, opts) { @@ -901,7 +901,7 @@ export default class FakeApi { * @param {Array.} context * @param {String} allowEmpty * @param {Object} opts Optional parameters - * @param {Object.} opts.language + * @param {Object.} [language] * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ testQueryParameterCollectionFormatWithHttpInfo(pipe, ioutil, http, url, context, allowEmpty, opts) { diff --git a/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js b/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js index 85f1054fdf4..6c372aed8dc 100644 --- a/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js +++ b/samples/client/petstore/javascript-promise-es6/src/api/PetApi.js @@ -98,7 +98,7 @@ export default class PetApi { * * @param {Number} petId Pet id to delete * @param {Object} opts Optional parameters - * @param {String} opts.apiKey + * @param {String} [apiKey] * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ deletePetWithHttpInfo(petId, opts) { @@ -353,8 +353,8 @@ export default class PetApi { * * @param {Number} petId ID of pet that needs to be updated * @param {Object} opts Optional parameters - * @param {String} opts.name Updated name of the pet - * @param {String} opts.status Updated status of the pet + * @param {String} [name] Updated name of the pet + * @param {String} [status] Updated status of the pet * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ updatePetWithFormWithHttpInfo(petId, opts) { @@ -410,8 +410,8 @@ export default class PetApi { * * @param {Number} petId ID of pet to update * @param {Object} opts Optional parameters - * @param {String} opts.additionalMetadata Additional data to pass to server - * @param {File} opts.file file to upload + * @param {String} [additionalMetadata] Additional data to pass to server + * @param {File} [file] file to upload * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/ApiResponse} and HTTP response */ uploadFileWithHttpInfo(petId, opts) { @@ -468,7 +468,7 @@ export default class PetApi { * @param {Number} petId ID of pet to update * @param {File} requiredFile file to upload * @param {Object} opts Optional parameters - * @param {String} opts.additionalMetadata Additional data to pass to server + * @param {String} [additionalMetadata] Additional data to pass to server * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/ApiResponse} and HTTP response */ uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, opts) { From f5e427ad52eae35279bcc95c8d2b9ae72d9f5460 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 24 Mar 2023 22:20:04 +0800 Subject: [PATCH 079/131] Do not add schema / class name mapping where custom mapping exists (#14984) * fix #13150 Do not add schema / class name mapping where custom mapping exists * update test spec * improve import * fix import for mapped models * fix python * code clean up * fix dart client import * fix dart:core import * better import * add tests --------- Co-authored-by: Bernie Schelberg --- .../openapitools/codegen/CodegenModel.java | 17 +- .../openapitools/codegen/DefaultCodegen.java | 39 ++-- .../languages/DartDioClientCodegen.java | 20 +- .../languages/PythonClientCodegen.java | 11 +- .../codegen/DefaultCodegenTest.java | 5 - .../codegen/java/JavaClientCodegenTest.java | 184 ++++++++++++------ .../java/spring/SpringCodegenTest.java | 38 ++++ .../codegen/ruby/RubyClientCodegenTest.java | 2 - ...ith-fake-endpoints-models-for-testing.yaml | 3 + .../src/test/resources/bugs/issue_13150.yaml | 60 ++++++ .../src/test/resources/bugs/issue_14917.yaml | 66 +++++++ .../org/openapitools/client/model/Animal.java | 2 - .../org/openapitools/client/model/Animal.java | 2 - .../java/apache-httpclient/api/openapi.yaml | 3 + .../org/openapitools/client/model/Animal.java | 6 +- .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../petstore/java/feign/api/openapi.yaml | 3 + .../org/openapitools/client/model/Animal.java | 6 +- .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 2 - .../client/model/GrandparentAnimal.java | 2 - .../openapitools/client/model/ParentPet.java | 1 - .../org/openapitools/client/model/Animal.java | 2 - .../client/model/GrandparentAnimal.java | 2 - .../openapitools/client/model/ParentPet.java | 1 - .../org/openapitools/client/model/Animal.java | 2 - .../client/model/GrandparentAnimal.java | 2 - .../openapitools/client/model/ParentPet.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 2 - .../client/model/GrandparentAnimal.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../org/openapitools/client/model/Animal.java | 3 - .../org/openapitools/client/model/Cat.java | 1 - .../java/webclient-jakarta/api/openapi.yaml | 3 + .../org/openapitools/client/model/Animal.java | 6 +- .../petstore/java/webclient/api/openapi.yaml | 3 + .../org/openapitools/client/model/Animal.java | 6 +- .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../org/openapitools/model/AnimalDto.java | 3 - .../java/org/openapitools/model/CatDto.java | 1 - .../builds/default-v3.0/models/Animal.ts | 4 +- .../lib/src/model/animal.dart | 16 +- .../org/openapitools/client/model/Parent.java | 2 - .../org/openapitools/client/model/Animal.java | 2 - .../client/model/GrandparentAnimal.java | 2 - .../openapitools/client/model/ParentPet.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Entity.java | 6 - .../org/openapitools/model/EntityRef.java | 2 - .../java/org/openapitools/model/Pizza.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../org/openapitools/server/model/Animal.java | 2 - .../src/main/resources/META-INF/openapi.yml | 3 + .../org/openapitools/server/model/Animal.java | 2 - .../src/main/resources/META-INF/openapi.yml | 3 + .../java/org/openapitools/model/Animal.java | 4 +- .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../java/org/openapitools/model/Animal.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../java/org/openapitools/model/Animal.java | 3 - .../main/java/org/openapitools/model/Cat.java | 1 - .../openapitools/virtualan/model/Animal.java | 3 - .../org/openapitools/virtualan/model/Cat.java | 1 - .../org/openapitools/model/AnimalDto.java | 3 - .../java/org/openapitools/model/CatDto.java | 1 - 116 files changed, 395 insertions(+), 298 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/bugs/issue_13150.yaml create mode 100644 modules/openapi-generator/src/test/resources/bugs/issue_14917.yaml 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 46790a8cad0..988a7eb0367 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 @@ -1209,10 +1209,25 @@ public class CodegenModel implements IJsonSchemaValidationProperties { return sb.toString(); } - public void addDiscriminatorMappedModelsImports() { + /* + * To clean up mapped models if needed and add mapped models to imports + * + * @param cleanUpMappedModels Clean up mapped models if set to true + */ + public void addDiscriminatorMappedModelsImports(boolean cleanUpMappedModels) { if (discriminator == null || discriminator.getMappedModels() == null) { return; } + + if (cleanUpMappedModels && !this.hasChildren && // no child + (this.oneOf == null || this.oneOf.isEmpty()) && // not oneOf + (this.anyOf == null || this.anyOf.isEmpty())) { // not anyOf + //clear the mapping + discriminator.setMappedModels(null); + return; + } + + // import child schemas defined in mapped models for (CodegenDiscriminator.MappedModel mm : discriminator.getMappedModels()) { if (!"".equals(mm.getModelName())) { imports.add(mm.getModelName()); 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 241e0626b78..1b48c608a33 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 @@ -50,6 +50,7 @@ import org.openapitools.codegen.CodegenDiscriminator.MappedModel; import org.openapitools.codegen.api.TemplatingEngineAdapter; import org.openapitools.codegen.config.GlobalSettings; import org.openapitools.codegen.examples.ExampleGenerator; +import org.openapitools.codegen.languages.PythonClientCodegen; import org.openapitools.codegen.languages.RustServerCodegen; import org.openapitools.codegen.meta.FeatureSet; import org.openapitools.codegen.meta.GeneratorMetadata; @@ -611,6 +612,7 @@ public class DefaultCodegen implements CodegenConfig { /** * Loop through all models to update different flags (e.g. isSelfReference), children models, etc + * and update mapped models for import. * * @param objs Map of models * @return maps of models with various updates @@ -661,10 +663,17 @@ public class DefaultCodegen implements CodegenConfig { } // loop through properties of each model to detect self-reference + // and update mapped models for import for (ModelsMap entry : objs.values()) { for (ModelMap mo : entry.getModels()) { CodegenModel cm = mo.getModel(); removeSelfReferenceImports(cm); + + if (!this.getLegacyDiscriminatorBehavior()) { + // skip cleaning up mapped models for python client generator + // which uses its own logic + cm.addDiscriminatorMappedModelsImports(!(this instanceof PythonClientCodegen)); + } } } setCircularReferences(allModels); @@ -2655,9 +2664,6 @@ public class DefaultCodegen implements CodegenConfig { if (m.discriminator == null && innerSchema.getDiscriminator() != null) { LOGGER.debug("discriminator is set to null (not correctly set earlier): {}", m.name); m.setDiscriminator(createDiscriminator(m.name, innerSchema, this.openAPI)); - if (!this.getLegacyDiscriminatorBehavior()) { - m.addDiscriminatorMappedModelsImports(); - } modelDiscriminators++; } @@ -2812,6 +2818,7 @@ public class DefaultCodegen implements CodegenConfig { if (Boolean.TRUE.equals(schema.getNullable())) { m.isNullable = Boolean.TRUE; } + // end of code block for composed schema } @@ -2999,9 +3006,6 @@ public class DefaultCodegen implements CodegenConfig { m.isAlias = (typeAliases.containsKey(name) || isAliasOfSimpleTypes(schema)); // check if the unaliased schema is an alias of simple OAS types m.setDiscriminator(createDiscriminator(name, schema, this.openAPI)); - if (!this.getLegacyDiscriminatorBehavior()) { - m.addDiscriminatorMappedModelsImports(); - } if (schema.getDeprecated() != null) { m.isDeprecated = schema.getDeprecated(); @@ -3455,15 +3459,15 @@ public class DefaultCodegen implements CodegenConfig { break; } currentSchemaName = queue.remove(0); - MappedModel mm = new MappedModel(currentSchemaName, toModelName(currentSchemaName)); - descendentSchemas.add(mm); Schema cs = schemas.get(currentSchemaName); Map vendorExtensions = cs.getExtensions(); - if (vendorExtensions != null && !vendorExtensions.isEmpty() && vendorExtensions.containsKey("x-discriminator-value")) { - String xDiscriminatorValue = (String) vendorExtensions.get("x-discriminator-value"); - mm = new MappedModel(xDiscriminatorValue, toModelName(currentSchemaName)); - descendentSchemas.add(mm); - } + String mappingName = + Optional.ofNullable(vendorExtensions) + .map(ve -> ve.get("x-discriminator-value")) + .map(discriminatorValue -> (String) discriminatorValue) + .orElse(currentSchemaName); + MappedModel mm = new MappedModel(mappingName, toModelName(currentSchemaName)); + descendentSchemas.add(mm); } return descendentSchemas; } @@ -3513,10 +3517,11 @@ public class DefaultCodegen implements CodegenConfig { // for schemas that allOf inherit from this schema, add those descendants to this discriminator map List otherDescendants = getAllOfDescendants(schemaName, openAPI); for (MappedModel otherDescendant : otherDescendants) { - // add only if the mapping names are not the same + // add only if the mapping names are not the same and the model names are not the same boolean matched = false; for (MappedModel uniqueDescendant : uniqueDescendants) { - if (uniqueDescendant.getMappingName().equals(otherDescendant.getMappingName())) { + if (uniqueDescendant.getMappingName().equals(otherDescendant.getMappingName()) + || (uniqueDescendant.getModelName().equals(otherDescendant.getModelName()))) { matched = true; break; } @@ -7760,9 +7765,7 @@ public class DefaultCodegen implements CodegenConfig { CodegenModel cm = new CodegenModel(); cm.setDiscriminator(createDiscriminator("", cs, openAPI)); - if (!this.getLegacyDiscriminatorBehavior()) { - cm.addDiscriminatorMappedModelsImports(); - } + for (Schema o : Optional.ofNullable(cs.getOneOf()).orElse(Collections.emptyList())) { if (o.get$ref() == null) { if (cm.discriminator != null && o.get$ref() == null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java index 4cc8fddad64..6d127c990f5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java @@ -337,12 +337,6 @@ public class DartDioClientCodegen extends AbstractDartCodegen { objs = super.postProcessModels(objs); List models = objs.getModels(); ProcessUtils.addIndexToProperties(models, 1); - - for (ModelMap mo : models) { - CodegenModel cm = mo.getModel(); - cm.imports = rewriteImports(cm.imports, true); - cm.vendorExtensions.put("x-has-vars", !cm.vars.isEmpty()); - } return objs; } @@ -583,6 +577,16 @@ public class DartDioClientCodegen extends AbstractDartCodegen { adaptToDartInheritance(objs); syncRootTypesWithInnerVars(objs); } + + // loop through models to update the imports + for (ModelsMap entry : objs.values()) { + for (ModelMap mo : entry.getModels()) { + CodegenModel cm = mo.getModel(); + cm.imports = rewriteImports(cm.imports, true); + cm.vendorExtensions.put("x-has-vars", !cm.vars.isEmpty()); + } + } + return objs; } @@ -730,6 +734,10 @@ public class DartDioClientCodegen extends AbstractDartCodegen { resultImports.add(i); } else if (importMapping().containsKey(modelImport)) { resultImports.add(importMapping().get(modelImport)); + } else if (modelImport.startsWith("dart:")) { // import dart:* directly + resultImports.add(modelImport); + } else if (modelImport.startsWith("package:")) { // e.g. package:openapi/src/model/child.dart + resultImports.add(modelImport); } else { resultImports.add("package:" + pubName + "/" + sourceFolder + "/" + modelPackage() + "/" + underscore(modelImport) + ".dart"); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java index 3eecc392a80..d1184714668 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java @@ -2438,8 +2438,17 @@ public class PythonClientCodegen extends AbstractPythonCodegen { if (m.discriminator == null && innerSchema.getDiscriminator() != null) { LOGGER.debug("discriminator is set to null (not correctly set earlier): {}", m.name); m.setDiscriminator(createDiscriminator(m.name, innerSchema, this.openAPI)); + // directly include the function `addDiscriminatorMappedModelsImports` inline below + // as the function has been updated + //m.addDiscriminatorMappedModelsImports(); if (!this.getLegacyDiscriminatorBehavior()) { - m.addDiscriminatorMappedModelsImports(); + if (m.discriminator != null && m.discriminator.getMappedModels() != null) { + for (CodegenDiscriminator.MappedModel mm : m.discriminator.getMappedModels()) { + if (!"".equals(mm.getModelName())) { + m.getImports().add(mm.getModelName()); + } + } + } } modelDiscriminators++; } 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 107fd4e72c4..515e7f52081 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 @@ -1101,7 +1101,6 @@ public class DefaultCodegenTest { cm = codegen.fromModel(modelName, sc); hs.clear(); hs.add(new CodegenDiscriminator.MappedModel("b", codegen.toModelName("B"))); - hs.add(new CodegenDiscriminator.MappedModel("B", codegen.toModelName("B"))); hs.add(new CodegenDiscriminator.MappedModel("C", codegen.toModelName("C"))); Assert.assertEquals(cm.getHasDiscriminatorWithNonEmptyMapping(), true); Assert.assertEquals(cm.discriminator.getMappedModels(), hs); @@ -1585,8 +1584,6 @@ public class DefaultCodegenTest { discriminator.setPropertyBaseName(prop); discriminator.setMapping(null); discriminator.setMappedModels(new HashSet() {{ - add(new CodegenDiscriminator.MappedModel("DailySubObj", "DailySubObj")); - add(new CodegenDiscriminator.MappedModel("SubObj", "SubObj")); add(new CodegenDiscriminator.MappedModel("daily", "DailySubObj")); add(new CodegenDiscriminator.MappedModel("sub-obj", "SubObj")); }}); @@ -1984,8 +1981,6 @@ public class DefaultCodegenTest { test.getMapping().put("c", "Child"); test.getMappedModels().add(new CodegenDiscriminator.MappedModel("a", "Adult")); test.getMappedModels().add(new CodegenDiscriminator.MappedModel("c", "Child")); - test.getMappedModels().add(new CodegenDiscriminator.MappedModel("Adult", "Adult")); - test.getMappedModels().add(new CodegenDiscriminator.MappedModel("Child", "Child")); Assert.assertEquals(discriminator, test); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 847eb43b263..d6fa2caebaa 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -903,7 +903,7 @@ public class JavaClientCodegenTest { /** * See https://github.com/OpenAPITools/openapi-generator/issues/4803 - * + *

          * UPDATE: the following test has been ignored due to https://github.com/OpenAPITools/openapi-generator/pull/11081/ * We will contact the contributor of the following test to see if the fix will break their use cases and * how we can fix it accordingly. @@ -951,7 +951,7 @@ public class JavaClientCodegenTest { /** * See https://github.com/OpenAPITools/openapi-generator/issues/4803 - * + *

          * UPDATE: the following test has been ignored due to https://github.com/OpenAPITools/openapi-generator/pull/11081/ * We will contact the contributor of the following test to see if the fix will break their use cases and * how we can fix it accordingly. @@ -1007,23 +1007,23 @@ public class JavaClientCodegenTest { output.deleteOnExit(); final CodegenConfigurator configurator = new CodegenConfigurator() - .setGeneratorName("java") - .setLibrary(JavaClientCodegen.WEBCLIENT) - .setAdditionalProperties(properties) - .setInputSpec("src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml") - .setOutputDir(output.getAbsolutePath().replace("\\", "/")); + .setGeneratorName("java") + .setLibrary(JavaClientCodegen.WEBCLIENT) + .setAdditionalProperties(properties) + .setInputSpec("src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")); DefaultGenerator generator = new DefaultGenerator(); Map files = generator.opts(configurator.toClientOptInput()).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("StoreApi.java")) - .assertMethod("getInventory").hasReturnType("Mono>") //explicit 'x-webclient-blocking: false' which overrides global config - .toFileAssert() - .assertMethod("placeOrder").hasReturnType("Order"); // use global config + .assertMethod("getInventory").hasReturnType("Mono>") //explicit 'x-webclient-blocking: false' which overrides global config + .toFileAssert() + .assertMethod("placeOrder").hasReturnType("Order"); // use global config JavaFileAssert.assertThat(files.get("PetApi.java")) - .assertMethod("findPetsByStatus").hasReturnType("List"); // explicit 'x-webclient-blocking: true' which overrides global config + .assertMethod("findPetsByStatus").hasReturnType("List"); // explicit 'x-webclient-blocking: true' which overrides global config } @Test @@ -1057,7 +1057,7 @@ public class JavaClientCodegenTest { /** * See https://github.com/OpenAPITools/openapi-generator/issues/6715 - * + *

          * UPDATE: the following test has been ignored due to https://github.com/OpenAPITools/openapi-generator/pull/11081/ * We will contact the contributor of the following test to see if the fix will break their use cases and * how we can fix it accordingly. @@ -1151,7 +1151,7 @@ public class JavaClientCodegenTest { .orElseThrow(() -> new IllegalStateException(String.format(Locale.ROOT, "Operation with id [%s] does not exist", operationId))); } - private Optional getByCriteria(List codegenOperations, Predicate filter){ + private Optional getByCriteria(List codegenOperations, Predicate filter) { return codegenOperations.stream() .filter(filter) .findFirst(); @@ -1190,7 +1190,7 @@ public class JavaClientCodegenTest { /** * See https://github.com/OpenAPITools/openapi-generator/issues/6715 - * + *

          * UPDATE: the following test has been ignored due to https://github.com/OpenAPITools/openapi-generator/pull/11081/ * We will contact the contributor of the following test to see if the fix will break their use cases and * how we can fix it accordingly. @@ -1554,24 +1554,24 @@ public class JavaClientCodegenTest { output.deleteOnExit(); final CodegenConfigurator configurator = new CodegenConfigurator() - .setAdditionalProperties(properties) - .setGeneratorName("java") - .setLibrary(JavaClientCodegen.MICROPROFILE) - .setInputSpec("src/test/resources/bugs/issue_12622.json") - .setOutputDir(output.getAbsolutePath().replace("\\", "/")); + .setAdditionalProperties(properties) + .setGeneratorName("java") + .setLibrary(JavaClientCodegen.MICROPROFILE) + .setInputSpec("src/test/resources/bugs/issue_12622.json") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")); final ClientOptInput clientOptInput = configurator.toClientOptInput(); DefaultGenerator generator = new DefaultGenerator(); Map files = generator.opts(clientOptInput).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("Foo.java")) - .assertConstructor("String", "Integer") - .hasParameter("b") + .assertConstructor("String", "Integer") + .hasParameter("b") .assertParameterAnnotations() .containsWithNameAndAttributes("JsonbProperty", ImmutableMap.of("value", "\"b\"", "nillable", "true")) - .toParameter().toConstructor() - .hasParameter("c") + .toParameter().toConstructor() + .hasParameter("c") .assertParameterAnnotations() .containsWithNameAndAttributes("JsonbProperty", ImmutableMap.of("value", "\"c\"")); } @@ -1585,24 +1585,24 @@ public class JavaClientCodegenTest { output.deleteOnExit(); final CodegenConfigurator configurator = new CodegenConfigurator() - .setAdditionalProperties(properties) - .setGeneratorName("java") - .setLibrary(JavaClientCodegen.WEBCLIENT) - .setInputSpec("src/test/resources/bugs/issue_12790.yaml") - .setOutputDir(output.getAbsolutePath().replace("\\", "/")); + .setAdditionalProperties(properties) + .setGeneratorName("java") + .setLibrary(JavaClientCodegen.WEBCLIENT) + .setInputSpec("src/test/resources/bugs/issue_12790.yaml") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")); final ClientOptInput clientOptInput = configurator.toClientOptInput(); DefaultGenerator generator = new DefaultGenerator(); Map files = generator.opts(clientOptInput).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("TestObject.java")) - .printFileContent() - .assertConstructor("String", "String") - .bodyContainsLines( - "this.nullableProperty = nullableProperty == null ? JsonNullable.undefined() : JsonNullable.of(nullableProperty);", - "this.notNullableProperty = notNullableProperty;" - ); + .printFileContent() + .assertConstructor("String", "String") + .bodyContainsLines( + "this.nullableProperty = nullableProperty == null ? JsonNullable.undefined() : JsonNullable.of(nullableProperty);", + "this.notNullableProperty = notNullableProperty;" + ); } @Test @@ -1631,9 +1631,9 @@ public class JavaClientCodegenTest { Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/api/ResourceApi.java"); TestUtils.assertFileContains(defaultApi, - "org.springframework.core.io.Resource resourceInResponse()", - "ResponseEntity resourceInResponseWithHttpInfo()", - "ParameterizedTypeReference localReturnType = new ParameterizedTypeReference()" + "org.springframework.core.io.Resource resourceInResponse()", + "ResponseEntity resourceInResponseWithHttpInfo()", + "ParameterizedTypeReference localReturnType = new ParameterizedTypeReference()" ); } @@ -1689,13 +1689,13 @@ public class JavaClientCodegenTest { JavaFileAssert.assertThat(files.get("DefaultApi.java")) .assertMethod("operationWithHttpInfo") - .hasParameter("requestBody") - .assertParameterAnnotations() - .containsWithName("NotNull") + .hasParameter("requestBody") + .assertParameterAnnotations() + .containsWithName("NotNull") .toParameter().toMethod() - .hasParameter("xNonNullHeaderParameter") - .assertParameterAnnotations() - .containsWithName("NotNull"); + .hasParameter("xNonNullHeaderParameter") + .assertParameterAnnotations() + .containsWithName("NotNull"); } @Test @@ -1707,18 +1707,18 @@ public class JavaClientCodegenTest { output.deleteOnExit(); final CodegenConfigurator configurator = new CodegenConfigurator() - .setGeneratorName("java") - .setLibrary(JavaClientCodegen.NATIVE) - .setAdditionalProperties(properties) - .setInputSpec("src/test/resources/3_0/exploded-query-param-array.yaml") - .setOutputDir(output.getAbsolutePath().replace("\\", "/")); + .setGeneratorName("java") + .setLibrary(JavaClientCodegen.NATIVE) + .setAdditionalProperties(properties) + .setInputSpec("src/test/resources/3_0/exploded-query-param-array.yaml") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")); final ClientOptInput clientOptInput = configurator.toClientOptInput(); DefaultGenerator generator = new DefaultGenerator(); generator.opts(clientOptInput).generate(); TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/api/DefaultApi.java"), - "localVarQueryParams.addAll(ApiClient.parameterToPairs(\"multi\", \"values\", queryObject.getValues()));" + "localVarQueryParams.addAll(ApiClient.parameterToPairs(\"multi\", \"values\", queryObject.getValues()));" ); } @@ -1763,7 +1763,7 @@ public class JavaClientCodegenTest { output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); JavaClientCodegen codegen = new JavaClientCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -1801,7 +1801,7 @@ public class JavaClientCodegenTest { output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); JavaClientCodegen codegen = new JavaClientCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -1834,4 +1834,78 @@ public class JavaClientCodegenTest { assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/ChildWithoutMappingADTO.java"), "@JsonTypeName"); assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/ChildWithoutMappingBDTO.java"), "@JsonTypeName"); } -} + + @Test + public void testForJavaNativeJsonSubtype() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/bugs/issue_14917.yaml", null, new ParseOptions()).getOpenAPI(); + + JavaClientCodegen codegen = new JavaClientCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + codegen.setLibrary(JavaClientCodegen.NATIVE); + + generator.opts(input).generate(); + + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "mappings.put(\"Cat\", Cat.class)"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "@JsonSubTypes"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "mappings.put(\"cat\", Cat.class);"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "mappings.put(\"dog\", Dog.class);"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "mappings.put(\"lizard\", Lizard.class);"); + + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Cat.class, name = \"cat\")"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Dog.class, name = \"dog\")"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Lizard.class, name = \"lizard\")"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "mappings.put(\"cat\", Cat.class)"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "mappings.put(\"dog\", Dog.class)"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "mappings.put(\"lizard\", Lizard.class)"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "mappings.put(\"Pet\", Pet.class)"); + + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Cat.class, name = \"Cat\")"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Dog.class, name = \"Dog\")"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Lizard.class, name = \"Lizard\")"); + } + + @Test + public void testForJavaApacheHttpClientJsonSubtype() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/bugs/issue_14917.yaml", null, new ParseOptions()).getOpenAPI(); + + JavaClientCodegen codegen = new JavaClientCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + codegen.setLibrary(JavaClientCodegen.APACHE); + + generator.opts(input).generate(); + + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = \"petType\", visible = true)"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "mappings.put"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "@JsonSubTypes.Type(value = Cat.class, name = \"cat\")"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "@JsonSubTypes.Type(value = Dog.class, name = \"dog\")"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), "@JsonSubTypes.Type(value = Lizard.class, name = \"lizard\")"); + + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = \"petType\", visible = true)"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Cat.class, name = \"cat\")"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Dog.class, name = \"dog\")"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Lizard.class, name = \"lizard\")"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Cat.class, name = \"Cat\")"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Dog.class, name = \"Dog\")"); + assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Lizard.class, name = \"Lizard\")"); + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index c71997ce09e..4700596f60b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -2191,6 +2191,44 @@ public class SpringCodegenTest { .collect(Collectors.toMap(File::getName, Function.identity())); } + @Test + public void testMappingSubtypesIssue13150() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/bugs/issue_13150.yaml", null, new ParseOptions()).getOpenAPI(); + + SpringCodegen codegen = new SpringCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true"); + codegen.setUseOneOfInterfaces(true); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + codegen.setHateoas(true); + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR, "false"); + + codegen.setUseOneOfInterfaces(true); + codegen.setLegacyDiscriminatorBehavior(false); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + String jsonSubType = "@JsonSubTypes({\n" + + " @JsonSubTypes.Type(value = Foo.class, name = \"foo\")\n" + + "})"; + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Parent.java"), jsonSubType); + } + @Test public void shouldGenerateJsonPropertyAnnotationLocatedInGetters_issue5705() throws IOException { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java index 08bc443e334..cfc625900d2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java @@ -388,8 +388,6 @@ public class RubyClientCodegenTest { Set mappedModels = new LinkedHashSet(); mappedModels.add(new CodegenDiscriminator.MappedModel("a", "Adult")); mappedModels.add(new CodegenDiscriminator.MappedModel("c", "Child")); - mappedModels.add(new CodegenDiscriminator.MappedModel("Adult", "Adult")); - mappedModels.add(new CodegenDiscriminator.MappedModel("Child", "Child")); Assert.assertEquals(codegenDiscriminator.getMappedModels(), mappedModels); } diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml index 6ec5b66e0e6..fe954df8e42 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1484,6 +1484,9 @@ components: type: object discriminator: propertyName: className + mapping: + DOG: '#/components/schemas/Dog' + CAT: '#/components/schemas/Cat' required: - className properties: diff --git a/modules/openapi-generator/src/test/resources/bugs/issue_13150.yaml b/modules/openapi-generator/src/test/resources/bugs/issue_13150.yaml new file mode 100644 index 00000000000..07ee407b37e --- /dev/null +++ b/modules/openapi-generator/src/test/resources/bugs/issue_13150.yaml @@ -0,0 +1,60 @@ +openapi: '3.0.0' +info: + version: '1.0.0' + title: 'FooService' +paths: + /parent: + put: + summary: put parent + operationId: putParent + parameters: + - name: name + in: path + required: true + description: Name of the account being updated. + schema: + type: string + requestBody: + description: The updated account definition to save. + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Parent' + responses: + '200': + $ref: '#/components/responses/Parent' +components: + schemas: + Parent: + type: object + description: Defines an account by name. + properties: + name: + type: string + description: The account name. + type: + type: string + description: The account type discriminator. + required: + - name + - type + discriminator: + propertyName: type + mapping: + foo: '#/components/schemas/Foo' + + Foo: + allOf: + - $ref: "#/components/schemas/Parent" + - type: object + properties: + fooType: + type: string + responses: + Parent: + description: The saved account definition. + content: + application/json: + schema: + $ref: '#/components/schemas/Parent' \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/bugs/issue_14917.yaml b/modules/openapi-generator/src/test/resources/bugs/issue_14917.yaml new file mode 100644 index 00000000000..97ea40cac49 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/bugs/issue_14917.yaml @@ -0,0 +1,66 @@ +openapi: 3.0.0 +info: + title: test + description: >- + test schema + version: 1.0.0 +servers: + - url: 'http://test.com' + description: stage +paths: + /demo: + get: + summary: placeholder summary + responses: + '200': + description: Success + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' +components: + schemas: + AllPets: + type: object + properties: + pets: + type: array + items: + $ref: '#/components/schemas/Pet' + Pet: + type: object + required: + - petType + properties: + petType: + type: string + discriminator: + propertyName: petType + mapping: + cat: '#/components/schemas/Cat' + dog: '#/components/schemas/Dog' + lizard: '#/components/schemas/Lizard' + Cat: + allOf: + - $ref: '#/components/schemas/Pet' + - type: object + # all other properties specific to a `Cat` + properties: + name: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Pet' + - type: object + # all other properties specific to a `Dog` + properties: + bark: + type: string + Lizard: + allOf: + - $ref: '#/components/schemas/Pet' + - type: object + # all other properties specific to a `Lizard` + properties: + lovesRocks: + type: boolean diff --git a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/Animal.java index 36ecf9c54f6..52742a478bb 100644 --- a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/Animal.java @@ -20,8 +20,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/Animal.java index 36ecf9c54f6..52742a478bb 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/Animal.java @@ -20,8 +20,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml index 2828944e554..97b8e4c677a 100644 --- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml @@ -1507,6 +1507,9 @@ components: - $ref: '#/components/schemas/Cat_allOf' Animal: discriminator: + mapping: + DOG: '#/components/schemas/Dog' + CAT: '#/components/schemas/Cat' propertyName: className properties: className: diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java index 1d37baf0f8c..0cf61b82d26 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java @@ -23,8 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import java.io.UnsupportedEncodingException; @@ -45,8 +43,8 @@ import java.util.StringJoiner; ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) @JsonSubTypes({ - @JsonSubTypes.Type(value = Cat.class, name = "Cat"), - @JsonSubTypes.Type(value = Dog.class, name = "Dog"), + @JsonSubTypes.Type(value = Cat.class, name = "CAT"), + @JsonSubTypes.Type(value = Dog.class, name = "DOG"), }) public class Animal { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java index d7839c78fb1..4e7596ec935 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java index e4bd0696ec0..60df5483e03 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml index 2828944e554..97b8e4c677a 100644 --- a/samples/client/petstore/java/feign/api/openapi.yaml +++ b/samples/client/petstore/java/feign/api/openapi.yaml @@ -1507,6 +1507,9 @@ components: - $ref: '#/components/schemas/Cat_allOf' Animal: discriminator: + mapping: + DOG: '#/components/schemas/Dog' + CAT: '#/components/schemas/Cat' propertyName: className properties: className: diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java index 31932c6e681..2a5cd4ada19 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java @@ -23,8 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -42,8 +40,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) @JsonSubTypes({ - @JsonSubTypes.Type(value = Cat.class, name = "Cat"), - @JsonSubTypes.Type(value = Dog.class, name = "Dog"), + @JsonSubTypes.Type(value = Cat.class, name = "CAT"), + @JsonSubTypes.Type(value = Dog.class, name = "DOG"), }) public class Animal { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java index 6c603bf62cf..ac820697618 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java index 97ffcf45b25..e6407e84848 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java index 6c603bf62cf..ac820697618 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java index 97ffcf45b25..e6407e84848 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java index c63b11c5d3d..9ace6d0d824 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java @@ -25,9 +25,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java index fa1875cb67b..56b9877dcc5 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java index c63b11c5d3d..9ace6d0d824 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java @@ -25,9 +25,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java index fa1875cb67b..56b9877dcc5 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java index b07ca339373..d81363597cd 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java @@ -25,8 +25,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index 5eacdbf4c7f..c0bf159da9b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -25,8 +25,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildCat; -import org.openapitools.client.model.ParentPet; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java index c4188603a1b..ec0d6794fbf 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java @@ -29,7 +29,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildCat; import org.openapitools.client.model.GrandparentAnimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java index cffa1c6286a..c61c6475cad 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java @@ -28,8 +28,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index 53cf95c9c15..329bd4ae97a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -28,8 +28,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildCat; -import org.openapitools.client.model.ParentPet; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java index 54215bdc679..1ea01ee0938 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildCat; import org.openapitools.client.model.GrandparentAnimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java index cffa1c6286a..c61c6475cad 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java @@ -28,8 +28,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index 53cf95c9c15..329bd4ae97a 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -28,8 +28,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildCat; -import org.openapitools.client.model.ParentPet; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java index 54215bdc679..1ea01ee0938 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildCat; import org.openapitools.client.model.GrandparentAnimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Animal.java index 96bba4a3d3e..fdb1f6b6877 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Animal.java @@ -21,9 +21,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Cat.java index c09f326d7c0..d726c5945f6 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Cat.java @@ -22,7 +22,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java index 8c8cd3d89be..a4f0db63b70 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java @@ -21,9 +21,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import android.os.Parcelable; import android.os.Parcel; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java index 5d0950cc0c1..7561af20ef6 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java @@ -22,7 +22,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import android.os.Parcelable; import android.os.Parcel; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java index d4912377fb9..9f53acf471e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java @@ -21,8 +21,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index 647a6791560..39183918851 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -21,7 +21,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import org.openapitools.client.model.ParentPet; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java index a45e467b7af..f386e3dde82 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import javax.validation.constraints.*; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java index bde591fc50b..abc0d07df3f 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import javax.validation.constraints.*; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java index ba4d7e40f94..52424c0439c 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java @@ -21,9 +21,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import javax.validation.constraints.*; import javax.validation.Valid; import org.hibernate.validator.constraints.*; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java index 3063c81fa0b..ebb5bdd59a7 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java @@ -22,7 +22,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import javax.validation.constraints.*; import javax.validation.Valid; import org.hibernate.validator.constraints.*; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java index 6c603bf62cf..ac820697618 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java index 97ffcf45b25..e6407e84848 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java index 6304aa13cce..9a39e4e2012 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.dataformat.xml.annotation.*; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java index 24eb8295dd3..dba355c3a42 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.dataformat.xml.annotation.*; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java index 6c603bf62cf..ac820697618 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java index 97ffcf45b25..e6407e84848 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java index 8958b1c8497..91cb0d6b432 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import javax.validation.constraints.*; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java index 0037a486368..469dd4a5547 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import javax.validation.constraints.*; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java index 14e0f6107e6..805245b5636 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java @@ -21,9 +21,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; /** * Animal diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java index 4196be52de5..8c0cb47f523 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java @@ -22,7 +22,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; /** * Cat diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java index 14e0f6107e6..805245b5636 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java @@ -21,9 +21,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; /** * Animal diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java index 4196be52de5..8c0cb47f523 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java @@ -22,7 +22,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; /** * Cat diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java index 14e0f6107e6..805245b5636 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java @@ -21,9 +21,6 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; /** * Animal diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java index 4196be52de5..8c0cb47f523 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java @@ -22,7 +22,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; /** * Cat diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java index 6c603bf62cf..ac820697618 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java index 97ffcf45b25..e6407e84848 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java index 6c603bf62cf..ac820697618 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java @@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.BigCat; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java index 97ffcf45b25..e6407e84848 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; -import org.openapitools.client.model.BigCat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml index 2828944e554..97b8e4c677a 100644 --- a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml @@ -1507,6 +1507,9 @@ components: - $ref: '#/components/schemas/Cat_allOf' Animal: discriminator: + mapping: + DOG: '#/components/schemas/Dog' + CAT: '#/components/schemas/Cat' propertyName: className properties: className: diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java index 217f8965037..59b3b92ad83 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java @@ -23,8 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -42,8 +40,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) @JsonSubTypes({ - @JsonSubTypes.Type(value = Cat.class, name = "Cat"), - @JsonSubTypes.Type(value = Dog.class, name = "Dog"), + @JsonSubTypes.Type(value = Cat.class, name = "CAT"), + @JsonSubTypes.Type(value = Dog.class, name = "DOG"), }) public class Animal { diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml index 2828944e554..97b8e4c677a 100644 --- a/samples/client/petstore/java/webclient/api/openapi.yaml +++ b/samples/client/petstore/java/webclient/api/openapi.yaml @@ -1507,6 +1507,9 @@ components: - $ref: '#/components/schemas/Cat_allOf' Animal: discriminator: + mapping: + DOG: '#/components/schemas/Dog' + CAT: '#/components/schemas/Cat' propertyName: className properties: className: diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java index 31932c6e681..2a5cd4ada19 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java @@ -23,8 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -42,8 +40,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) @JsonSubTypes({ - @JsonSubTypes.Type(value = Cat.class, name = "Cat"), - @JsonSubTypes.Type(value = Dog.class, name = "Dog"), + @JsonSubTypes.Type(value = Cat.class, name = "CAT"), + @JsonSubTypes.Type(value = Dog.class, name = "DOG"), }) public class Animal { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java index 9b842e16448..4331b12f28c 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java @@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java index 53a04191db4..86b03a61072 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java index 8d900cefd09..82a53627c68 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java @@ -8,9 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.openapitools.model.BigCatDto; -import org.openapitools.model.CatDto; -import org.openapitools.model.DogDto; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java index ffa90838488..b1866e10bcc 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import org.openapitools.model.AnimalDto; -import org.openapitools.model.BigCatDto; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts index 7c611d3f08e..3aba7c739e4 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts @@ -57,10 +57,10 @@ export function AnimalFromJSONTyped(json: any, ignoreDiscriminator: boolean): An return json; } if (!ignoreDiscriminator) { - if (json['className'] === 'Cat') { + if (json['className'] === 'CAT') { return CatFromJSONTyped(json, true); } - if (json['className'] === 'Dog') { + if (json['className'] === 'DOG') { return DogFromJSONTyped(json, true); } } diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/animal.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/animal.dart index 01a52a6a170..20b3f9f50b7 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/animal.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/animal.dart @@ -26,8 +26,8 @@ abstract class Animal { static const String discriminatorFieldName = r'className'; static const Map discriminatorMapping = { - r'Cat': Cat, - r'Dog': Dog, + r'CAT': Cat, + r'DOG': Dog, }; @BuiltValueSerializer(custom: true) @@ -37,10 +37,10 @@ abstract class Animal { extension AnimalDiscriminatorExt on Animal { String? get discriminatorValue { if (this is Cat) { - return r'Cat'; + return r'CAT'; } if (this is Dog) { - return r'Dog'; + return r'DOG'; } return null; } @@ -48,10 +48,10 @@ extension AnimalDiscriminatorExt on Animal { extension AnimalBuilderDiscriminatorExt on AnimalBuilder { String? get discriminatorValue { if (this is CatBuilder) { - return r'Cat'; + return r'CAT'; } if (this is DogBuilder) { - return r'Dog'; + return r'DOG'; } return null; } @@ -108,9 +108,9 @@ class _$AnimalSerializer implements PrimitiveSerializer { final discIndex = serializedList.indexOf(Animal.discriminatorFieldName) + 1; final discValue = serializers.deserialize(serializedList[discIndex], specifiedType: FullType(String)) as String; switch (discValue) { - case r'Cat': + case r'CAT': return serializers.deserialize(serialized, specifiedType: FullType(Cat)) as Cat; - case r'Dog': + case r'DOG': return serializers.deserialize(serialized, specifiedType: FullType(Dog)) as Dog; default: return serializers.deserialize(serialized, specifiedType: FullType($Animal)) as $Animal; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java index 67758eceb02..e701fbb6811 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java @@ -25,8 +25,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildSchema; -import org.openapitools.client.model.MySchemaNameCharacters; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java index 3aa72ab1112..c7f44840819 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java @@ -25,8 +25,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.Cat; -import org.openapitools.client.model.Dog; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index 240416e4b9e..efc411bee63 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -25,8 +25,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildCat; -import org.openapitools.client.model.ParentPet; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java index 9aad3fd3d86..fe10e19e172 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java @@ -29,7 +29,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.client.model.ChildCat; import org.openapitools.client.model.GrandparentAnimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java index 01e303621e4..01d2e481148 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java @@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java index 2a6ad16814c..19aef83bf5d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java index 064c16eafbb..afb12504042 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java @@ -7,12 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.Bar; -import org.openapitools.model.BarCreate; -import org.openapitools.model.Foo; -import org.openapitools.model.Pasta; -import org.openapitools.model.Pizza; -import org.openapitools.model.PizzaSpeziale; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java index 22ae8438363..344c05038b1 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BarRef; -import org.openapitools.model.FooRef; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java index 9d58604106e..43e68be6336 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import java.math.BigDecimal; import org.openapitools.model.Entity; -import org.openapitools.model.PizzaSpeziale; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index 51d21426e8f..1d3881d9572 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index 7fe1ed5d2b8..a9d13f1b2bf 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index 51d21426e8f..1d3881d9572 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index 7fe1ed5d2b8..a9d13f1b2bf 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/Animal.java b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/Animal.java index da9c02ed0c3..3a90afbad85 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/Animal.java +++ b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/Animal.java @@ -15,8 +15,6 @@ package org.openapitools.server.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.server.model.Cat; -import org.openapitools.server.model.Dog; import jakarta.validation.constraints.*; import jakarta.validation.Valid; diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/mp/src/main/resources/META-INF/openapi.yml index 6667e32d34c..5c0bc517dac 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/mp/src/main/resources/META-INF/openapi.yml @@ -1507,6 +1507,9 @@ components: - $ref: '#/components/schemas/Cat_allOf' Animal: discriminator: + mapping: + DOG: '#/components/schemas/Dog' + CAT: '#/components/schemas/Cat' propertyName: className properties: className: diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/Animal.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/Animal.java index 72fd34477f8..1aa44d00204 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/Animal.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/Animal.java @@ -3,8 +3,6 @@ package org.openapitools.server.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.server.model.Cat; -import org.openapitools.server.model.Dog; diff --git a/samples/server/petstore/java-helidon-server/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/se/src/main/resources/META-INF/openapi.yml index 6667e32d34c..5c0bc517dac 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/se/src/main/resources/META-INF/openapi.yml @@ -1507,6 +1507,9 @@ components: - $ref: '#/components/schemas/Cat_allOf' Animal: discriminator: + mapping: + DOG: '#/components/schemas/Dog' + CAT: '#/components/schemas/Cat' propertyName: className properties: className: diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java index a5eae51787c..fe6a3f7e694 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java @@ -34,8 +34,8 @@ import javax.validation.Valid; }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true) @JsonSubTypes({ - @JsonSubTypes.Type(value = Cat.class, name = "Cat"), - @JsonSubTypes.Type(value = Dog.class, name = "Dog"), + @JsonSubTypes.Type(value = Cat.class, name = "CAT"), + @JsonSubTypes.Type(value = Dog.class, name = "DOG"), }) public class Animal { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java index 51d21426e8f..1d3881d9572 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java @@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java index 7fe1ed5d2b8..a9d13f1b2bf 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java index cd1675c1274..94d7c88b983 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java @@ -9,9 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java index b1b009f533b..09a572598e3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import java.time.OffsetDateTime; import javax.validation.Valid; import javax.validation.constraints.*; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java index 8a1f3096018..eb7bf417abb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java @@ -9,9 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java index 1cf97a01686..61a00a120ad 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java index 8a1f3096018..eb7bf417abb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java @@ -9,9 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java index 1cf97a01686..61a00a120ad 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index 8a1f3096018..eb7bf417abb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -9,9 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index 1cf97a01686..61a00a120ad 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index 8a1f3096018..eb7bf417abb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -9,9 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index 1cf97a01686..61a00a120ad 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java index 8a1f3096018..eb7bf417abb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java @@ -9,9 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java index 1cf97a01686..61a00a120ad 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java index cd1801f743b..793a9005b37 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -9,8 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java index cd1801f743b..793a9005b37 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java @@ -9,8 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java index cd1801f743b..793a9005b37 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -9,8 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java index cd1801f743b..793a9005b37 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java @@ -9,8 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index 8a1f3096018..eb7bf417abb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -9,9 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCat; -import org.openapitools.model.Cat; -import org.openapitools.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index 1cf97a01686..61a00a120ad 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java index 1ee0306572c..1d9dd03564f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java @@ -7,9 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.openapitools.virtualan.model.BigCat; -import org.openapitools.virtualan.model.Cat; -import org.openapitools.virtualan.model.Dog; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java index f1d2c5c97e9..18907db08fc 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.openapitools.virtualan.model.Animal; -import org.openapitools.virtualan.model.BigCat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java index e9f6006abda..37494ffb09a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java @@ -10,9 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCatDto; -import org.openapitools.model.CatDto; -import org.openapitools.model.DogDto; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java index fc461e6b11f..57665355b04 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java @@ -11,7 +11,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.AnimalDto; -import org.openapitools.model.BigCatDto; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; From 41d691334a0b5494c378b6d2eb6ff87994dabb44 Mon Sep 17 00:00:00 2001 From: msosnicki Date: Fri, 24 Mar 2023 15:32:22 +0100 Subject: [PATCH 080/131] Using nix flakes for developer shell (#14888) --- .envrc | 1 + .gitignore | 1 + README.md | 14 ++++++++++++++ flake.lock | 42 ++++++++++++++++++++++++++++++++++++++++++ flake.nix | 23 +++++++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 .envrc create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.envrc b/.envrc new file mode 100644 index 00000000000..3550a30f2de --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index c2192dfc5e2..38bf29180d1 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ packages/ nbproject/ nbactions.xml nb-configuration.xml +.direnv/ .settings diff --git a/README.md b/README.md index 58322ec10ba..91d0c5a4f2d 100644 --- a/README.md +++ b/README.md @@ -263,6 +263,20 @@ If you don't have maven installed, you may directly use the included [maven wrap ./mvnw clean install ``` +#### Nix users + +If you're a nix user, you can enter OpenAPI Generator shell, by typing: +```sh +nix develop +``` +It will enter a shell with Java 8 and Maven installed. + +Direnv supports automatically loading of the nix developer shell, so if you're using direnv too, type: +```sh +direnv allow +``` +and have `java` and `mvn` set up with correct versions each time you enter project directory. + The default build contains minimal static analysis (via CheckStyle). To run your build with PMD and Spotbugs, use the `static-analysis` profile: ```sh diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000000..da1901930c2 --- /dev/null +++ b/flake.lock @@ -0,0 +1,42 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1678083093, + "narHash": "sha256-eTkS9GcdSAYA3cE9zCAAs9wY3+oM2zT45ydIkAcEFFQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "684306b246d05168e42425a3610df7e2c4d51fcd", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000000..ccc7357dbb6 --- /dev/null +++ b/flake.nix @@ -0,0 +1,23 @@ +{ + description = "OpenAPI generator nix flake"; + + inputs.nixpkgs.url = "github:nixos/nixpkgs"; + inputs.flake-utils.url = "github:numtide/flake-utils"; + + outputs = { self, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + in + { + devShells.default = pkgs.mkShell + { + buildInputs = with pkgs;[ + jdk8 + maven + ]; + }; + } + ); +} + From ca757b703e3b451850dc3a4824c515105facd3fd Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sat, 25 Mar 2023 03:08:20 -0400 Subject: [PATCH 081/131] better handling of form parameters (#15040) --- .../csharp-netcore/ClientUtils.mustache | 9 +++- .../generichost/ClientUtils.mustache | 45 +++++++++++++++-- .../csharp-netcore/modelEnum.mustache | 2 +- .../csharp-netcore/modelInnerEnum.mustache | 2 +- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Api/DefaultApiTests.cs | 20 ++++++++ ...ctivityOutputElementRepresentationTests.cs | 1 - .../Model/ActivityTests.cs | 1 - .../Model/AdditionalPropertiesClassTests.cs | 1 - .../Model/AnimalTests.cs | 1 - .../Model/ApiResponseTests.cs | 1 - .../Model/AppleReqTests.cs | 1 - .../Org.OpenAPITools.Test/Model/AppleTests.cs | 1 - .../Model/ArrayOfArrayOfNumberOnlyTests.cs | 1 - .../Model/ArrayOfNumberOnlyTests.cs | 1 - .../Model/ArrayTestTests.cs | 1 - .../Model/BananaReqTests.cs | 1 - .../Model/BananaTests.cs | 1 - .../Model/BasquePigTests.cs | 1 - .../Model/CapitalizationTests.cs | 1 - .../Model/CatAllOfTests.cs | 1 - .../Org.OpenAPITools.Test/Model/CatTests.cs | 1 - .../Model/CategoryTests.cs | 1 - .../Model/ChildCatAllOfTests.cs | 1 - .../Model/ChildCatTests.cs | 1 - .../Model/ClassModelTests.cs | 1 - .../Model/ComplexQuadrilateralTests.cs | 1 - .../Model/DanishPigTests.cs | 1 - .../Model/DateOnlyClassTests.cs | 1 - .../Model/DeprecatedObjectTests.cs | 1 - .../Model/DogAllOfTests.cs | 1 - .../Org.OpenAPITools.Test/Model/DogTests.cs | 1 - .../Model/DrawingTests.cs | 1 - .../Model/EnumArraysTests.cs | 1 - .../Model/EnumClassTests.cs | 1 - .../Model/EnumTestTests.cs | 1 - .../Model/EquilateralTriangleTests.cs | 1 - .../Model/FileSchemaTestClassTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FileTests.cs | 1 - .../Model/FooGetDefaultResponseTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FooTests.cs | 1 - .../Model/FormatTestTests.cs | 17 ++++++- .../Model/FruitReqTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FruitTests.cs | 1 - .../Model/GmFruitTests.cs | 1 - .../Model/GrandparentAnimalTests.cs | 1 - .../Model/HasOnlyReadOnlyTests.cs | 1 - .../Model/HealthCheckResultTests.cs | 1 - .../Model/IsoscelesTriangleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ListTests.cs | 1 - .../Model/MammalTests.cs | 1 - .../Model/MapTestTests.cs | 1 - ...ertiesAndAdditionalPropertiesClassTests.cs | 9 +++- .../Model/Model200ResponseTests.cs | 1 - .../Model/ModelClientTests.cs | 1 - .../Org.OpenAPITools.Test/Model/NameTests.cs | 1 - .../Model/NullableClassTests.cs | 1 - .../Model/NullableGuidClassTests.cs | 1 - .../Model/NullableShapeTests.cs | 1 - .../Model/NumberOnlyTests.cs | 1 - .../Model/ObjectWithDeprecatedFieldsTests.cs | 1 - .../Org.OpenAPITools.Test/Model/OrderTests.cs | 1 - .../Model/OuterCompositeTests.cs | 1 - .../Model/OuterEnumDefaultValueTests.cs | 1 - .../OuterEnumIntegerDefaultValueTests.cs | 1 - .../Model/OuterEnumIntegerTests.cs | 1 - .../Model/OuterEnumTests.cs | 1 - .../Model/ParentPetTests.cs | 1 - .../Org.OpenAPITools.Test/Model/PetTests.cs | 1 - .../Org.OpenAPITools.Test/Model/PigTests.cs | 1 - .../Model/PolymorphicPropertyTests.cs | 1 - .../Model/QuadrilateralInterfaceTests.cs | 1 - .../Model/QuadrilateralTests.cs | 1 - .../Model/ReadOnlyFirstTests.cs | 1 - .../Model/ReturnTests.cs | 1 - .../Model/ScaleneTriangleTests.cs | 1 - .../Model/ShapeInterfaceTests.cs | 1 - .../Model/ShapeOrNullTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ShapeTests.cs | 1 - .../Model/SimpleQuadrilateralTests.cs | 1 - .../Model/SpecialModelNameTests.cs | 1 - .../Org.OpenAPITools.Test/Model/TagTests.cs | 1 - .../Model/TriangleInterfaceTests.cs | 1 - .../Model/TriangleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/UserTests.cs | 1 - .../Org.OpenAPITools.Test/Model/WhaleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ZebraTests.cs | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 50 +++++++++++++++++-- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../Api/DefaultApiTests.cs | 20 ++++++++ ...ctivityOutputElementRepresentationTests.cs | 1 - .../Model/ActivityTests.cs | 1 - .../Model/AdditionalPropertiesClassTests.cs | 1 - .../Model/AnimalTests.cs | 1 - .../Model/ApiResponseTests.cs | 1 - .../Model/AppleReqTests.cs | 1 - .../Org.OpenAPITools.Test/Model/AppleTests.cs | 1 - .../Model/ArrayOfArrayOfNumberOnlyTests.cs | 1 - .../Model/ArrayOfNumberOnlyTests.cs | 1 - .../Model/ArrayTestTests.cs | 1 - .../Model/BananaReqTests.cs | 1 - .../Model/BananaTests.cs | 1 - .../Model/BasquePigTests.cs | 1 - .../Model/CapitalizationTests.cs | 1 - .../Model/CatAllOfTests.cs | 1 - .../Org.OpenAPITools.Test/Model/CatTests.cs | 1 - .../Model/CategoryTests.cs | 1 - .../Model/ChildCatAllOfTests.cs | 1 - .../Model/ChildCatTests.cs | 1 - .../Model/ClassModelTests.cs | 1 - .../Model/ComplexQuadrilateralTests.cs | 1 - .../Model/DanishPigTests.cs | 1 - .../Model/DateOnlyClassTests.cs | 1 - .../Model/DeprecatedObjectTests.cs | 1 - .../Model/DogAllOfTests.cs | 1 - .../Org.OpenAPITools.Test/Model/DogTests.cs | 1 - .../Model/DrawingTests.cs | 1 - .../Model/EnumArraysTests.cs | 1 - .../Model/EnumClassTests.cs | 1 - .../Model/EnumTestTests.cs | 1 - .../Model/EquilateralTriangleTests.cs | 1 - .../Model/FileSchemaTestClassTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FileTests.cs | 1 - .../Model/FooGetDefaultResponseTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FooTests.cs | 1 - .../Model/FormatTestTests.cs | 17 ++++++- .../Model/FruitReqTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FruitTests.cs | 1 - .../Model/GmFruitTests.cs | 1 - .../Model/GrandparentAnimalTests.cs | 1 - .../Model/HasOnlyReadOnlyTests.cs | 1 - .../Model/HealthCheckResultTests.cs | 1 - .../Model/IsoscelesTriangleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ListTests.cs | 1 - .../Model/MammalTests.cs | 1 - .../Model/MapTestTests.cs | 1 - ...ertiesAndAdditionalPropertiesClassTests.cs | 9 +++- .../Model/Model200ResponseTests.cs | 1 - .../Model/ModelClientTests.cs | 1 - .../Org.OpenAPITools.Test/Model/NameTests.cs | 1 - .../Model/NullableClassTests.cs | 1 - .../Model/NullableGuidClassTests.cs | 1 - .../Model/NullableShapeTests.cs | 1 - .../Model/NumberOnlyTests.cs | 1 - .../Model/ObjectWithDeprecatedFieldsTests.cs | 1 - .../Org.OpenAPITools.Test/Model/OrderTests.cs | 1 - .../Model/OuterCompositeTests.cs | 1 - .../Model/OuterEnumDefaultValueTests.cs | 1 - .../OuterEnumIntegerDefaultValueTests.cs | 1 - .../Model/OuterEnumIntegerTests.cs | 1 - .../Model/OuterEnumTests.cs | 1 - .../Model/ParentPetTests.cs | 1 - .../Org.OpenAPITools.Test/Model/PetTests.cs | 1 - .../Org.OpenAPITools.Test/Model/PigTests.cs | 1 - .../Model/PolymorphicPropertyTests.cs | 1 - .../Model/QuadrilateralInterfaceTests.cs | 1 - .../Model/QuadrilateralTests.cs | 1 - .../Model/ReadOnlyFirstTests.cs | 1 - .../Model/ReturnTests.cs | 1 - .../Model/ScaleneTriangleTests.cs | 1 - .../Model/ShapeInterfaceTests.cs | 1 - .../Model/ShapeOrNullTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ShapeTests.cs | 1 - .../Model/SimpleQuadrilateralTests.cs | 1 - .../Model/SpecialModelNameTests.cs | 1 - .../Org.OpenAPITools.Test/Model/TagTests.cs | 1 - .../Model/TriangleInterfaceTests.cs | 1 - .../Model/TriangleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/UserTests.cs | 1 - .../Org.OpenAPITools.Test/Model/WhaleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ZebraTests.cs | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 50 +++++++++++++++++-- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../Model/AdultAllOfTests.cs | 1 - .../Org.OpenAPITools.Test/Model/AdultTests.cs | 1 - .../Model/ChildAllOfTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ChildTests.cs | 1 - .../Model/PersonTests.cs | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 16 ++++-- .../Org.OpenAPITools.Test/Model/AppleTests.cs | 1 - .../Model/BananaTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FruitTests.cs | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 16 ++++-- .../Org.OpenAPITools.Test/Model/AppleTests.cs | 1 - .../Model/BananaTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FruitTests.cs | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 16 ++++-- .../Api/DefaultApiTests.cs | 20 ++++++++ ...ctivityOutputElementRepresentationTests.cs | 1 - .../Model/ActivityTests.cs | 1 - .../Model/AdditionalPropertiesClassTests.cs | 1 - .../Model/AnimalTests.cs | 1 - .../Model/ApiResponseTests.cs | 1 - .../Model/AppleReqTests.cs | 1 - .../Org.OpenAPITools.Test/Model/AppleTests.cs | 1 - .../Model/ArrayOfArrayOfNumberOnlyTests.cs | 1 - .../Model/ArrayOfNumberOnlyTests.cs | 1 - .../Model/ArrayTestTests.cs | 1 - .../Model/BananaReqTests.cs | 1 - .../Model/BananaTests.cs | 1 - .../Model/BasquePigTests.cs | 1 - .../Model/CapitalizationTests.cs | 1 - .../Model/CatAllOfTests.cs | 1 - .../Org.OpenAPITools.Test/Model/CatTests.cs | 1 - .../Model/CategoryTests.cs | 1 - .../Model/ChildCatAllOfTests.cs | 1 - .../Model/ChildCatTests.cs | 1 - .../Model/ClassModelTests.cs | 1 - .../Model/ComplexQuadrilateralTests.cs | 1 - .../Model/DanishPigTests.cs | 1 - .../Model/DateOnlyClassTests.cs | 1 - .../Model/DeprecatedObjectTests.cs | 1 - .../Model/DogAllOfTests.cs | 1 - .../Org.OpenAPITools.Test/Model/DogTests.cs | 1 - .../Model/DrawingTests.cs | 1 - .../Model/EnumArraysTests.cs | 1 - .../Model/EnumClassTests.cs | 1 - .../Model/EnumTestTests.cs | 1 - .../Model/EquilateralTriangleTests.cs | 1 - .../Model/FileSchemaTestClassTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FileTests.cs | 1 - .../Model/FooGetDefaultResponseTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FooTests.cs | 1 - .../Model/FormatTestTests.cs | 17 ++++++- .../Model/FruitReqTests.cs | 1 - .../Org.OpenAPITools.Test/Model/FruitTests.cs | 1 - .../Model/GmFruitTests.cs | 1 - .../Model/GrandparentAnimalTests.cs | 1 - .../Model/HasOnlyReadOnlyTests.cs | 1 - .../Model/HealthCheckResultTests.cs | 1 - .../Model/IsoscelesTriangleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ListTests.cs | 1 - .../Model/MammalTests.cs | 1 - .../Model/MapTestTests.cs | 1 - ...ertiesAndAdditionalPropertiesClassTests.cs | 9 +++- .../Model/Model200ResponseTests.cs | 1 - .../Model/ModelClientTests.cs | 1 - .../Org.OpenAPITools.Test/Model/NameTests.cs | 1 - .../Model/NullableClassTests.cs | 1 - .../Model/NullableGuidClassTests.cs | 1 - .../Model/NullableShapeTests.cs | 1 - .../Model/NumberOnlyTests.cs | 1 - .../Model/ObjectWithDeprecatedFieldsTests.cs | 1 - .../Org.OpenAPITools.Test/Model/OrderTests.cs | 1 - .../Model/OuterCompositeTests.cs | 1 - .../Model/OuterEnumDefaultValueTests.cs | 1 - .../OuterEnumIntegerDefaultValueTests.cs | 1 - .../Model/OuterEnumIntegerTests.cs | 1 - .../Model/OuterEnumTests.cs | 1 - .../Model/ParentPetTests.cs | 1 - .../Org.OpenAPITools.Test/Model/PetTests.cs | 1 - .../Org.OpenAPITools.Test/Model/PigTests.cs | 1 - .../Model/PolymorphicPropertyTests.cs | 1 - .../Model/QuadrilateralInterfaceTests.cs | 1 - .../Model/QuadrilateralTests.cs | 1 - .../Model/ReadOnlyFirstTests.cs | 1 - .../Model/ReturnTests.cs | 1 - .../Model/ScaleneTriangleTests.cs | 1 - .../Model/ShapeInterfaceTests.cs | 1 - .../Model/ShapeOrNullTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ShapeTests.cs | 1 - .../Model/SimpleQuadrilateralTests.cs | 1 - .../Model/SpecialModelNameTests.cs | 1 - .../Org.OpenAPITools.Test/Model/TagTests.cs | 1 - .../Model/TriangleInterfaceTests.cs | 1 - .../Model/TriangleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/UserTests.cs | 1 - .../Org.OpenAPITools.Test/Model/WhaleTests.cs | 1 - .../Org.OpenAPITools.Test/Model/ZebraTests.cs | 1 - .../Org.OpenAPITools/Client/ClientUtils.cs | 50 +++++++++++++++++-- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- .../Org.OpenAPITools/Client/ClientUtils.cs | 9 +++- 280 files changed, 436 insertions(+), 302 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache index eeafa6e8843..ab126614f96 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache @@ -2,6 +2,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -111,8 +112,12 @@ namespace {{packageName}}.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache index 2c200d418af..a8a92172aaf 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache @@ -6,10 +6,13 @@ using System; using System.IO; using System.Linq; +using System.Collections; +using System.Collections.Generic; using System.Text; using System.Text.Json; using System.Text.RegularExpressions;{{#useCompareNetObjects}} using KellermanSoftware.CompareNetObjects;{{/useCompareNetObjects}} +using {{packageName}}.{{modelPackage}}; namespace {{packageName}}.{{clientPackage}} { @@ -120,9 +123,45 @@ namespace {{packageName}}.{{clientPackage}} // For example: 2009-06-15T13:45:30.0000000 return dateTimeOffset.ToString(format); if (obj is bool boolean) - return boolean ? "true" : "false"; - if (obj is System.Collections.ICollection collection) - return string.Join(",", collection.Cast()); + return boolean + ? "true" + : "false"; + {{#models}} + {{#model}} + {{#isEnum}} + if (obj is {{classname}} {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}) + {{! below has #isNumeric as a work around but should probably have ^isString instead https://github.com/OpenAPITools/openapi-generator/issues/15038}} + return {{classname}}Converter.{{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}){{#isNumeric}}.ToString(){{/isNumeric}}; + {{/isEnum}} + {{^isEnum}} + {{#vars}} + {{#items.isEnum}} + {{#items}} + {{^complexType}} + if (obj is {{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{classname}}{{{datatypeWithEnum}}}{{/lambda.camelcase_param}}) + {{! below has #isNumeric as a work around but should probably have ^isString instead https://github.com/OpenAPITools/openapi-generator/issues/15038}} + return {{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{{datatypeWithEnum}}}{{/lambda.camelcase_param}}){{#isNumeric}}.ToString(){{/isNumeric}}; + {{/complexType}} + {{/items}} + {{/items.isEnum}} + {{#isEnum}} + {{^complexType}} + if (obj is {{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{classname}}{{{datatypeWithEnum}}}{{/lambda.camelcase_param}}) + {{! below has #isNumeric as a work around but should probably have ^isString instead https://github.com/OpenAPITools/openapi-generator/issues/15038}} + return {{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{{datatypeWithEnum}}}{{/lambda.camelcase_param}}){{#isNumeric}}.ToString(){{/isNumeric}}; + {{/complexType}} + {{/isEnum}} + {{/vars}} + {{/isEnum}} + {{/model}} + {{/models}} + if (obj is ICollection collection) + { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry)); + return string.Join(",", entries); + } return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture); } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache index 24beeae74c2..178e4fe0bf9 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache @@ -76,7 +76,7 @@ {{#allowableValues}} {{#enumVars}} if (value == {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.{{name}}) - return {{^isNumeric}}"{{/isNumeric}}{{value}}{{^isNumeric}}"{{/isNumeric}}; + return {{^isNumeric}}"{{/isNumeric}}{{{value}}}{{^isNumeric}}"{{/isNumeric}}; {{/enumVars}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache index fdcd4f4a4cb..11e44dc3766 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache @@ -66,7 +66,7 @@ {{#allowableValues}} {{#enumVars}} if (value == {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.{{name}}) - return {{^isNumeric}}"{{/isNumeric}}{{value}}{{^isNumeric}}"{{/isNumeric}}; + return {{^isNumeric}}"{{/isNumeric}}{{{value}}}{{^isNumeric}}"{{/isNumeric}}; {{/enumVars}} {{/allowableValues}} diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs index 29a02766057..3bcd98df7ca 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs index 608bdbc195a..8e33ee2d9b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index d79076dcd63..bfdfc0d172a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -60,5 +60,25 @@ namespace Org.OpenAPITools.Test.Api var response = await _instance.FooGetAsync(); Assert.IsType(response); } + + /// + /// Test GetCountry + /// + [Fact (Skip = "not implemented")] + public async Task GetCountryAsyncTest() + { + string country = default; + await _instance.GetCountryAsync(country); + } + + /// + /// Test Hello + /// + [Fact (Skip = "not implemented")] + public async Task HelloAsyncTest() + { + var response = await _instance.HelloAsync(); + Assert.IsType>(response); + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs index 174a7e333af..94e3f6fe7fe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs index c7479a3c343..03049757efe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs index 95bd1593503..92c9b0708a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs index 8c38ac47af7..c4b0b209a91 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs index a2a9a2d49de..9b85782ecd4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs index 0610780d65d..d52d7930bb2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs index e0bd59e7732..6e10936831f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs index 8f046a0bf6b..14b87779757 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs index 53b2fe30fdb..82b117e28c2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs index df87ba3aaaa..d0dea235061 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs index 6f31ba2029b..f86e93c73ca 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs index 6cb6c62ffd0..57083de2697 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs index 9798a17577b..62e066a4fc3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs index b84c7c85a7d..b2dffa3c803 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs index 3498bb0c152..a59e2faf42d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs index 402a476d079..506c917ef4d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs index 822f8241fa0..d4f8fa6bdb1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs index d4de4c47417..d43ae8711b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs index f1b0aa1005c..4deace3c3a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs index 2e6c120d8fa..ba942072dd7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs index 3f2f96e73a1..93bb0120f1d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs index 087d38674bb..f089b42b81d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs index f98989439ed..5825715de0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs index 85ecbfdda55..607a7db80ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs index 1e86d761507..0b64ef242be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs index ef2eabfca31..164893d05a6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs index c38867cb5ae..81cb6fa4013 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs index ee3d000f32f..f7da9372776 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs index e2fc2d02282..8b152665a90 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs index 60e3aca92bd..8cff9853a04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs index 9ab78a59779..ccf950daf3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs index 9836a779bf0..ac711bc52d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs index 4f0e7079bc8..6ddf36e3b3f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs index b7313941a69..3a34eb830b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs index c0bdf85f9b0..583fec1a869 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs index d3a978bdc4c..cee4ce9c80f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -176,6 +175,22 @@ namespace Org.OpenAPITools.Test.Model // TODO unit test for the property 'StringProperty' } /// + /// Test the property 'UnsignedInteger' + /// + [Fact] + public void UnsignedIntegerTest() + { + // TODO unit test for the property 'UnsignedInteger' + } + /// + /// Test the property 'UnsignedLong' + /// + [Fact] + public void UnsignedLongTest() + { + // TODO unit test for the property 'UnsignedLong' + } + /// /// Test the property 'Uuid' /// [Fact] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs index 3ef884e59c6..27433724a6a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs index 9ab6b7f2781..ca0d7778511 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs index 036c5641cf4..ae3fb07857b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs index 182cf7350b7..eee8d61e4fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs index d9a07efcf9a..b5cac232be4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs index d29edf5dd10..9a618a94825 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs index 2fed6f0b4cc..60103ce0814 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs index 398a4644921..859c553af6d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs index 0889d80a708..f036aec8e7d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs index 0dc95aa6b23..975acebd3bf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs index d94f882e0a2..fd9d3deca41 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -79,6 +78,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Uuid' } + /// + /// Test the property 'UuidWithPattern' + /// + [Fact] + public void UuidWithPatternTest() + { + // TODO unit test for the property 'UuidWithPattern' + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs index 31f2a754314..09a24ecc6a8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs index 40b3700ce95..973df04edba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs index 523b3e050aa..c2024c83ac2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs index adf7c14f131..5fab915d647 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs index ed52163e5c2..5f208e16e82 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs index 734d03e5e7a..3476391608d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs index 5db923c1d3f..be8649eda4e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs index 9e9b651f818..2b962665b0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs index 10682e72f21..7c83fb4ca0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs index 8c176d9f94c..173aa6b07c0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs index 9f6d8b52b6c..1aeee70f3d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs index e51365edb27..1fa418e64f9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs index 36e6a060f97..3225b846de0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs index b38c693d1a1..5474da73214 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs index 34cae43eac1..0d8b6863baf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs index 66cfbf7bdb5..4899ef39cf9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs index 0e85eabf160..95949c3b099 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs index 98aad34f4b4..cd8ea904c9f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs index 42243bd29c0..c846d9c5661 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs index e15b2c5c749..26c0dcaf06a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs index 7e99972f26e..8ced65980fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs index 9969564490d..919961faa02 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs index cad95d2963c..da3ee273f06 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs index 3129f3775c8..49ae5aa0208 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs index a33da20eda6..4791f74d1a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs index b2d995af504..2772e17b595 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs index 0221971c076..d6736b399b6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs index 1a5bb10af80..0efee731657 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs index 92a5f823659..d9390261061 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs index 924d6b42d7f..ad87002d06e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs index 9701da6a541..8942407fa8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs index a464c80c84c..6f96a87cdf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs index 91a7b21f213..c1403b7f0e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs index 08b1c6056c9..b567a8ab958 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs index e23f5314802..891954e7423 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -12,10 +12,13 @@ using System; using System.IO; using System.Linq; +using System.Collections; +using System.Collections.Generic; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; using KellermanSoftware.CompareNetObjects; +using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client { @@ -124,9 +127,50 @@ namespace Org.OpenAPITools.Client // For example: 2009-06-15T13:45:30.0000000 return dateTimeOffset.ToString(format); if (obj is bool boolean) - return boolean ? "true" : "false"; - if (obj is System.Collections.ICollection collection) - return string.Join(",", collection.Cast()); + return boolean + ? "true" + : "false"; + if (obj is ChildCatAllOf.PetTypeEnum childCatAllOfPetTypeEnum) + return ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOfPetTypeEnum); + if (obj is EnumArrays.ArrayEnumEnum enumArraysArrayEnumEnum) + return EnumArrays.ArrayEnumEnumToJsonValue(enumArraysArrayEnumEnum); + if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) + return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum); + if (obj is EnumClass enumClass) + return EnumClassConverter.ToJsonValue(enumClass); + if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum) + return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString(); + if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum) + return EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTestEnumIntegerOnlyEnum).ToString(); + if (obj is EnumTest.EnumNumberEnum enumTestEnumNumberEnum) + return EnumTest.EnumNumberEnumToJsonValue(enumTestEnumNumberEnum).ToString(); + if (obj is EnumTest.EnumStringEnum enumTestEnumStringEnum) + return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); + if (obj is EnumTest.EnumStringRequiredEnum enumTestEnumStringRequiredEnum) + return EnumTest.EnumStringRequiredEnumToJsonValue(enumTestEnumStringRequiredEnum); + if (obj is MapTest.InnerEnum mapTestInnerEnum) + return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is Order.StatusEnum orderStatusEnum) + return Order.StatusEnumToJsonValue(orderStatusEnum); + if (obj is OuterEnum outerEnum) + return OuterEnumConverter.ToJsonValue(outerEnum); + if (obj is OuterEnumDefaultValue outerEnumDefaultValue) + return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue); + if (obj is OuterEnumInteger outerEnumInteger) + return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString(); + if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) + return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString(); + if (obj is Pet.StatusEnum petStatusEnum) + return Pet.StatusEnumToJsonValue(petStatusEnum); + if (obj is Zebra.TypeEnum zebraTypeEnum) + return Zebra.TypeEnumToJsonValue(zebraTypeEnum); + if (obj is ICollection collection) + { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry)); + return string.Join(",", entries); + } return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs index 65e7ca0efcc..344a7a03cfd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Model public static string JustSymbolEnumToJsonValue(JustSymbolEnum value) { if (value == JustSymbolEnum.GreaterThanOrEqualTo) - return ">="; + return ">="; if (value == JustSymbolEnum.Dollar) return "$"; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index d79076dcd63..bfdfc0d172a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -60,5 +60,25 @@ namespace Org.OpenAPITools.Test.Api var response = await _instance.FooGetAsync(); Assert.IsType(response); } + + /// + /// Test GetCountry + /// + [Fact (Skip = "not implemented")] + public async Task GetCountryAsyncTest() + { + string country = default; + await _instance.GetCountryAsync(country); + } + + /// + /// Test Hello + /// + [Fact (Skip = "not implemented")] + public async Task HelloAsyncTest() + { + var response = await _instance.HelloAsync(); + Assert.IsType>(response); + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs index 174a7e333af..94e3f6fe7fe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs index c7479a3c343..03049757efe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs index 95bd1593503..92c9b0708a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs index 8c38ac47af7..c4b0b209a91 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs index a2a9a2d49de..9b85782ecd4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs index 0610780d65d..d52d7930bb2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs index e0bd59e7732..6e10936831f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs index 8f046a0bf6b..14b87779757 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs index 53b2fe30fdb..82b117e28c2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs index df87ba3aaaa..d0dea235061 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs index 6f31ba2029b..f86e93c73ca 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs index 6cb6c62ffd0..57083de2697 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs index 9798a17577b..62e066a4fc3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs index b84c7c85a7d..b2dffa3c803 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs index 3498bb0c152..a59e2faf42d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs index 402a476d079..506c917ef4d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs index 822f8241fa0..d4f8fa6bdb1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs index d4de4c47417..d43ae8711b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs index f1b0aa1005c..4deace3c3a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs index 2e6c120d8fa..ba942072dd7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs index 3f2f96e73a1..93bb0120f1d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs index 087d38674bb..f089b42b81d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs index f98989439ed..5825715de0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs index 85ecbfdda55..607a7db80ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs index 1e86d761507..0b64ef242be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs index ef2eabfca31..164893d05a6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs index c38867cb5ae..81cb6fa4013 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs index ee3d000f32f..f7da9372776 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs index e2fc2d02282..8b152665a90 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs index 60e3aca92bd..8cff9853a04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs index 9ab78a59779..ccf950daf3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs index 9836a779bf0..ac711bc52d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs index 4f0e7079bc8..6ddf36e3b3f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs index b7313941a69..3a34eb830b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs index c0bdf85f9b0..583fec1a869 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs index d3a978bdc4c..cee4ce9c80f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -176,6 +175,22 @@ namespace Org.OpenAPITools.Test.Model // TODO unit test for the property 'StringProperty' } /// + /// Test the property 'UnsignedInteger' + /// + [Fact] + public void UnsignedIntegerTest() + { + // TODO unit test for the property 'UnsignedInteger' + } + /// + /// Test the property 'UnsignedLong' + /// + [Fact] + public void UnsignedLongTest() + { + // TODO unit test for the property 'UnsignedLong' + } + /// /// Test the property 'Uuid' /// [Fact] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs index 3ef884e59c6..27433724a6a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs index 9ab6b7f2781..ca0d7778511 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs index 036c5641cf4..ae3fb07857b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs index 182cf7350b7..eee8d61e4fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs index d9a07efcf9a..b5cac232be4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs index d29edf5dd10..9a618a94825 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs index 2fed6f0b4cc..60103ce0814 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs index 398a4644921..859c553af6d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs index 0889d80a708..f036aec8e7d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs index 0dc95aa6b23..975acebd3bf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs index d94f882e0a2..fd9d3deca41 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -79,6 +78,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Uuid' } + /// + /// Test the property 'UuidWithPattern' + /// + [Fact] + public void UuidWithPatternTest() + { + // TODO unit test for the property 'UuidWithPattern' + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs index 31f2a754314..09a24ecc6a8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs index 40b3700ce95..973df04edba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs index 523b3e050aa..c2024c83ac2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs index adf7c14f131..5fab915d647 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs index ed52163e5c2..5f208e16e82 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs index 734d03e5e7a..3476391608d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs index 5db923c1d3f..be8649eda4e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs index 9e9b651f818..2b962665b0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs index 10682e72f21..7c83fb4ca0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs index 8c176d9f94c..173aa6b07c0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs index 9f6d8b52b6c..1aeee70f3d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs index e51365edb27..1fa418e64f9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs index 36e6a060f97..3225b846de0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs index b38c693d1a1..5474da73214 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs index 34cae43eac1..0d8b6863baf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs index 66cfbf7bdb5..4899ef39cf9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs index 0e85eabf160..95949c3b099 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs index 98aad34f4b4..cd8ea904c9f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs index 42243bd29c0..c846d9c5661 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs index e15b2c5c749..26c0dcaf06a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs index 7e99972f26e..8ced65980fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs index 9969564490d..919961faa02 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs index cad95d2963c..da3ee273f06 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs index 3129f3775c8..49ae5aa0208 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs index a33da20eda6..4791f74d1a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs index b2d995af504..2772e17b595 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs index 0221971c076..d6736b399b6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs index 1a5bb10af80..0efee731657 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs index 92a5f823659..d9390261061 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs index 924d6b42d7f..ad87002d06e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs index 9701da6a541..8942407fa8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs index a464c80c84c..6f96a87cdf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs index 91a7b21f213..c1403b7f0e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs index 08b1c6056c9..b567a8ab958 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs index 2d16402e3ec..812a804966f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,10 +10,13 @@ using System; using System.IO; using System.Linq; +using System.Collections; +using System.Collections.Generic; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; using KellermanSoftware.CompareNetObjects; +using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client { @@ -122,9 +125,50 @@ namespace Org.OpenAPITools.Client // For example: 2009-06-15T13:45:30.0000000 return dateTimeOffset.ToString(format); if (obj is bool boolean) - return boolean ? "true" : "false"; - if (obj is System.Collections.ICollection collection) - return string.Join(",", collection.Cast()); + return boolean + ? "true" + : "false"; + if (obj is ChildCatAllOf.PetTypeEnum childCatAllOfPetTypeEnum) + return ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOfPetTypeEnum); + if (obj is EnumArrays.ArrayEnumEnum enumArraysArrayEnumEnum) + return EnumArrays.ArrayEnumEnumToJsonValue(enumArraysArrayEnumEnum); + if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) + return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum); + if (obj is EnumClass enumClass) + return EnumClassConverter.ToJsonValue(enumClass); + if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum) + return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString(); + if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum) + return EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTestEnumIntegerOnlyEnum).ToString(); + if (obj is EnumTest.EnumNumberEnum enumTestEnumNumberEnum) + return EnumTest.EnumNumberEnumToJsonValue(enumTestEnumNumberEnum).ToString(); + if (obj is EnumTest.EnumStringEnum enumTestEnumStringEnum) + return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); + if (obj is EnumTest.EnumStringRequiredEnum enumTestEnumStringRequiredEnum) + return EnumTest.EnumStringRequiredEnumToJsonValue(enumTestEnumStringRequiredEnum); + if (obj is MapTest.InnerEnum mapTestInnerEnum) + return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is Order.StatusEnum orderStatusEnum) + return Order.StatusEnumToJsonValue(orderStatusEnum); + if (obj is OuterEnum outerEnum) + return OuterEnumConverter.ToJsonValue(outerEnum); + if (obj is OuterEnumDefaultValue outerEnumDefaultValue) + return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue); + if (obj is OuterEnumInteger outerEnumInteger) + return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString(); + if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) + return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString(); + if (obj is Pet.StatusEnum petStatusEnum) + return Pet.StatusEnumToJsonValue(petStatusEnum); + if (obj is Zebra.TypeEnum zebraTypeEnum) + return Zebra.TypeEnumToJsonValue(zebraTypeEnum); + if (obj is ICollection collection) + { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry)); + return string.Join(",", entries); + } return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 3372d66ab2a..131618bf7d9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -132,7 +132,7 @@ namespace Org.OpenAPITools.Model public static string JustSymbolEnumToJsonValue(JustSymbolEnum value) { if (value == JustSymbolEnum.GreaterThanOrEqualTo) - return ">="; + return ">="; if (value == JustSymbolEnum.Dollar) return "$"; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultAllOfTests.cs index d534024a85d..79cac16d985 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs index 026277c98bb..aa1b838ba24 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildAllOfTests.cs index 54deefe8954..60403279a85 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs index cb536202248..cb9a378dbe2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs index cd3e2caf429..3cc4b096518 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs index b8b2d106962..d8a9f0ca4a0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -12,10 +12,13 @@ using System; using System.IO; using System.Linq; +using System.Collections; +using System.Collections.Generic; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; using KellermanSoftware.CompareNetObjects; +using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client { @@ -124,9 +127,16 @@ namespace Org.OpenAPITools.Client // For example: 2009-06-15T13:45:30.0000000 return dateTimeOffset.ToString(format); if (obj is bool boolean) - return boolean ? "true" : "false"; - if (obj is System.Collections.ICollection collection) - return string.Join(",", collection.Cast()); + return boolean + ? "true" + : "false"; + if (obj is ICollection collection) + { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry)); + return string.Join(",", entries); + } return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs index 82bd275c090..e0064920ad5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs index db7177c2d9e..6c54c0fb07e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs index 11402c0eb59..db7695996e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs index f8e5e299afa..6eb7acc88f4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -12,10 +12,13 @@ using System; using System.IO; using System.Linq; +using System.Collections; +using System.Collections.Generic; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; using KellermanSoftware.CompareNetObjects; +using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client { @@ -124,9 +127,16 @@ namespace Org.OpenAPITools.Client // For example: 2009-06-15T13:45:30.0000000 return dateTimeOffset.ToString(format); if (obj is bool boolean) - return boolean ? "true" : "false"; - if (obj is System.Collections.ICollection collection) - return string.Join(",", collection.Cast()); + return boolean + ? "true" + : "false"; + if (obj is ICollection collection) + { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry)); + return string.Join(",", entries); + } return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs index 82bd275c090..e0064920ad5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs index db7177c2d9e..6c54c0fb07e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs index 11402c0eb59..db7695996e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs index f8e5e299afa..6eb7acc88f4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -12,10 +12,13 @@ using System; using System.IO; using System.Linq; +using System.Collections; +using System.Collections.Generic; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; using KellermanSoftware.CompareNetObjects; +using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client { @@ -124,9 +127,16 @@ namespace Org.OpenAPITools.Client // For example: 2009-06-15T13:45:30.0000000 return dateTimeOffset.ToString(format); if (obj is bool boolean) - return boolean ? "true" : "false"; - if (obj is System.Collections.ICollection collection) - return string.Join(",", collection.Cast()); + return boolean + ? "true" + : "false"; + if (obj is ICollection collection) + { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry)); + return string.Join(",", entries); + } return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index d79076dcd63..bfdfc0d172a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -60,5 +60,25 @@ namespace Org.OpenAPITools.Test.Api var response = await _instance.FooGetAsync(); Assert.IsType(response); } + + /// + /// Test GetCountry + /// + [Fact (Skip = "not implemented")] + public async Task GetCountryAsyncTest() + { + string country = default; + await _instance.GetCountryAsync(country); + } + + /// + /// Test Hello + /// + [Fact (Skip = "not implemented")] + public async Task HelloAsyncTest() + { + var response = await _instance.HelloAsync(); + Assert.IsType>(response); + } } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs index 174a7e333af..94e3f6fe7fe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs index c7479a3c343..03049757efe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs index 95bd1593503..92c9b0708a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs index 8c38ac47af7..c4b0b209a91 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs index a2a9a2d49de..9b85782ecd4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs index 0610780d65d..d52d7930bb2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs index e0bd59e7732..6e10936831f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs index 8f046a0bf6b..14b87779757 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs index 53b2fe30fdb..82b117e28c2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs index df87ba3aaaa..d0dea235061 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs index 6f31ba2029b..f86e93c73ca 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs index 6cb6c62ffd0..57083de2697 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs index 9798a17577b..62e066a4fc3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs index b84c7c85a7d..b2dffa3c803 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs index 3498bb0c152..a59e2faf42d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs index 402a476d079..506c917ef4d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs index 822f8241fa0..d4f8fa6bdb1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs index d4de4c47417..d43ae8711b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs index f1b0aa1005c..4deace3c3a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs index 2e6c120d8fa..ba942072dd7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs index 3f2f96e73a1..93bb0120f1d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs index 087d38674bb..f089b42b81d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs index f98989439ed..5825715de0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs index 85ecbfdda55..607a7db80ad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs index 1e86d761507..0b64ef242be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs index ef2eabfca31..164893d05a6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs index c38867cb5ae..81cb6fa4013 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs index ee3d000f32f..f7da9372776 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs index e2fc2d02282..8b152665a90 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs index 60e3aca92bd..8cff9853a04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs index 9ab78a59779..ccf950daf3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs index 9836a779bf0..ac711bc52d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs index 4f0e7079bc8..6ddf36e3b3f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs index b7313941a69..3a34eb830b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs index c0bdf85f9b0..583fec1a869 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs index d3a978bdc4c..cee4ce9c80f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -176,6 +175,22 @@ namespace Org.OpenAPITools.Test.Model // TODO unit test for the property 'StringProperty' } /// + /// Test the property 'UnsignedInteger' + /// + [Fact] + public void UnsignedIntegerTest() + { + // TODO unit test for the property 'UnsignedInteger' + } + /// + /// Test the property 'UnsignedLong' + /// + [Fact] + public void UnsignedLongTest() + { + // TODO unit test for the property 'UnsignedLong' + } + /// /// Test the property 'Uuid' /// [Fact] diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs index 3ef884e59c6..27433724a6a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs index 9ab6b7f2781..ca0d7778511 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs index 036c5641cf4..ae3fb07857b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs index 182cf7350b7..eee8d61e4fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs index d9a07efcf9a..b5cac232be4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs index d29edf5dd10..9a618a94825 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs index 2fed6f0b4cc..60103ce0814 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs index 398a4644921..859c553af6d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs index 0889d80a708..f036aec8e7d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs index 0dc95aa6b23..975acebd3bf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs index d94f882e0a2..fd9d3deca41 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -79,6 +78,14 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Uuid' } + /// + /// Test the property 'UuidWithPattern' + /// + [Fact] + public void UuidWithPatternTest() + { + // TODO unit test for the property 'UuidWithPattern' + } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs index 31f2a754314..09a24ecc6a8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs index 40b3700ce95..973df04edba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs index 523b3e050aa..c2024c83ac2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs index adf7c14f131..5fab915d647 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs index ed52163e5c2..5f208e16e82 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs index 734d03e5e7a..3476391608d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs index 5db923c1d3f..be8649eda4e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs index 9e9b651f818..2b962665b0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs index 10682e72f21..7c83fb4ca0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs index 8c176d9f94c..173aa6b07c0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs index 9f6d8b52b6c..1aeee70f3d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs index e51365edb27..1fa418e64f9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs index 36e6a060f97..3225b846de0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs index b38c693d1a1..5474da73214 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs index 34cae43eac1..0d8b6863baf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs index 66cfbf7bdb5..4899ef39cf9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs index 0e85eabf160..95949c3b099 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs index 98aad34f4b4..cd8ea904c9f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs index 42243bd29c0..c846d9c5661 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs index e15b2c5c749..26c0dcaf06a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs index 7e99972f26e..8ced65980fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs index 9969564490d..919961faa02 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs index cad95d2963c..da3ee273f06 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs index 3129f3775c8..49ae5aa0208 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs index a33da20eda6..4791f74d1a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs index b2d995af504..2772e17b595 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs index 0221971c076..d6736b399b6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs index 1a5bb10af80..0efee731657 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs index 92a5f823659..d9390261061 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs index 924d6b42d7f..ad87002d06e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs index 9701da6a541..8942407fa8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs index a464c80c84c..6f96a87cdf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs index 91a7b21f213..c1403b7f0e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs index 08b1c6056c9..b567a8ab958 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs index a6ecdf11c02..46f2d9ea2b3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,10 +10,13 @@ using System; using System.IO; using System.Linq; +using System.Collections; +using System.Collections.Generic; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; using KellermanSoftware.CompareNetObjects; +using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client { @@ -122,9 +125,50 @@ namespace Org.OpenAPITools.Client // For example: 2009-06-15T13:45:30.0000000 return dateTimeOffset.ToString(format); if (obj is bool boolean) - return boolean ? "true" : "false"; - if (obj is System.Collections.ICollection collection) - return string.Join(",", collection.Cast()); + return boolean + ? "true" + : "false"; + if (obj is ChildCatAllOf.PetTypeEnum childCatAllOfPetTypeEnum) + return ChildCatAllOf.PetTypeEnumToJsonValue(childCatAllOfPetTypeEnum); + if (obj is EnumArrays.ArrayEnumEnum enumArraysArrayEnumEnum) + return EnumArrays.ArrayEnumEnumToJsonValue(enumArraysArrayEnumEnum); + if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum) + return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum); + if (obj is EnumClass enumClass) + return EnumClassConverter.ToJsonValue(enumClass); + if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum) + return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString(); + if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum) + return EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTestEnumIntegerOnlyEnum).ToString(); + if (obj is EnumTest.EnumNumberEnum enumTestEnumNumberEnum) + return EnumTest.EnumNumberEnumToJsonValue(enumTestEnumNumberEnum).ToString(); + if (obj is EnumTest.EnumStringEnum enumTestEnumStringEnum) + return EnumTest.EnumStringEnumToJsonValue(enumTestEnumStringEnum); + if (obj is EnumTest.EnumStringRequiredEnum enumTestEnumStringRequiredEnum) + return EnumTest.EnumStringRequiredEnumToJsonValue(enumTestEnumStringRequiredEnum); + if (obj is MapTest.InnerEnum mapTestInnerEnum) + return MapTest.InnerEnumToJsonValue(mapTestInnerEnum); + if (obj is Order.StatusEnum orderStatusEnum) + return Order.StatusEnumToJsonValue(orderStatusEnum); + if (obj is OuterEnum outerEnum) + return OuterEnumConverter.ToJsonValue(outerEnum); + if (obj is OuterEnumDefaultValue outerEnumDefaultValue) + return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue); + if (obj is OuterEnumInteger outerEnumInteger) + return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString(); + if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) + return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString(); + if (obj is Pet.StatusEnum petStatusEnum) + return Pet.StatusEnumToJsonValue(petStatusEnum); + if (obj is Zebra.TypeEnum zebraTypeEnum) + return Zebra.TypeEnumToJsonValue(zebraTypeEnum); + if (obj is ICollection collection) + { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry)); + return string.Join(",", entries); + } return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 3372d66ab2a..131618bf7d9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -132,7 +132,7 @@ namespace Org.OpenAPITools.Model public static string JustSymbolEnumToJsonValue(JustSymbolEnum value) { if (value == JustSymbolEnum.GreaterThanOrEqualTo) - return ">="; + return ">="; if (value == JustSymbolEnum.Dollar) return "$"; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs index 608bdbc195a..8e33ee2d9b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs index 608bdbc195a..8e33ee2d9b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs index 608bdbc195a..8e33ee2d9b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs index 608bdbc195a..8e33ee2d9b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs index 1572f948775..6653454671d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -101,8 +102,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs index 608bdbc195a..8e33ee2d9b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs index 608bdbc195a..8e33ee2d9b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs index a2cd17c0c2c..4e45e6485db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -10,6 +10,7 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -115,8 +116,12 @@ namespace Org.OpenAPITools.Client return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); if (obj is bool boolean) return boolean ? "true" : "false"; - if (obj is ICollection collection) - return string.Join(",", collection.Cast()); + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } if (obj is Enum && HasEnumMemberAttrValue(obj)) return GetEnumMemberAttrValue(obj); From 0677eb50759c2729b0f15de9361cf584b28799d1 Mon Sep 17 00:00:00 2001 From: axesider Date: Sat, 25 Mar 2023 08:09:06 +0100 Subject: [PATCH 082/131] Correct check in SetHttpRetryManager (#15041) --- .../src/main/resources/cpp-ue4/api-source.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/api-source.mustache index 8d0efb6a1d9..d6091e4e3c7 100644 --- a/modules/openapi-generator/src/main/resources/cpp-ue4/api-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-ue4/api-source.mustache @@ -47,7 +47,7 @@ bool {{classname}}::IsValid() const void {{classname}}::SetHttpRetryManager(FHttpRetrySystem::FManager& InRetryManager) { - if(RetryManager != &GetHttpRetryManager()) + if (RetryManager != &InRetryManager) { DefaultRetryManager.Reset(); RetryManager = &InRetryManager; From 25adbe33a63eb99d67a3e91b869587007c609b37 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 25 Mar 2023 15:23:25 +0800 Subject: [PATCH 083/131] update cpp ue4 samples --- samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp | 2 +- samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp | 2 +- samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp index 3e52679fc3e..03ef4341bee 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp @@ -56,7 +56,7 @@ bool OpenAPIPetApi::IsValid() const void OpenAPIPetApi::SetHttpRetryManager(FHttpRetrySystem::FManager& InRetryManager) { - if(RetryManager != &GetHttpRetryManager()) + if (RetryManager != &InRetryManager) { DefaultRetryManager.Reset(); RetryManager = &InRetryManager; diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp index 04ee754d255..d0fe314e968 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp @@ -56,7 +56,7 @@ bool OpenAPIStoreApi::IsValid() const void OpenAPIStoreApi::SetHttpRetryManager(FHttpRetrySystem::FManager& InRetryManager) { - if(RetryManager != &GetHttpRetryManager()) + if (RetryManager != &InRetryManager) { DefaultRetryManager.Reset(); RetryManager = &InRetryManager; diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp index cc231f0be31..ca934a58b3c 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp @@ -56,7 +56,7 @@ bool OpenAPIUserApi::IsValid() const void OpenAPIUserApi::SetHttpRetryManager(FHttpRetrySystem::FManager& InRetryManager) { - if(RetryManager != &GetHttpRetryManager()) + if (RetryManager != &InRetryManager) { DefaultRetryManager.Reset(); RetryManager = &InRetryManager; From 18e28ab761ba854d78e503a1bf3ee0a2e41d9da7 Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Sat, 25 Mar 2023 09:44:40 +0200 Subject: [PATCH 084/131] [Java] maven plugin to clean-up output before generation (#14935) --- .../examples/java-client.xml | 5 +++-- .../examples/kotlin.xml | 1 + .../examples/multi-module/java-client/pom.xml | 4 ++-- .../openapitools/codegen/plugin/CodeGenMojo.java | 14 ++++++++++++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml index 0161bd026ea..c08e9f54908 100644 --- a/modules/openapi-generator-maven-plugin/examples/java-client.xml +++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml @@ -67,6 +67,7 @@ remote.org.openapitools.client.api remote.org.openapitools.client.model remote.org.openapitools.client + true @@ -76,8 +77,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 none diff --git a/modules/openapi-generator-maven-plugin/examples/kotlin.xml b/modules/openapi-generator-maven-plugin/examples/kotlin.xml index 34b94a80f20..e084401a9ec 100644 --- a/modules/openapi-generator-maven-plugin/examples/kotlin.xml +++ b/modules/openapi-generator-maven-plugin/examples/kotlin.xml @@ -26,6 +26,7 @@ ${project.basedir}/swagger.yaml + true kotlin diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml index 112163677f9..646168963fb 100644 --- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml +++ b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml @@ -59,8 +59,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 none diff --git a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java index 48f2d6ee07d..a7780239b2c 100644 --- a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java +++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java @@ -41,6 +41,7 @@ import java.util.Set; import com.google.common.io.ByteSource; import com.google.common.io.CharSource; import io.swagger.v3.parser.util.ClasspathHelper; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecution; @@ -99,6 +100,9 @@ public class CodeGenMojo extends AbstractMojo { @Parameter(name = "output", property = "openapi.generator.maven.plugin.output") private File output; + @Parameter(name = "cleanupOutput", property = "openapi.generator.maven.plugin.cleanupOutput", defaultValue = "false") + private boolean cleanupOutput; + /** * Location of the OpenAPI spec, as URL or file. */ @@ -494,6 +498,16 @@ public class CodeGenMojo extends AbstractMojo { LifecyclePhase.GENERATE_TEST_SOURCES.id().equals(mojo.getLifecyclePhase()) ? "generated-test-sources/openapi" : "generated-sources/openapi"); } + + if (cleanupOutput) { + try { + FileUtils.deleteDirectory(output); + LOGGER.info("Previous run output is removed from {}", output); + } catch (IOException e) { + LOGGER.warn("Failed to clean-up output directory {}", output, e); + } + } + addCompileSourceRootIfConfigured(); try { From e925336dafa80653d6be81a9f6d0b2d075c7f6ec Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 26 Mar 2023 10:46:15 +0800 Subject: [PATCH 085/131] remove allowStringInDateTimeParameters option (#15046) --- bin/configs/python-nextgen-echo-api.yaml | 1 - docs/generators/python-nextgen.md | 1 - .../languages/PythonNextgenClientCodegen.java | 20 +------------------ .../openapi_client/api/query_api.py | 6 +++--- .../python-nextgen/test/test_manual.py | 11 ---------- 5 files changed, 4 insertions(+), 35 deletions(-) diff --git a/bin/configs/python-nextgen-echo-api.yaml b/bin/configs/python-nextgen-echo-api.yaml index 47dd5fa3ba5..b9eb1f91416 100644 --- a/bin/configs/python-nextgen-echo-api.yaml +++ b/bin/configs/python-nextgen-echo-api.yaml @@ -4,4 +4,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml templateDir: modules/openapi-generator/src/main/resources/python-nextgen additionalProperties: hideGenerationTimestamp: "true" - allowStringInDateTimeParameters: true diff --git a/docs/generators/python-nextgen.md b/docs/generators/python-nextgen.md index b445f5b2218..cfde5ec5624 100644 --- a/docs/generators/python-nextgen.md +++ b/docs/generators/python-nextgen.md @@ -19,7 +19,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl | Option | Description | Values | Default | | ------ | ----------- | ------ | ------- | -|allowStringInDateTimeParameters|Allow string as input to datetime/date parameters for backward compartibility.| |false| |dateFormat|date format for query parameters| |%Y-%m-%d| |datetimeFormat|datetime format for query parameters| |%Y-%m-%dT%H:%M:%S%z| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java index 97ef3daa7fb..ad8fb7e387e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java @@ -47,7 +47,6 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements public static final String PACKAGE_URL = "packageUrl"; public static final String DEFAULT_LIBRARY = "urllib3"; public static final String RECURSION_LIMIT = "recursionLimit"; - public static final String ALLOW_STRING_IN_DATETIME_PARAMETERS = "allowStringInDateTimeParameters"; public static final String FLOAT_STRICT_TYPE = "floatStrictType"; public static final String DATETIME_FORMAT = "datetimeFormat"; public static final String DATE_FORMAT = "dateFormat"; @@ -57,7 +56,6 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements protected String modelDocPath = "docs" + File.separator; protected boolean hasModelsToImport = Boolean.FALSE; protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup - protected boolean allowStringInDateTimeParameters = false; // use StrictStr instead of datetime in parameters protected boolean floatStrictType = true; protected String datetimeFormat = "%Y-%m-%dT%H:%M:%S.%f%z"; protected String dateFormat = "%Y-%m-%d"; @@ -172,8 +170,6 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements cliOptions.add(new CliOption(CodegenConstants.SOURCECODEONLY_GENERATION, CodegenConstants.SOURCECODEONLY_GENERATION_DESC) .defaultValue(Boolean.FALSE.toString())); cliOptions.add(new CliOption(RECURSION_LIMIT, "Set the recursion limit. If not set, use the system default value.")); - cliOptions.add(new CliOption(ALLOW_STRING_IN_DATETIME_PARAMETERS, "Allow string as input to datetime/date parameters for backward compartibility.") - .defaultValue(Boolean.FALSE.toString())); cliOptions.add(new CliOption(FLOAT_STRICT_TYPE, "Use strict type for float, i.e. StrictFloat or confloat(strict=true, ...)") .defaultValue(Boolean.TRUE.toString())); cliOptions.add(new CliOption(DATETIME_FORMAT, "datetime format for query parameters") @@ -278,10 +274,6 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements additionalProperties.put(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, useOneOfDiscriminatorLookup); } - if (additionalProperties.containsKey(ALLOW_STRING_IN_DATETIME_PARAMETERS)) { - setAllowStringInDateTimeParameters(convertPropertyToBooleanAndWriteBack(ALLOW_STRING_IN_DATETIME_PARAMETERS)); - } - if (additionalProperties.containsKey(FLOAT_STRICT_TYPE)) { setFloatStrictType(convertPropertyToBooleanAndWriteBack(FLOAT_STRICT_TYPE)); } @@ -602,13 +594,7 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements datetimeImports.add("datetime"); } - if (allowStringInDateTimeParameters) { - pydanticImports.add("StrictStr"); - typingImports.add("Union"); - return String.format(Locale.ROOT, "Union[StrictStr, %s]", cp.dataType); - } else { - return cp.dataType; - } + return cp.dataType; } else if (cp.isUuid) { return cp.dataType; } else if (cp.isFreeFormObject) { // type: object @@ -1409,10 +1395,6 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements return "var_" + name; } - public void setAllowStringInDateTimeParameters(boolean allowStringInDateTimeParameters) { - this.allowStringInDateTimeParameters = allowStringInDateTimeParameters; - } - public void setFloatStrictType(boolean floatStrictType) { this.floatStrictType = floatStrictType; } diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py index c5782a008e8..76524882431 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py @@ -24,7 +24,7 @@ from datetime import date, datetime from pydantic import StrictBool, StrictInt, StrictStr -from typing import Any, Dict, Optional, Union +from typing import Any, Dict, Optional from openapi_client.api_client import ApiClient @@ -47,7 +47,7 @@ class QueryApi(object): self.api_client = api_client @validate_arguments - def test_query_datetime_date_string(self, datetime_query : Optional[Union[StrictStr, datetime]] = None, date_query : Optional[Union[StrictStr, date]] = None, string_query : Optional[StrictStr] = None, **kwargs) -> str: # noqa: E501 + def test_query_datetime_date_string(self, datetime_query : Optional[datetime] = None, date_query : Optional[date] = None, string_query : Optional[StrictStr] = None, **kwargs) -> str: # noqa: E501 """Test query parameter(s) # noqa: E501 Test query parameter(s) # noqa: E501 @@ -82,7 +82,7 @@ class QueryApi(object): return self.test_query_datetime_date_string_with_http_info(datetime_query, date_query, string_query, **kwargs) # noqa: E501 @validate_arguments - def test_query_datetime_date_string_with_http_info(self, datetime_query : Optional[Union[StrictStr, datetime]] = None, date_query : Optional[Union[StrictStr, date]] = None, string_query : Optional[StrictStr] = None, **kwargs): # noqa: E501 + def test_query_datetime_date_string_with_http_info(self, datetime_query : Optional[datetime] = None, date_query : Optional[date] = None, string_query : Optional[StrictStr] = None, **kwargs): # noqa: E501 """Test query parameter(s) # noqa: E501 Test query parameter(s) # noqa: E501 diff --git a/samples/client/echo_api/python-nextgen/test/test_manual.py b/samples/client/echo_api/python-nextgen/test/test_manual.py index cf4e3d122a2..e36d55271ef 100644 --- a/samples/client/echo_api/python-nextgen/test/test_manual.py +++ b/samples/client/echo_api/python-nextgen/test/test_manual.py @@ -51,17 +51,6 @@ class TestManual(unittest.TestCase): e = EchoServerResponseParser(api_response) self.assertEqual(e.path, "/query/datetime/date/string?datetime_query=2013-10-20T19%3A20%3A30.000000-0500&date_query=2013-10-20&string_query=string_query_example") - def testDateTimeQueryWithString(self): - api_instance = openapi_client.QueryApi() - datetime_query = '19:20:30 2013-10-20' # datetime | (optional) - date_query = '2013-10-20' # date | (optional) - string_query = 'string_query_example' # str | (optional) - - # Test query parameter(s) - api_response = api_instance.test_query_datetime_date_string(datetime_query=datetime_query, date_query=date_query, string_query=string_query) - e = EchoServerResponseParser(api_response) - self.assertEqual(e.path, "/query/datetime/date/string?datetime_query=19%3A20%3A30%202013-10-20&date_query=2013-10-20&string_query=string_query_example") - class EchoServerResponseParser(): def __init__(self, http_response): if http_response is None: From f2e05555f336c15f7800fe80905768121335fd5c Mon Sep 17 00:00:00 2001 From: CTerasa-ep <122348071+CTerasa-ep@users.noreply.github.com> Date: Sun, 26 Mar 2023 04:47:18 +0200 Subject: [PATCH 086/131] Refactor ModelUtils methods without logic changes (#15030) * Refactor: ModelUtils: Harmonize isIntegerSchema with isStringSchema Make code isIntegerSchema look similar to isStringSchema and remove if-clause in favor to bool-OR '||'. * Refactor: ModelUtils: Simplify isMapSchema Factor out if sequence and use "return A || B || C;" scheme instead. * Refactor: ModelUtils: Simplify isUnsignedIntegerSchema Factor out 'if (x) {return true;} else {return false;}' and use 'return x;' instead. * Refactor: ModelUtils: Simplify isUnsignedLongSchema Factor out 'if (x) {return true;} else {return false;}' and use 'return x;' instead. * Refactor: ModelUtils: Simplify isTypeObjectSchema Factor out 'if (x) {return true;} return false;' and use 'return x;' instead. * Refactor: ModelUtils: Simplify isComposedSchema Factor out 'if (x) {return true;} return false;' and use 'return x;' instead. * Refactor: ModelUtils: Simplify isBooleanSchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isNumberSchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isDateSchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isDateTimeSchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isPasswordSchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isByteArraySchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isBinarySchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isFileSchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isUUIDSchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isEmailSchema Factor out 'if (x) {return true;} return y;' and use 'return x || y;' instead. * Refactor: ModelUtils: Simplify isObjectSchema Factor out 'if (x) {return true;} if (y) {return true;} return z;' and use 'return x || y || z;' instead. * Refactor: ModelUtils: Simplify isModel Factor out 'if (x) {return false;} if (y) {return true;} return z;' and use 'return !x && (y || z);' instead. * Refactor: ModelUtils: Simplify isModelWithPropertiesOnly Factor out 'if (x) {return false;} if (y) {return true;} return false;' and use 'return !x && y;' instead. * Refactor: ModelUtils: Simplify getApiResponse Factor out 'if (x) {return null;} if (y) {return z;} return null;' and use 'if (!x && y) {return z;} return null;' instead. * Refactor: ModelUtils: Simplify getParameter Factor out 'if (x) {return null;} if (y) {return z;} return null;' and use 'if (!x && y) {return z;} return null;' instead. * Refactor: ModelUtils: Simplify getCallback Factor out 'if (x) {return null;} if (y) {return z;} return null;' and use 'if (!x && y) {return z;} return null;' instead. * Refactor: ModelUtils: Simplify getHeader Factor out 'if (x) {return null;} if (y) {return z;} return null;' and use 'if (!x && y) {return z;} return null;' instead. * Refactor: ModelUtils: Simplify isExtensionParent Factor out 'if (x) {return false;} else {y}' and use 'if (x) {return false;} y' instead. * Refactor: ModelUtils: Simplify isComplexComposedSchema Factor out 'if (x) {return true;} return false;' and use 'return x;' instead. --- .../codegen/utils/ModelUtils.java | 232 ++++++------------ 1 file changed, 74 insertions(+), 158 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index c28a0a6a214..b32b5b54c65 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -412,10 +412,7 @@ public class ModelUtils { * @return true if the specified schema is an Object schema. */ public static boolean isTypeObjectSchema(Schema schema) { - if (SchemaTypeUtil.OBJECT_TYPE.equals(schema.getType())) { - return true; - } - return false; + return SchemaTypeUtil.OBJECT_TYPE.equals(schema.getType()); } /** @@ -441,17 +438,11 @@ public class ModelUtils { * @return true if the specified schema is an Object schema. */ public static boolean isObjectSchema(Schema schema) { - if (schema instanceof ObjectSchema) { - return true; - } - - // must not be a map - if (SchemaTypeUtil.OBJECT_TYPE.equals(schema.getType()) && !(schema instanceof MapSchema)) { - return true; - } - - // must have at least one property - return schema.getType() == null && schema.getProperties() != null && !schema.getProperties().isEmpty(); + return (schema instanceof ObjectSchema) || + // must not be a map + (SchemaTypeUtil.OBJECT_TYPE.equals(schema.getType()) && !(schema instanceof MapSchema)) || + // must have at least one property + (schema.getType() == null && schema.getProperties() != null && !schema.getProperties().isEmpty()); } /** @@ -462,10 +453,7 @@ public class ModelUtils { * @return true if the specified schema is a Composed schema. */ public static boolean isComposedSchema(Schema schema) { - if (schema instanceof ComposedSchema) { - return true; - } - return false; + return schema instanceof ComposedSchema; } /** @@ -498,11 +486,7 @@ public class ModelUtils { count++; } - if (count > 1) { - return true; - } - - return false; + return count > 1; } /** @@ -540,19 +524,9 @@ public class ModelUtils { * @return true if the specified schema is a Map schema. */ public static boolean isMapSchema(Schema schema) { - if (schema instanceof MapSchema) { - return true; - } - - if (schema == null) { - return false; - } - - if (schema.getAdditionalProperties() instanceof Schema) { - return true; - } - - return schema.getAdditionalProperties() instanceof Boolean && (Boolean) schema.getAdditionalProperties(); + return (schema instanceof MapSchema) || + (schema.getAdditionalProperties() instanceof Schema) || + (schema.getAdditionalProperties() instanceof Boolean && (Boolean) schema.getAdditionalProperties()); } /** @@ -574,10 +548,7 @@ public class ModelUtils { } public static boolean isIntegerSchema(Schema schema) { - if (schema instanceof IntegerSchema) { - return true; - } - return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()); + return schema instanceof IntegerSchema || SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()); } public static boolean isShortSchema(Schema schema) { @@ -587,12 +558,9 @@ public class ModelUtils { } public static boolean isUnsignedIntegerSchema(Schema schema) { - if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) && // type: integer + return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) && // type: integer ("int32".equals(schema.getFormat()) || schema.getFormat() == null) && // format: int32 - (schema.getExtensions() != null && (Boolean) schema.getExtensions().getOrDefault("x-unsigned", Boolean.FALSE))) { // x-unsigned: true - return true; - } - return false; + (schema.getExtensions() != null && (Boolean) schema.getExtensions().getOrDefault("x-unsigned", Boolean.FALSE)); } public static boolean isLongSchema(Schema schema) { @@ -602,26 +570,17 @@ public class ModelUtils { } public static boolean isUnsignedLongSchema(Schema schema) { - if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) && // type: integer + return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) && // type: integer "int64".equals(schema.getFormat()) && // format: int64 - (schema.getExtensions() != null && (Boolean) schema.getExtensions().getOrDefault("x-unsigned", Boolean.FALSE))) { // x-unsigned: true - return true; - } - return false; + (schema.getExtensions() != null && (Boolean) schema.getExtensions().getOrDefault("x-unsigned", Boolean.FALSE)); } public static boolean isBooleanSchema(Schema schema) { - if (schema instanceof BooleanSchema) { - return true; - } - return SchemaTypeUtil.BOOLEAN_TYPE.equals(schema.getType()); + return schema instanceof BooleanSchema || SchemaTypeUtil.BOOLEAN_TYPE.equals(schema.getType()); } public static boolean isNumberSchema(Schema schema) { - if (schema instanceof NumberSchema) { - return true; - } - return SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType()); + return schema instanceof NumberSchema || SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType()); } public static boolean isFloatSchema(Schema schema) { @@ -637,66 +596,51 @@ public class ModelUtils { } public static boolean isDateSchema(Schema schema) { - if (schema instanceof DateSchema) { - return true; - } - - // format: date - return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.DATE_FORMAT.equals(schema.getFormat()); + return (schema instanceof DateSchema) || + // format: date + (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.DATE_FORMAT.equals(schema.getFormat())); } public static boolean isDateTimeSchema(Schema schema) { - if (schema instanceof DateTimeSchema) { - return true; - } - // format: date-time - return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.DATE_TIME_FORMAT.equals(schema.getFormat()); + return (schema instanceof DateTimeSchema) || + // format: date-time + (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.DATE_TIME_FORMAT.equals(schema.getFormat())); } public static boolean isPasswordSchema(Schema schema) { - if (schema instanceof PasswordSchema) { - return true; - } - // double - return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.PASSWORD_FORMAT.equals(schema.getFormat()); + return (schema instanceof PasswordSchema) || + // double + (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.PASSWORD_FORMAT.equals(schema.getFormat())); } public static boolean isByteArraySchema(Schema schema) { - if (schema instanceof ByteArraySchema) { - return true; - } - // format: byte - return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.BYTE_FORMAT.equals(schema.getFormat()); + return (schema instanceof ByteArraySchema) || + // format: byte + (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.BYTE_FORMAT.equals(schema.getFormat())); } public static boolean isBinarySchema(Schema schema) { - if (schema instanceof BinarySchema) { - return true; - } - // format: binary - return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.BINARY_FORMAT.equals(schema.getFormat()); + return (schema instanceof BinarySchema) || + // format: binary + (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.BINARY_FORMAT.equals(schema.getFormat())); } public static boolean isFileSchema(Schema schema) { - if (schema instanceof FileSchema) { - return true; - } - // file type in oas2 mapped to binary in oas3 - return isBinarySchema(schema); + return (schema instanceof FileSchema) || + // file type in oas2 mapped to binary in oas3 + isBinarySchema(schema); } public static boolean isUUIDSchema(Schema schema) { - if (schema instanceof UUIDSchema) { - return true; - } - // format: uuid - return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.UUID_FORMAT.equals(schema.getFormat()); + return (schema instanceof UUIDSchema) || + // format: uuid + (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.UUID_FORMAT.equals(schema.getFormat())); } public static boolean isURISchema(Schema schema) { @@ -706,12 +650,10 @@ public class ModelUtils { } public static boolean isEmailSchema(Schema schema) { - if (schema instanceof EmailSchema) { - return true; - } - // format: email - return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) - && SchemaTypeUtil.EMAIL_FORMAT.equals(schema.getFormat()); + return (schema instanceof EmailSchema) || + // format: email + (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && SchemaTypeUtil.EMAIL_FORMAT.equals(schema.getFormat())); } public static boolean isDecimalSchema(Schema schema) { @@ -727,17 +669,11 @@ public class ModelUtils { * @return true if it's a model with at least one properties */ public static boolean isModel(Schema schema) { - if (schema == null) { - return false; - } - - // has properties - if (null != schema.getProperties() && !schema.getProperties().isEmpty()) { - return true; - } - - // composed schema is a model, consider very simple ObjectSchema a model - return schema instanceof ComposedSchema || schema instanceof ObjectSchema; + return (schema != null) && + // has properties + ((null != schema.getProperties() && !schema.getProperties().isEmpty()) + // composed schema is a model, consider very simple ObjectSchema a model + || (schema instanceof ComposedSchema || schema instanceof ObjectSchema)); } /** @@ -747,16 +683,12 @@ public class ModelUtils { * @return true if it's a model with at least one properties */ public static boolean isModelWithPropertiesOnly(Schema schema) { - if (schema == null) { - return false; - } - - if (null != schema.getProperties() && !schema.getProperties().isEmpty() && // has properties - (schema.getAdditionalProperties() == null || // no additionalProperties is set - (schema.getAdditionalProperties() instanceof Boolean && !(Boolean) schema.getAdditionalProperties()))) { - return true; - } - return false; + return (schema != null) && + // has properties + (null != schema.getProperties() && !schema.getProperties().isEmpty()) && + // no additionalProperties is set + (schema.getAdditionalProperties() == null || + (schema.getAdditionalProperties() instanceof Boolean && !(Boolean) schema.getAdditionalProperties())); } public static boolean hasValidation(Schema sc) { @@ -967,11 +899,7 @@ public class ModelUtils { } public static ApiResponse getApiResponse(OpenAPI openAPI, String name) { - if (name == null) { - return null; - } - - if (openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getResponses() != null) { + if (name != null && openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getResponses() != null) { return openAPI.getComponents().getResponses().get(name); } return null; @@ -996,11 +924,7 @@ public class ModelUtils { } public static Parameter getParameter(OpenAPI openAPI, String name) { - if (name == null) { - return null; - } - - if (openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getParameters() != null) { + if (name != null && openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getParameters() != null) { return openAPI.getComponents().getParameters().get(name); } return null; @@ -1025,11 +949,7 @@ public class ModelUtils { } public static Callback getCallback(OpenAPI openAPI, String name) { - if (name == null) { - return null; - } - - if (openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getCallbacks() != null) { + if (name != null && openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getCallbacks() != null) { return openAPI.getComponents().getCallbacks().get(name); } return null; @@ -1336,11 +1256,7 @@ public class ModelUtils { } public static Header getHeader(OpenAPI openAPI, String name) { - if (name == null) { - return null; - } - - if (openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getHeaders() != null) { + if (name != null && openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getHeaders() != null) { return openAPI.getComponents().getHeaders().get(name); } return null; @@ -1538,17 +1454,17 @@ public class ModelUtils { public static boolean isExtensionParent(Schema schema) { if (schema.getExtensions() == null) { return false; + } + + Object xParent = schema.getExtensions().get("x-parent"); + if (xParent == null) { + return false; + } else if (xParent instanceof Boolean) { + return (Boolean) xParent; + } else if (xParent instanceof String) { + return StringUtils.isNotEmpty((String) xParent); } else { - Object xParent = schema.getExtensions().get("x-parent"); - if (xParent == null) { - return false; - } else if (xParent instanceof Boolean) { - return (Boolean) xParent; - } else if (xParent instanceof String) { - return StringUtils.isNotEmpty((String) xParent); - } else { - return false; - } + return false; } } From 56e5122a6a8e62c4f85cfe7f7f1b3118689a5130 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 26 Mar 2023 11:56:26 +0800 Subject: [PATCH 087/131] Add new openapi-normalizer rule REFACTOR_ALLOF_WITH_PROPERTIES_ONLY (#15039) * add new rule REFACTOR_ALLOF_WITH_PROPERTIES_ONLY * update other attributes * minor refactoring --- docs/customization.md | 9 ++- .../codegen/OpenAPINormalizer.java | 67 +++++++++++++++++++ .../codegen/utils/ModelUtils.java | 13 ++++ .../codegen/OpenAPINormalizerTest.java | 26 +++++++ .../codegen/java/JavaClientCodegenTest.java | 2 +- .../resources/3_0/allOf_extension_parent.yaml | 12 ++++ 6 files changed, 127 insertions(+), 2 deletions(-) diff --git a/docs/customization.md b/docs/customization.md index d8ff7fb0746..4b5815efed9 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -458,7 +458,6 @@ OpenAPI Normalizer (off by default) transforms the input OpenAPI doc/spec (which - `REF_AS_PARENT_IN_ALLOF`: when set to `true`, child schemas in `allOf` is considered a parent if it's a `$ref` (instead of inline schema). - Example: ``` java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/allOf_extension_parent.yaml -o /tmp/java-okhttp/ --openapi-normalizer REF_AS_PARENT_IN_ALLOF=true @@ -512,3 +511,11 @@ Example: ``` java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/addUnsignedToIntegerWithInvalidMaxValue_test.yaml -o /tmp/java-okhttp/ --openapi-normalizer ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE=true ``` + +- `REFACTOR_ALLOF_WITH_PROPERTIES_ONLY`: When set to true, refactor schema with allOf and properties in the same level to a schema with allOf only and, the allOf contains a new schema containing the properties in the top level. + +Example: +``` +java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/allOf_extension_parent.yaml -o /tmp/java-okhttp/ --openapi-normalizer REFACTOR_ALLOF_WITH_PROPERTIES_ONLY=true +``` + diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index d801f89e609..794d3c8110c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -82,6 +82,11 @@ public class OpenAPINormalizer { final String ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE = "ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE"; boolean addUnsignedToIntegerWithInvalidMaxValue; + // when set to true, refactor schema with allOf and properties in the same level to a schema with allOf only and + // the allOf contains a new schema containing the properties in the top level + final String REFACTOR_ALLOF_WITH_PROPERTIES_ONLY = "REFACTOR_ALLOF_WITH_PROPERTIES_ONLY"; + boolean refactorAllOfWithPropertiesOnly; + // ============= end of rules ============= /** @@ -141,6 +146,10 @@ public class OpenAPINormalizer { if (enableAll || "true".equalsIgnoreCase(rules.get(ADD_UNSIGNED_TO_INTEGER_WITH_INVALID_MAX_VALUE))) { addUnsignedToIntegerWithInvalidMaxValue = true; } + + if (enableAll || "true".equalsIgnoreCase(rules.get(REFACTOR_ALLOF_WITH_PROPERTIES_ONLY))) { + refactorAllOfWithPropertiesOnly = true; + } } /** @@ -346,6 +355,9 @@ public class OpenAPINormalizer { return normalizeOneOf(schema, visitedSchemas); } else if (ModelUtils.isAnyOf(schema)) { // anyOf return normalizeAnyOf(schema, visitedSchemas); + } else if (ModelUtils.isAllOfWithProperties(schema)) { // allOf with properties + schema = normalizeAllOfWithProperties(schema, visitedSchemas); + normalizeSchema(schema, visitedSchemas); } else if (ModelUtils.isAllOf(schema)) { // allOf return normalizeAllOf(schema, visitedSchemas); } else if (ModelUtils.isComposedSchema(schema)) { // composed schema @@ -427,6 +439,20 @@ public class OpenAPINormalizer { return schema; } + private Schema normalizeAllOfWithProperties(Schema schema, Set visitedSchemas) { + for (Object item : schema.getAllOf()) { + if (!(item instanceof Schema)) { + throw new RuntimeException("Error! allOf schema is not of the type Schema: " + item); + } + // normalize allOf sub schemas one by one + normalizeSchema((Schema) item, visitedSchemas); + } + // process rules here + schema = processRefactorAllOfWithPropertiesOnly(schema); + + return schema; + } + private Schema normalizeOneOf(Schema schema, Set visitedSchemas) { for (Object item : schema.getOneOf()) { if (item == null) { @@ -759,5 +785,46 @@ public class OpenAPINormalizer { } } + /* + * When set to true, refactor schema with allOf and properties in the same level to a schema with allOf only and + * the allOf contains a new schema containing the properties in the top level. + * + * @param schema Schema + * @return Schema + */ + private Schema processRefactorAllOfWithPropertiesOnly(Schema schema) { + if (!refactorAllOfWithPropertiesOnly && !enableAll) { + return schema; + } + + ObjectSchema os = new ObjectSchema(); + // set the properties, etc of the new schema to the properties of schema + os.setProperties(schema.getProperties()); + os.setRequired(schema.getRequired()); + os.setAdditionalProperties(schema.getAdditionalProperties()); + os.setNullable(schema.getNullable()); + os.setDescription(schema.getDescription()); + os.setDeprecated(schema.getDeprecated()); + os.setExample(schema.getExample()); + os.setExamples(schema.getExamples()); + os.setTitle(schema.getTitle()); + schema.getAllOf().add(os); // move new schema as a child schema of allOf + // clean up by removing properties, etc + schema.setProperties(null); + schema.setRequired(null); + schema.setAdditionalProperties(null); + schema.setNullable(null); + schema.setDescription(null); + schema.setDeprecated(null); + schema.setExample(null); + schema.setExamples(null); + schema.setTitle(null); + + // at this point the schema becomes a simple allOf (no properties) with an additional schema containing + // the properties + + return schema; + } + // ===================== end of rules ===================== } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index b32b5b54c65..75be8e7ef71 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -1811,6 +1811,19 @@ public class ModelUtils { return false; } + /** + * Returns true if the schema contains allOf and properties, + * and no oneOf/anyOf defined. + * + * @param schema the schema + * @return true if the schema contains allOf but no properties/oneOf/anyOf defined. + */ + public static boolean isAllOfWithProperties(Schema schema) { + return hasAllOf(schema) && (schema.getProperties() != null && !schema.getProperties().isEmpty()) && + (schema.getOneOf() == null || schema.getOneOf().isEmpty()) && + (schema.getAnyOf() == null || schema.getAnyOf().isEmpty()); + } + /** * Returns true if the schema contains oneOf but * no properties/allOf/anyOf defined. diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java index f953e5a148e..93deecc445d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java @@ -278,4 +278,30 @@ public class OpenAPINormalizerTest { assertEquals(schema3.getAnyOf().size(), 2); assertTrue(schema3.getNullable()); } + + @Test + public void testOpenAPINormalizerRefactorAllOfWithPropertiesOnly() { + // to test the rule REFACTOR_ALLOF_WITH_PROPERTIES_ONLY + OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOf_extension_parent.yaml"); + + ComposedSchema schema = (ComposedSchema) openAPI.getComponents().getSchemas().get("allOfWithProperties"); + assertEquals(schema.getAllOf().size(), 1); + assertEquals(schema.getProperties().size(), 2); + assertEquals(((Schema) schema.getProperties().get("isParent")).getType(), "boolean"); + assertEquals(((Schema) schema.getProperties().get("mum_or_dad")).getType(), "string"); + + Map options = new HashMap<>(); + options.put("REFACTOR_ALLOF_WITH_PROPERTIES_ONLY", "true"); + OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, options); + openAPINormalizer.normalize(); + + Schema schema2 = openAPI.getComponents().getSchemas().get("allOfWithProperties"); + assertEquals(schema2.getAllOf().size(), 2); + assertNull(schema2.getProperties()); + + Schema newSchema = (Schema) (schema2.getAllOf().get(1)); + assertEquals(((Schema) newSchema.getProperties().get("isParent")).getType(), "boolean"); + assertEquals(((Schema) newSchema.getProperties().get("mum_or_dad")).getType(), "string"); + assertEquals(newSchema.getRequired().get(0), "isParent"); + } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index d6fa2caebaa..5481eae35e1 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -1746,7 +1746,7 @@ public class JavaClientCodegenTest { generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); List files = generator.opts(clientOptInput).generate(); - Assert.assertEquals(files.size(), 30); + Assert.assertEquals(files.size(), 33); validateJavaSourceFiles(files); TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/model/Child.java"), diff --git a/modules/openapi-generator/src/test/resources/3_0/allOf_extension_parent.yaml b/modules/openapi-generator/src/test/resources/3_0/allOf_extension_parent.yaml index 8b5e2793604..a45d9d1cc2e 100644 --- a/modules/openapi-generator/src/test/resources/3_0/allOf_extension_parent.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/allOf_extension_parent.yaml @@ -85,3 +85,15 @@ components: type: boolean mum_or_dad: type: string + allOfWithProperties: + description: parent object without x-parent extension + type: object + allOf: + - $ref: '#/components/schemas/AnotherParent' + properties: + isParent: + type: boolean + mum_or_dad: + type: string + required: + - isParent \ No newline at end of file From a4dd90c01d3d2061cc2bcb5886c526bad184c67e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 26 Mar 2023 15:06:27 +0800 Subject: [PATCH 088/131] Better allOf handling in fromProperty (#15035) * fix allOf handling in fromProperty * add null check, update samples * update dart generator to handle allof with a single ref --- .../openapitools/codegen/DefaultCodegen.java | 6 ++--- .../languages/AbstractDartCodegen.java | 4 ++-- .../codegen/DefaultCodegenTest.java | 12 ++++++++++ .../test/resources/3_0/issue-5676-enums.yaml | 3 +++ .../model/all_of_with_single_ref.ex | 6 +++-- .../mp/docs/AllOfWithSingleRef.md | 2 +- .../se/docs/AllOfWithSingleRef.md | 2 +- .../docs/AllOfWithSingleRef.md | 2 +- .../client/model/AllOfWithSingleRef.java | 7 +++++- .../docs/AllOfWithSingleRef.md | 2 +- .../java/webclient/docs/AllOfWithSingleRef.md | 2 +- .../docs/Model/AllOfWithSingleRef.md | 2 +- .../lib/Model/AllOfWithSingleRef.php | 6 ++--- .../petstore/models/all_of_with_single_ref.rb | 22 +++++++++++++++++++ .../petstore/models/all_of_with_single_ref.rb | 22 +++++++++++++++++++ .../petstore/models/all_of_with_single_ref.rb | 22 +++++++++++++++++++ .../lib/src/model/all_of_with_single_ref.dart | 2 -- .../lib/src/model/all_of_with_single_ref.dart | 1 + .../lib/model/all_of_with_single_ref.dart | 6 +++++ .../models/all_of_with_single_ref.py | 10 ++++----- .../models/all_of_with_single_ref.py | 10 ++++----- .../3_0/model/AllOfWithSingleRef.cpp | 5 +---- .../generated/3_0/model/AllOfWithSingleRef.h | 3 ++- .../server/model/AllOfWithSingleRef.java | 2 ++ .../server/model/AllOfWithSingleRef.java | 2 ++ .../model/AllOfWithSingleRef.java | 1 + .../lib/app/Models/AllOfWithSingleRef.php | 2 +- 27 files changed, 129 insertions(+), 37 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 1b48c608a33..5d8639a0114 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 @@ -3795,8 +3795,8 @@ public class DefaultCodegen implements CodegenConfig { } Schema original = null; - // check if it's allOf (only 1 sub schema) with default/nullable/etc set in the top level - if (ModelUtils.isAllOf(p) && p.getAllOf().size() == 1 && ModelUtils.hasCommonAttributesDefined(p) ) { + // check if it's allOf (only 1 sub schema) with or without default/nullable/etc set in the top level + if (ModelUtils.isAllOf(p) && p.getAllOf().size() == 1 && !(this instanceof PythonClientCodegen)) { if (p.getAllOf().get(0) instanceof Schema) { original = p; p = (Schema) p.getAllOf().get(0); @@ -4002,7 +4002,7 @@ public class DefaultCodegen implements CodegenConfig { // restore original schema with default value, nullable, readonly etc if (original != null) { p = original; - // evaluate common attributes defined in the top level + // evaluate common attributes if defined in the top level if (p.getNullable() != null) { property.isNullable = p.getNullable(); } else if (p.getExtensions() != null && p.getExtensions().containsKey("x-nullable")) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java index 9ddfc6e42c9..e542f21b74f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java @@ -555,8 +555,8 @@ public abstract class AbstractDartCodegen extends DefaultCodegen { public CodegenProperty fromProperty(String name, Schema p, boolean required) { final CodegenProperty property = super.fromProperty(name, p, required); - // Handle composed properties - if (ModelUtils.isComposedSchema(p)) { + // Handle composed properties and it's NOT allOf with a single ref only + if (ModelUtils.isComposedSchema(p) && !(ModelUtils.isAllOf(p) && p.getAllOf().size() == 1)) { ComposedSchema composed = (ComposedSchema) p; // Count the occurrences of allOf/anyOf/oneOf with exactly one child element 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 515e7f52081..e78b5af3076 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 @@ -4582,6 +4582,18 @@ public class DefaultCodegenTest { Assert.assertFalse(defaultEnumSchemaProperty.isContainer); Assert.assertFalse(defaultEnumSchemaProperty.isPrimitiveType); Assert.assertEquals(defaultEnumSchemaProperty.defaultValue, "2"); + + // test allOf with a single sub-schema and no default value set in the top level + CodegenProperty allOfEnumSchemaProperty = modelWithReferencedSchema.vars.get(5); + Assert.assertEquals(allOfEnumSchemaProperty.getName(), "allofMinusnumberMinusenum"); + Assert.assertFalse(allOfEnumSchemaProperty.isEnum); + Assert.assertTrue(allOfEnumSchemaProperty.getIsEnumOrRef()); + Assert.assertTrue(allOfEnumSchemaProperty.isEnumRef); + Assert.assertFalse(allOfEnumSchemaProperty.isInnerEnum); + Assert.assertFalse(allOfEnumSchemaProperty.isString); + Assert.assertFalse(allOfEnumSchemaProperty.isContainer); + Assert.assertFalse(allOfEnumSchemaProperty.isPrimitiveType); + Assert.assertEquals(allOfEnumSchemaProperty.defaultValue, "null"); } @Test diff --git a/modules/openapi-generator/src/test/resources/3_0/issue-5676-enums.yaml b/modules/openapi-generator/src/test/resources/3_0/issue-5676-enums.yaml index cbfa2e6000e..68746de926e 100644 --- a/modules/openapi-generator/src/test/resources/3_0/issue-5676-enums.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/issue-5676-enums.yaml @@ -215,4 +215,7 @@ components: default: 2 allOf: - $ref: "#/components/schemas/NumberEnum" + allof-number-enum: + allOf: + - $ref: "#/components/schemas/NumberEnum" diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex index df660951bc4..cb9ace8ec80 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex @@ -14,13 +14,15 @@ defmodule OpenapiPetstore.Model.AllOfWithSingleRef do @type t :: %__MODULE__{ :username => String.t | nil, - :SingleRefType => any() | nil + :SingleRefType => OpenapiPetstore.Model.SingleRefType.t | nil } end defimpl Poison.Decoder, for: OpenapiPetstore.Model.AllOfWithSingleRef do - def decode(value, _options) do + import OpenapiPetstore.Deserializer + def decode(value, options) do value + |> deserialize(:SingleRefType, :struct, OpenapiPetstore.Model.SingleRefType, options) end end diff --git a/samples/client/petstore/java-helidon-client/mp/docs/AllOfWithSingleRef.md b/samples/client/petstore/java-helidon-client/mp/docs/AllOfWithSingleRef.md index 0a9e61bc682..4146d56a372 100644 --- a/samples/client/petstore/java-helidon-client/mp/docs/AllOfWithSingleRef.md +++ b/samples/client/petstore/java-helidon-client/mp/docs/AllOfWithSingleRef.md @@ -8,7 +8,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**username** | **String** | | [optional] | -|**singleRefType** | [**SingleRefType**](SingleRefType.md) | | [optional] | +|**singleRefType** | **SingleRefType** | | [optional] | diff --git a/samples/client/petstore/java-helidon-client/se/docs/AllOfWithSingleRef.md b/samples/client/petstore/java-helidon-client/se/docs/AllOfWithSingleRef.md index 0a9e61bc682..4146d56a372 100644 --- a/samples/client/petstore/java-helidon-client/se/docs/AllOfWithSingleRef.md +++ b/samples/client/petstore/java-helidon-client/se/docs/AllOfWithSingleRef.md @@ -8,7 +8,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**username** | **String** | | [optional] | -|**singleRefType** | [**SingleRefType**](SingleRefType.md) | | [optional] | +|**singleRefType** | **SingleRefType** | | [optional] | diff --git a/samples/client/petstore/java/apache-httpclient/docs/AllOfWithSingleRef.md b/samples/client/petstore/java/apache-httpclient/docs/AllOfWithSingleRef.md index 0a9e61bc682..4146d56a372 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/AllOfWithSingleRef.md +++ b/samples/client/petstore/java/apache-httpclient/docs/AllOfWithSingleRef.md @@ -8,7 +8,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**username** | **String** | | [optional] | -|**singleRefType** | [**SingleRefType**](SingleRefType.md) | | [optional] | +|**singleRefType** | **SingleRefType** | | [optional] | diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java index 68f60026b89..bd81167203f 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java @@ -180,7 +180,12 @@ public class AllOfWithSingleRef { // add `SingleRefType` to the URL query string if (getSingleRefType() != null) { - joiner.add(getSingleRefType().toUrlQueryString(prefix + "SingleRefType" + suffix)); + try { + joiner.add(String.format("%sSingleRefType%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSingleRefType()), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } } return joiner.toString(); diff --git a/samples/client/petstore/java/webclient-jakarta/docs/AllOfWithSingleRef.md b/samples/client/petstore/java/webclient-jakarta/docs/AllOfWithSingleRef.md index 0a9e61bc682..4146d56a372 100644 --- a/samples/client/petstore/java/webclient-jakarta/docs/AllOfWithSingleRef.md +++ b/samples/client/petstore/java/webclient-jakarta/docs/AllOfWithSingleRef.md @@ -8,7 +8,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**username** | **String** | | [optional] | -|**singleRefType** | [**SingleRefType**](SingleRefType.md) | | [optional] | +|**singleRefType** | **SingleRefType** | | [optional] | diff --git a/samples/client/petstore/java/webclient/docs/AllOfWithSingleRef.md b/samples/client/petstore/java/webclient/docs/AllOfWithSingleRef.md index 0a9e61bc682..4146d56a372 100644 --- a/samples/client/petstore/java/webclient/docs/AllOfWithSingleRef.md +++ b/samples/client/petstore/java/webclient/docs/AllOfWithSingleRef.md @@ -8,7 +8,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**username** | **String** | | [optional] | -|**singleRefType** | [**SingleRefType**](SingleRefType.md) | | [optional] | +|**singleRefType** | **SingleRefType** | | [optional] | diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AllOfWithSingleRef.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AllOfWithSingleRef.md index a8da431674c..d8a2b54b5a0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AllOfWithSingleRef.md +++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AllOfWithSingleRef.md @@ -5,6 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **username** | **string** | | [optional] -**single_ref_type** | [**SingleRefType**](SingleRefType.md) | | [optional] +**single_ref_type** | [**\OpenAPI\Client\Model\SingleRefType**](SingleRefType.md) | | [optional] [[Back to Model list]](../../README.md#models) [[Back to API list]](../../README.md#endpoints) [[Back to README]](../../README.md) diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php index e217bd93f3c..1615517c110 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php @@ -58,7 +58,7 @@ class AllOfWithSingleRef implements ModelInterface, ArrayAccess, \JsonSerializab */ protected static $openAPITypes = [ 'username' => 'string', - 'single_ref_type' => 'SingleRefType' + 'single_ref_type' => '\OpenAPI\Client\Model\SingleRefType' ]; /** @@ -326,7 +326,7 @@ class AllOfWithSingleRef implements ModelInterface, ArrayAccess, \JsonSerializab /** * Gets single_ref_type * - * @return SingleRefType|null + * @return \OpenAPI\Client\Model\SingleRefType|null */ public function getSingleRefType() { @@ -336,7 +336,7 @@ class AllOfWithSingleRef implements ModelInterface, ArrayAccess, \JsonSerializab /** * Sets single_ref_type * - * @param SingleRefType|null $single_ref_type single_ref_type + * @param \OpenAPI\Client\Model\SingleRefType|null $single_ref_type single_ref_type * * @return self */ diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb index ea186df537a..4ee2a0ec205 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb @@ -19,6 +19,28 @@ module Petstore attr_accessor :single_ref_type + class EnumAttributeValidator + attr_reader :datatype + attr_reader :allowable_values + + def initialize(datatype, allowable_values) + @allowable_values = allowable_values.map do |value| + case datatype.to_s + when /Integer/i + value.to_i + when /Float/i + value.to_f + else + value + end + end + end + + def valid?(value) + !value || allowable_values.include?(value) + end + end + # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map { diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb index ea186df537a..4ee2a0ec205 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb @@ -19,6 +19,28 @@ module Petstore attr_accessor :single_ref_type + class EnumAttributeValidator + attr_reader :datatype + attr_reader :allowable_values + + def initialize(datatype, allowable_values) + @allowable_values = allowable_values.map do |value| + case datatype.to_s + when /Integer/i + value.to_i + when /Float/i + value.to_f + else + value + end + end + end + + def valid?(value) + !value || allowable_values.include?(value) + end + end + # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map { diff --git a/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb index ea186df537a..4ee2a0ec205 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb @@ -19,6 +19,28 @@ module Petstore attr_accessor :single_ref_type + class EnumAttributeValidator + attr_reader :datatype + attr_reader :allowable_values + + def initialize(datatype, allowable_values) + @allowable_values = allowable_values.map do |value| + case datatype.to_s + when /Integer/i + value.to_i + when /Float/i + value.to_f + else + value + end + end + end + + def valid?(value) + !value || allowable_values.include?(value) + end + end + # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map { diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart index dd3a19e9d93..b654a66733e 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart @@ -69,5 +69,3 @@ class AllOfWithSingleRef { } - - diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/all_of_with_single_ref.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/all_of_with_single_ref.dart index 04f59d36012..5bcd7d9dee8 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/all_of_with_single_ref.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/all_of_with_single_ref.dart @@ -21,6 +21,7 @@ abstract class AllOfWithSingleRef implements Built #include #include +#include #include #include #include @@ -63,7 +64,6 @@ ptree AllOfWithSingleRef::toPropertyTree() const ptree pt; ptree tmp_node; pt.put("username", m_Username); - pt.add_child("SingleRefType", m_SingleRefType.toPropertyTree()); return pt; } @@ -71,9 +71,6 @@ void AllOfWithSingleRef::fromPropertyTree(ptree const &pt) { ptree tmp_node; m_Username = pt.get("username", ""); - if (pt.get_child_optional("SingleRefType")) { - m_SingleRefType = fromPt(pt.get_child("SingleRefType")); - } } std::string AllOfWithSingleRef::getUsername() const diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h index 7c4c278079d..9d0052abb41 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h @@ -25,6 +25,7 @@ #include "SingleRefType.h" #include #include +#include #include #include "helpers.h" @@ -72,7 +73,7 @@ public: protected: std::string m_Username = ""; - SingleRefType m_SingleRefType; + SingleRefType m_SingleRefType = SingleRefType{}; }; std::vector createAllOfWithSingleRefVectorFromJsonString(const std::string& json); diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/AllOfWithSingleRef.java b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/AllOfWithSingleRef.java index c6f0778d346..40e102a9cb3 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/AllOfWithSingleRef.java +++ b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/AllOfWithSingleRef.java @@ -12,6 +12,8 @@ package org.openapitools.server.model; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.server.model.SingleRefType; import jakarta.validation.constraints.*; import jakarta.validation.Valid; diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/AllOfWithSingleRef.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/AllOfWithSingleRef.java index b40d9201c0e..cdf67cc9aa4 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/AllOfWithSingleRef.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/AllOfWithSingleRef.java @@ -1,5 +1,7 @@ package org.openapitools.server.model; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.server.model.SingleRefType; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java index fb68166b6b2..443173966fe 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java @@ -16,6 +16,7 @@ package org.openapitools.model; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.SingleRefType; diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AllOfWithSingleRef.php b/samples/server/petstore/php-laravel/lib/app/Models/AllOfWithSingleRef.php index 90a2bca8d56..97b38ffcf76 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/AllOfWithSingleRef.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/AllOfWithSingleRef.php @@ -12,7 +12,7 @@ class AllOfWithSingleRef { /** @var string $username */ public $username = ""; - /** @var SingleRefType $singleRefType */ + /** @var \app\Models\SingleRefType $singleRefType */ public $singleRefType; } From d3de8abc2552053357100b337cfaf17726690a15 Mon Sep 17 00:00:00 2001 From: Mourad <1261626+mmourafiq@users.noreply.github.com> Date: Sun, 26 Mar 2023 17:40:06 +0200 Subject: [PATCH 089/131] Fix typo in api_client.mustache "configuraiton -> configuration" (#15050) --- .../src/main/resources/python-nextgen/api_client.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache index fb7320b3317..ef005c5e9db 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache @@ -56,7 +56,7 @@ class ApiClient(object): def __init__(self, configuration=None, header_name=None, header_value=None, cookie=None, pool_threads=1): - # use default configuraiton if none is provided + # use default configuration if none is provided if configuration is None: configuration = Configuration.get_default() self.configuration = configuration From 1cdcaeb1b9dd10730b01bcb87b8df2d89d3a8499 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 26 Mar 2023 23:45:20 +0800 Subject: [PATCH 090/131] update python-nextgen samples --- .../client/echo_api/python-nextgen/openapi_client/api_client.py | 2 +- .../petstore/python-nextgen-aiohttp/petstore_api/api_client.py | 2 +- .../client/petstore/python-nextgen/petstore_api/api_client.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api_client.py b/samples/client/echo_api/python-nextgen/openapi_client/api_client.py index ee78378e9ce..7a508e6fbfb 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api_client.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api_client.py @@ -64,7 +64,7 @@ class ApiClient(object): def __init__(self, configuration=None, header_name=None, header_value=None, cookie=None, pool_threads=1): - # use default configuraiton if none is provided + # use default configuration if none is provided if configuration is None: configuration = Configuration.get_default() self.configuration = configuration diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py index 464928ee442..9987a6267a7 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py @@ -63,7 +63,7 @@ class ApiClient(object): def __init__(self, configuration=None, header_name=None, header_value=None, cookie=None, pool_threads=1): - # use default configuraiton if none is provided + # use default configuration if none is provided if configuration is None: configuration = Configuration.get_default() self.configuration = configuration diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py index 3aad97eacca..20ee02c7efb 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py @@ -63,7 +63,7 @@ class ApiClient(object): def __init__(self, configuration=None, header_name=None, header_value=None, cookie=None, pool_threads=1): - # use default configuraiton if none is provided + # use default configuration if none is provided if configuration is None: configuration = Configuration.get_default() self.configuration = configuration From 36332331e40bd2009637ffc45a816190eccd7c39 Mon Sep 17 00:00:00 2001 From: RInverid <88377869+RInverid@users.noreply.github.com> Date: Wed, 29 Mar 2023 04:55:28 +0200 Subject: [PATCH 091/131] Skip null form values for Java native request builder (#15036) --- .../Java/libraries/native/api.mustache | 8 ++- .../org/openapitools/client/api/FormApi.java | 12 +++- .../org/openapitools/client/api/FakeApi.java | 72 ++++++++++++++----- .../org/openapitools/client/api/PetApi.java | 8 ++- .../org/openapitools/client/api/PetApi.java | 8 ++- .../org/openapitools/client/api/FakeApi.java | 72 ++++++++++++++----- .../org/openapitools/client/api/PetApi.java | 8 ++- 7 files changed, 141 insertions(+), 47 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache index 3d1f9dbc03b..f0f6960bfca 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache @@ -496,11 +496,15 @@ public class {{classname}} { {{#formParams}} {{#isArray}} for (int i=0; i < {{paramName}}.size(); i++) { - formValues.add(new BasicNameValuePair("{{{baseName}}}", {{paramName}}.get(i).toString())); + if ({{paramName}}.get(i) != null) { + formValues.add(new BasicNameValuePair("{{{baseName}}}", {{paramName}}.get(i).toString())); + } } {{/isArray}} {{^isArray}} - formValues.add(new BasicNameValuePair("{{{baseName}}}", {{paramName}}.toString())); + if ({{paramName}} != null) { + formValues.add(new BasicNameValuePair("{{{baseName}}}", {{paramName}}.toString())); + } {{/isArray}} {{/formParams}} HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java index c273cca16cc..5ea2af146b2 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java @@ -157,9 +157,15 @@ public class FormApi { localVarRequestBuilder.header("Accept", "text/plain"); List formValues = new ArrayList<>(); - formValues.add(new BasicNameValuePair("integer_form", integerForm.toString())); - formValues.add(new BasicNameValuePair("boolean_form", booleanForm.toString())); - formValues.add(new BasicNameValuePair("string_form", stringForm.toString())); + if (integerForm != null) { + formValues.add(new BasicNameValuePair("integer_form", integerForm.toString())); + } + if (booleanForm != null) { + formValues.add(new BasicNameValuePair("boolean_form", booleanForm.toString())); + } + if (stringForm != null) { + formValues.add(new BasicNameValuePair("string_form", stringForm.toString())); + } HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index a2ebd3c168f..c4809a5ea03 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1032,20 +1032,48 @@ public class FakeApi { localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - formValues.add(new BasicNameValuePair("integer", integer.toString())); - formValues.add(new BasicNameValuePair("int32", int32.toString())); - formValues.add(new BasicNameValuePair("int64", int64.toString())); - formValues.add(new BasicNameValuePair("number", number.toString())); - formValues.add(new BasicNameValuePair("float", _float.toString())); - formValues.add(new BasicNameValuePair("double", _double.toString())); - formValues.add(new BasicNameValuePair("string", string.toString())); - formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString())); - formValues.add(new BasicNameValuePair("byte", _byte.toString())); - formValues.add(new BasicNameValuePair("binary", binary.toString())); - formValues.add(new BasicNameValuePair("date", date.toString())); - formValues.add(new BasicNameValuePair("dateTime", dateTime.toString())); - formValues.add(new BasicNameValuePair("password", password.toString())); - formValues.add(new BasicNameValuePair("callback", paramCallback.toString())); + if (integer != null) { + formValues.add(new BasicNameValuePair("integer", integer.toString())); + } + if (int32 != null) { + formValues.add(new BasicNameValuePair("int32", int32.toString())); + } + if (int64 != null) { + formValues.add(new BasicNameValuePair("int64", int64.toString())); + } + if (number != null) { + formValues.add(new BasicNameValuePair("number", number.toString())); + } + if (_float != null) { + formValues.add(new BasicNameValuePair("float", _float.toString())); + } + if (_double != null) { + formValues.add(new BasicNameValuePair("double", _double.toString())); + } + if (string != null) { + formValues.add(new BasicNameValuePair("string", string.toString())); + } + if (patternWithoutDelimiter != null) { + formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString())); + } + if (_byte != null) { + formValues.add(new BasicNameValuePair("byte", _byte.toString())); + } + if (binary != null) { + formValues.add(new BasicNameValuePair("binary", binary.toString())); + } + if (date != null) { + formValues.add(new BasicNameValuePair("date", date.toString())); + } + if (dateTime != null) { + formValues.add(new BasicNameValuePair("dateTime", dateTime.toString())); + } + if (password != null) { + formValues.add(new BasicNameValuePair("password", password.toString())); + } + if (paramCallback != null) { + formValues.add(new BasicNameValuePair("callback", paramCallback.toString())); + } HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { @@ -1172,9 +1200,13 @@ public class FakeApi { List formValues = new ArrayList<>(); for (int i=0; i < enumFormStringArray.size(); i++) { - formValues.add(new BasicNameValuePair("enum_form_string_array", enumFormStringArray.get(i).toString())); + if (enumFormStringArray.get(i) != null) { + formValues.add(new BasicNameValuePair("enum_form_string_array", enumFormStringArray.get(i).toString())); + } + } + if (enumFormString != null) { + formValues.add(new BasicNameValuePair("enum_form_string", enumFormString.toString())); } - formValues.add(new BasicNameValuePair("enum_form_string", enumFormString.toString())); HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { @@ -1585,8 +1617,12 @@ public class FakeApi { localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - formValues.add(new BasicNameValuePair("param", param.toString())); - formValues.add(new BasicNameValuePair("param2", param2.toString())); + if (param != null) { + formValues.add(new BasicNameValuePair("param", param.toString())); + } + if (param2 != null) { + formValues.add(new BasicNameValuePair("param2", param2.toString())); + } HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java index 42e39cee839..9fc98447324 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java @@ -724,8 +724,12 @@ public class PetApi { localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - formValues.add(new BasicNameValuePair("name", name.toString())); - formValues.add(new BasicNameValuePair("status", status.toString())); + if (name != null) { + formValues.add(new BasicNameValuePair("name", name.toString())); + } + if (status != null) { + formValues.add(new BasicNameValuePair("status", status.toString())); + } HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java index b7ca4bee0f8..03617eed08e 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java @@ -646,8 +646,12 @@ public class PetApi { localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - formValues.add(new BasicNameValuePair("name", name.toString())); - formValues.add(new BasicNameValuePair("status", status.toString())); + if (name != null) { + formValues.add(new BasicNameValuePair("name", name.toString())); + } + if (status != null) { + formValues.add(new BasicNameValuePair("status", status.toString())); + } HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 3e0efc40c8e..b73dbbc80c0 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -875,20 +875,48 @@ public class FakeApi { localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - formValues.add(new BasicNameValuePair("integer", integer.toString())); - formValues.add(new BasicNameValuePair("int32", int32.toString())); - formValues.add(new BasicNameValuePair("int64", int64.toString())); - formValues.add(new BasicNameValuePair("number", number.toString())); - formValues.add(new BasicNameValuePair("float", _float.toString())); - formValues.add(new BasicNameValuePair("double", _double.toString())); - formValues.add(new BasicNameValuePair("string", string.toString())); - formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString())); - formValues.add(new BasicNameValuePair("byte", _byte.toString())); - formValues.add(new BasicNameValuePair("binary", binary.toString())); - formValues.add(new BasicNameValuePair("date", date.toString())); - formValues.add(new BasicNameValuePair("dateTime", dateTime.toString())); - formValues.add(new BasicNameValuePair("password", password.toString())); - formValues.add(new BasicNameValuePair("callback", paramCallback.toString())); + if (integer != null) { + formValues.add(new BasicNameValuePair("integer", integer.toString())); + } + if (int32 != null) { + formValues.add(new BasicNameValuePair("int32", int32.toString())); + } + if (int64 != null) { + formValues.add(new BasicNameValuePair("int64", int64.toString())); + } + if (number != null) { + formValues.add(new BasicNameValuePair("number", number.toString())); + } + if (_float != null) { + formValues.add(new BasicNameValuePair("float", _float.toString())); + } + if (_double != null) { + formValues.add(new BasicNameValuePair("double", _double.toString())); + } + if (string != null) { + formValues.add(new BasicNameValuePair("string", string.toString())); + } + if (patternWithoutDelimiter != null) { + formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString())); + } + if (_byte != null) { + formValues.add(new BasicNameValuePair("byte", _byte.toString())); + } + if (binary != null) { + formValues.add(new BasicNameValuePair("binary", binary.toString())); + } + if (date != null) { + formValues.add(new BasicNameValuePair("date", date.toString())); + } + if (dateTime != null) { + formValues.add(new BasicNameValuePair("dateTime", dateTime.toString())); + } + if (password != null) { + formValues.add(new BasicNameValuePair("password", password.toString())); + } + if (paramCallback != null) { + formValues.add(new BasicNameValuePair("callback", paramCallback.toString())); + } HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { @@ -1012,9 +1040,13 @@ public class FakeApi { List formValues = new ArrayList<>(); for (int i=0; i < enumFormStringArray.size(); i++) { - formValues.add(new BasicNameValuePair("enum_form_string_array", enumFormStringArray.get(i).toString())); + if (enumFormStringArray.get(i) != null) { + formValues.add(new BasicNameValuePair("enum_form_string_array", enumFormStringArray.get(i).toString())); + } + } + if (enumFormString != null) { + formValues.add(new BasicNameValuePair("enum_form_string", enumFormString.toString())); } - formValues.add(new BasicNameValuePair("enum_form_string", enumFormString.toString())); HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { @@ -1415,8 +1447,12 @@ public class FakeApi { localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - formValues.add(new BasicNameValuePair("param", param.toString())); - formValues.add(new BasicNameValuePair("param2", param2.toString())); + if (param != null) { + formValues.add(new BasicNameValuePair("param", param.toString())); + } + if (param2 != null) { + formValues.add(new BasicNameValuePair("param2", param2.toString())); + } HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java index 22813f610d5..68b065a4e17 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java @@ -648,8 +648,12 @@ public class PetApi { localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - formValues.add(new BasicNameValuePair("name", name.toString())); - formValues.add(new BasicNameValuePair("status", status.toString())); + if (name != null) { + formValues.add(new BasicNameValuePair("name", name.toString())); + } + if (status != null) { + formValues.add(new BasicNameValuePair("status", status.toString())); + } HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8); ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream(); try { From 9fa032b36527413b693c393bdc95be1f64738f94 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 29 Mar 2023 10:57:49 +0800 Subject: [PATCH 092/131] add isOverridden, update java pojo with setter for parent prop (#15051) --- .../openapitools/codegen/CodegenProperty.java | 5 +- .../openapitools/codegen/DefaultCodegen.java | 5 ++ .../src/main/resources/Java/pojo.mustache | 16 +++++++ .../codegen/java/JavaClientCodegenTest.java | 46 +++++++++++++++++++ .../org/openapitools/client/model/Bird.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/DataQuery.java | 11 +++++ .../client/model/DataQueryAllOf.java | 1 - .../client/model/DefaultValue.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../org/openapitools/client/model/Query.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - ...deTrueObjectAllOfQueryObjectParameter.java | 1 - ...deTrueArrayStringQueryObjectParameter.java | 1 - .../org/openapitools/client/model/Bird.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/DataQuery.java | 11 +++++ .../client/model/DataQueryAllOf.java | 1 - .../client/model/DefaultValue.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../org/openapitools/client/model/Query.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - ...deTrueObjectAllOfQueryObjectParameter.java | 1 - ...deTrueArrayStringQueryObjectParameter.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../client/model/AllOfWithSingleRef.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../client/model/DeprecatedObject.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../org/openapitools/client/model/Foo.java | 1 - .../client/model/FooGetDefaultResponse.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../client/model/HealthCheckResult.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../client/model/NullableClass.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../model/ObjectWithDeprecatedFields.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../model/OuterObjectWithEnumProperty.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../org/openapitools/client/model/File.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../client/model/AllOfWithSingleRef.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../client/model/DeprecatedObject.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../org/openapitools/client/model/File.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../org/openapitools/client/model/Foo.java | 1 - .../client/model/FooGetDefaultResponse.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../client/model/HealthCheckResult.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../client/model/NullableClass.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../model/ObjectWithDeprecatedFields.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../model/OuterObjectWithEnumProperty.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../openapitools/client/model/Category.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/Category.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesAnyType.java | 1 - .../model/AdditionalPropertiesArray.java | 1 - .../model/AdditionalPropertiesBoolean.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/AdditionalPropertiesInteger.java | 1 - .../model/AdditionalPropertiesNumber.java | 1 - .../model/AdditionalPropertiesObject.java | 1 - .../model/AdditionalPropertiesString.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../org/openapitools/client/model/BigCat.java | 11 +++++ .../client/model/BigCatAllOf.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../client/model/TypeHolderDefault.java | 1 - .../client/model/TypeHolderExample.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../openapitools/client/model/XmlItem.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../client/model/AllOfWithSingleRef.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../client/model/DeprecatedObject.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../org/openapitools/client/model/Foo.java | 1 - .../client/model/FooGetDefaultResponse.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../client/model/HealthCheckResult.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../client/model/NullableClass.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../model/ObjectWithDeprecatedFields.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../model/OuterObjectWithEnumProperty.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../client/model/ByteArrayObject.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../client/model/AllOfWithSingleRef.java | 1 - .../org/openapitools/client/model/Animal.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 1 - .../client/model/Capitalization.java | 1 - .../org/openapitools/client/model/Cat.java | 11 +++++ .../openapitools/client/model/CatAllOf.java | 1 - .../openapitools/client/model/Category.java | 1 - .../openapitools/client/model/ClassModel.java | 1 - .../org/openapitools/client/model/Client.java | 1 - .../client/model/DeprecatedObject.java | 1 - .../org/openapitools/client/model/Dog.java | 11 +++++ .../openapitools/client/model/DogAllOf.java | 1 - .../openapitools/client/model/EnumArrays.java | 1 - .../openapitools/client/model/EnumTest.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../org/openapitools/client/model/Foo.java | 1 - .../client/model/FooGetDefaultResponse.java | 1 - .../openapitools/client/model/FormatTest.java | 1 - .../client/model/HasOnlyReadOnly.java | 1 - .../client/model/HealthCheckResult.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 1 - .../client/model/Model200Response.java | 1 - .../client/model/ModelApiResponse.java | 1 - .../openapitools/client/model/ModelFile.java | 1 - .../openapitools/client/model/ModelList.java | 1 - .../client/model/ModelReturn.java | 1 - .../org/openapitools/client/model/Name.java | 1 - .../client/model/NullableClass.java | 1 - .../openapitools/client/model/NumberOnly.java | 1 - .../model/ObjectWithDeprecatedFields.java | 1 - .../org/openapitools/client/model/Order.java | 1 - .../client/model/OuterComposite.java | 1 - .../model/OuterObjectWithEnumProperty.java | 1 - .../org/openapitools/client/model/Pet.java | 1 - .../client/model/ReadOnlyFirst.java | 1 - .../client/model/SpecialModelName.java | 1 - .../org/openapitools/client/model/Tag.java | 1 - .../org/openapitools/client/model/User.java | 1 - .../handler/PathHandlerInterface.java | 4 +- 850 files changed, 645 insertions(+), 796 deletions(-) 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 0c7e171850e..aeb92053388 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 @@ -159,6 +159,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti public boolean isCircularReference; public boolean isDiscriminator; public boolean isNew; // true when this property overrides an inherited property + public Boolean isOverridden; // true if the property is a parent property (not defined in child/current schema) public List _enum; public Map allowableValues; // If 'additionalProperties' is not set, items is null. @@ -1067,6 +1068,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti sb.append(", isCircularReference=").append(isCircularReference); sb.append(", isDiscriminator=").append(isDiscriminator); sb.append(", isNew=").append(isNew); + sb.append(", isOverridden=").append(isOverridden); sb.append(", _enum=").append(_enum); sb.append(", allowableValues=").append(allowableValues); sb.append(", items=").append(items); @@ -1159,6 +1161,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti isCircularReference == that.isCircularReference && isDiscriminator == that.isDiscriminator && isNew == that.isNew && + isOverridden == that.isOverridden && hasValidation == that.hasValidation && isInherited == that.isInherited && isXmlAttribute == that.isXmlAttribute && @@ -1236,7 +1239,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isFile, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isPassword, isFreeFormObject, isArray, isMap, isEnum, isInnerEnum, isEnumRef, isAnyType, isReadOnly, isWriteOnly, isNullable, isShort, - isUnboundedInteger, isSelfReference, isCircularReference, isDiscriminator, isNew, _enum, + isUnboundedInteger, isSelfReference, isCircularReference, isDiscriminator, isNew, isOverridden, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, isInherited, discriminatorValue, nameInCamelCase, nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName, 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 5d8639a0114..a3c1bef3db1 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 @@ -5724,6 +5724,7 @@ public class DefaultCodegen implements CodegenConfig { for (CodegenProperty var : cm.vars) { // create a map of codegen properties for lookup later varsMap.put(var.baseName, var); + var.isOverridden = false; } } } @@ -5748,6 +5749,10 @@ public class DefaultCodegen implements CodegenConfig { cp = fromProperty(key, prop, mandatory.contains(key)); } + if (cm != null && cm.allVars == vars && cp.isOverridden == null) { // processing allVars and it's a parent property + cp.isOverridden = true; + } + vars.add(cp); m.setHasVars(true); diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index 1400da9d8c9..9d2db9a73f2 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -270,7 +270,23 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/isReadOnly}} {{/vars}} + {{#parent}} + {{#allVars}} + {{#isOverridden}} + @Override + public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) { + {{#vendorExtensions.x-is-jackson-optional-nullable}} + this.{{setter}}(JsonNullable.<{{{datatypeWithEnum}}}>of({{name}})); + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + this.{{setter}}({{name}}); + {{/vendorExtensions.x-is-jackson-optional-nullable}} + return this; + } + {{/isOverridden}} + {{/allVars}} + {{/parent}} @Override public boolean equals(Object o) { {{#useReflectionEqualsHashCode}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 5481eae35e1..b4f7a8ca460 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -1908,4 +1908,50 @@ public class JavaClientCodegenTest { assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Dog.class, name = \"Dog\")"); assertFileNotContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), "@JsonSubTypes.Type(value = Lizard.class, name = \"Lizard\")"); } + + @Test + public void testIsOverriddenProperty() { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf_composition_discriminator.yaml"); + JavaClientCodegen codegen = new JavaClientCodegen(); + + Schema test1 = openAPI.getComponents().getSchemas().get("Cat"); + codegen.setOpenAPI(openAPI); + CodegenModel cm1 = codegen.fromModel("Cat", test1); + + CodegenProperty cp0 = cm1.getAllVars().get(0); + Assert.assertEquals(cp0.getName(), "petType"); + Assert.assertEquals(cp0.isOverridden, true); + + CodegenProperty cp1 = cm1.getAllVars().get(1); + Assert.assertEquals(cp1.getName(), "name"); + Assert.assertEquals(cp1.isOverridden, false); + } + + @Test + public void testForJavaApacheHttpClientOverrideSetter() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/allOf_composition_discriminator.yaml", null, new ParseOptions()).getOpenAPI(); + + JavaClientCodegen codegen = new JavaClientCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + codegen.setLibrary(JavaClientCodegen.APACHE); + + generator.opts(input).generate(); + + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), " @Override\n" + + " public Cat petType(String petType) {"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), " }\n" + + "\n" + + " public Pet petType(String petType) {\n"); + + } } \ No newline at end of file diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java index a42433b9d5c..7f0d09d152a 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java @@ -95,7 +95,6 @@ public class Bird { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java index 9d205aa629e..035fed012e7 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java @@ -95,7 +95,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java index 482cc9c3246..085e41e0beb 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java @@ -130,6 +130,17 @@ public class DataQuery extends Query { this.date = date; } + @Override + public DataQuery id(Long id) { + this.setId(id); + return this; + } + + @Override + public DataQuery outcomes(List outcomes) { + this.setOutcomes(outcomes); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQueryAllOf.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQueryAllOf.java index 971198bc355..e6992f37fe1 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQueryAllOf.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQueryAllOf.java @@ -127,7 +127,6 @@ public class DataQueryAllOf { this.date = date; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java index 0dcf9d88382..6cd5048a14d 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -407,7 +407,6 @@ public class DefaultValue { this.stringNullable = JsonNullable.of(stringNullable); } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java index ad4740217fa..81a4be09c94 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java @@ -272,7 +272,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java index fc8dbda1c66..a548fca63ac 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java @@ -142,7 +142,6 @@ public class Query { this.outcomes = outcomes; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java index 7692d8a1fc4..fa809685f7d 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java @@ -95,7 +95,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java index 73f67121d01..8d5c5febdeb 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java @@ -156,7 +156,6 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index ae876152c12..6e559d5558e 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -76,7 +76,6 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { this.values = values; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java index 39ed6122578..153dd289b02 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java @@ -81,7 +81,6 @@ public class Bird { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java index 236c8190bb8..1f36213b28d 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java @@ -81,7 +81,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java index 1e0355bab78..30cc94c0abb 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java @@ -112,6 +112,17 @@ public class DataQuery extends Query { this.date = date; } + @Override + public DataQuery id(Long id) { + this.setId(id); + return this; + } + + @Override + public DataQuery outcomes(List outcomes) { + this.setOutcomes(outcomes); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQueryAllOf.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQueryAllOf.java index 08b9865487c..f915fdb2994 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQueryAllOf.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQueryAllOf.java @@ -108,7 +108,6 @@ public class DataQueryAllOf { this.date = date; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java index 62e7e2b8eee..f1c3658d20e 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -346,7 +346,6 @@ public class DefaultValue { this.stringNullable = stringNullable; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java index 4bea6817ccd..10d2c0a288e 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -254,7 +254,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java index a8e911881cc..32e810791bd 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java @@ -140,7 +140,6 @@ public class Query { this.outcomes = outcomes; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java index 7bfaa5ea05c..4e6d7ca4d9f 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java @@ -81,7 +81,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java index 9dcdd8e4b93..535b6990da8 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java @@ -133,7 +133,6 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index e122957e1d4..439edcb6f4d 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -65,7 +65,6 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { this.values = values; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index adac805a396..296c9b6f0cf 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -113,7 +113,6 @@ public class AdditionalPropertiesClass { this.mapOfMapProperty = mapOfMapProperty; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java index bd81167203f..cdffcd1d521 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java @@ -96,7 +96,6 @@ public class AllOfWithSingleRef { this.singleRefType = singleRefType; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java index 0cf61b82d26..f84ec477ba4 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java @@ -108,7 +108,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 7fbbda84eec..1b9d42f423a 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -76,7 +76,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index e3b5ec365c7..2cea68ab8b4 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -76,7 +76,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java index d281ef77a98..1e635eba1b1 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -152,7 +152,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java index d0716716b6c..bcf75af5368 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java @@ -215,7 +215,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java index b3ab6517bc0..bb8aab5e1a8 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java @@ -76,6 +76,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/CatAllOf.java index 0c3637fdb67..1739765e058 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -66,7 +66,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java index 74267bf6985..3d0cedf0f79 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java @@ -95,7 +95,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java index 3d904821aaa..e125bacd840 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java @@ -65,7 +65,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java index 69f45c30e84..1b38c4aa1f1 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java @@ -65,7 +65,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java index 842bcd1386e..482e19ae2cc 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java @@ -67,7 +67,6 @@ public class DeprecatedObject { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java index 055a293ec28..c3517c53c5e 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java @@ -76,6 +76,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DogAllOf.java index 8400a2ffeee..80a71d87578 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -66,7 +66,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java index 916e5ed0f59..af49ebc57d2 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -175,7 +175,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java index a1ec634cb06..6b6e1dbaf4f 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java @@ -436,7 +436,6 @@ public class EnumTest { this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 741d22675b1..aec83ef8896 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -106,7 +106,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Foo.java index 837f286376b..7c686d88d55 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Foo.java @@ -65,7 +65,6 @@ public class Foo { this.bar = bar; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 24955a1b750..17121fa9900 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -67,7 +67,6 @@ public class FooGetDefaultResponse { this.string = string; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java index ccfa16f1dd3..d7e7bb3b9b5 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java @@ -531,7 +531,6 @@ public class FormatTest { this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index dbfe98898fe..6247993fce5 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -84,7 +84,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java index cc0e8b04f4a..0eb146772b1 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -77,7 +77,6 @@ public class HealthCheckResult { this.nullableMessage = JsonNullable.of(nullableMessage); } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java index 3760d8ad968..5cda18c154d 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java @@ -224,7 +224,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e2338e16854..066b0c87fbb 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -138,7 +138,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java index b5bc68d4e19..d438ec12569 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java @@ -96,7 +96,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 0d7a12780e3..1985236191d 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -126,7 +126,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java index e14130a295b..69e82c20acd 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java @@ -66,7 +66,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java index b58f2e168c5..0b59d681efa 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java @@ -66,7 +66,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java index 1dfb8ee7cf6..03951bf746e 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -66,7 +66,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java index 4f699a6939f..dee8e786ca1 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java @@ -143,7 +143,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java index 2f5b1018292..58d52f86429 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -551,7 +551,6 @@ public class NullableClass extends HashMap { this.objectItemsNullable = objectItemsNullable; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java index 1e08e1f7c06..8d7a8ac6248 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -66,7 +66,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 5be572f27c0..9bfb45cd7b4 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -173,7 +173,6 @@ public class ObjectWithDeprecatedFields { this.bars = bars; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java index 013f8c3e049..4488adc59c2 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java @@ -253,7 +253,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java index 2259dfcaacf..8048eacccc2 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -126,7 +126,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java index 737d1c245d3..7eda42701a6 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java @@ -66,7 +66,6 @@ public class OuterObjectWithEnumProperty { this.value = value; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java index 8c43b823354..8fcaffb9bd5 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java @@ -276,7 +276,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 0516626bab1..af5604baa0e 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -92,7 +92,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java index 8783277244d..b7eef066543 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -66,7 +66,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java index b31d271ffbf..0ceb819b58f 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java @@ -95,7 +95,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java index ad9710c2340..ffadeb6fac0 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java @@ -275,7 +275,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 19f0da1c92e..a1afba9cb00 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index c948a64cacc..686c5ccd028 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -67,7 +67,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index f91ebb3b346..e939b317815 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 87fb4f79616..176e935f8c8 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -431,7 +431,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index f4d98959333..06c20e8c176 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index cf4f678d959..6bbbdbd7625 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -67,7 +67,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 201633dceda..e1487c9bf06 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 0b381dc495f..067c225b47b 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java index 4e7596ec935..7de0d5c3006 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java @@ -107,7 +107,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 295334322fb..fa56b4a6528 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -74,7 +74,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 8670c8fa596..f0e287e4378 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -74,7 +74,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java index 68013f8d487..7641f36ceb1 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -150,7 +150,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java index 69efb73e7de..18f44f7aaea 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java @@ -113,6 +113,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 144b1a5aae5..5f3150ba5ba 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -103,7 +103,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java index a9a64db5019..9d1c067f3eb 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java @@ -213,7 +213,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java index 60df5483e03..a312737a13a 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java @@ -77,6 +77,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java index fcf57d08fb0..39ca7362a05 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -64,7 +64,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java index 83b8be3ee2a..b8c8ccb7aba 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java @@ -93,7 +93,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java index 1fa0e2d8cfb..641d4fc582e 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java @@ -63,7 +63,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java index 80fd39a2a8f..f022bec1ccd 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java @@ -63,7 +63,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java index 159bccf4385..f9e4e2cc9d2 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java @@ -74,6 +74,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java index 96422b89982..2bc9c54bc58 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -64,7 +64,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java index 201a03e390c..b82cd768460 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -173,7 +173,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java index 70b56e0182b..86ac4d7ce20 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java @@ -329,7 +329,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java index 10ba696ee80..7bbb5f84816 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java @@ -63,7 +63,6 @@ public class File { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 788dcfd5547..fc000552f65 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -104,7 +104,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java index 54561ed8bc3..5df76617bff 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java @@ -469,7 +469,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 73f14f16bbd..381c9962b29 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -82,7 +82,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java index 45c189a7393..09eed2279a3 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java @@ -222,7 +222,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1b5a969aa14..962b2200faa 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -136,7 +136,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java index 752885d8302..c357df4ff2b 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java @@ -94,7 +94,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java index f5e9cccddfe..5d71f00af0c 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -124,7 +124,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java index ac2ffbceb82..e4c68d3d492 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java @@ -64,7 +64,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java index 94b13ecf8a1..66331c6b51c 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -64,7 +64,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java index 6d0f4c454da..a750c0ef9b6 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java @@ -141,7 +141,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java index 30df3b665db..dfce53aa917 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -64,7 +64,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java index ade407c9b36..236a4587d26 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java @@ -251,7 +251,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java index 30bf371f5a2..cb9b86dfa97 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -124,7 +124,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java index 0cfd1e2d076..d821b1bdfa3 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java @@ -274,7 +274,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 281c41dde3c..ebbee619ef1 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -90,7 +90,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java index 24b32fb20ec..a4dad93601b 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -64,7 +64,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java index ff1ada221e9..3cc444353f5 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java @@ -93,7 +93,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 088c085099d..ba0028a3fa9 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -194,7 +194,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java index cdac2a8a91c..391fc96908f 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -224,7 +224,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java index d8ee684f1c9..f9f542e0906 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java @@ -273,7 +273,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java index bef46ca918a..3bfb826d97e 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java @@ -978,7 +978,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index f3ffa9c153a..bb18d6f5c2d 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -110,7 +110,6 @@ public class AdditionalPropertiesClass { this.mapOfMapProperty = mapOfMapProperty; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java index 400ef6f1d44..ff55e37f2d7 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java @@ -93,7 +93,6 @@ public class AllOfWithSingleRef { this.singleRefType = singleRefType; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java index 2a5cd4ada19..fd52da7ba5e 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java @@ -105,7 +105,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 4f503dba5d6..e68f1d1d56a 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 698d386a9f2..b6189104c30 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java index 86f0262c685..52d07003963 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java index 8f0460343a9..ed4f3970651 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java index 98b53f1e4fd..7f8797d491d 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java @@ -73,6 +73,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java index 3bb502a7b29..aeeb26b79c2 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java index a78b9d41507..a599f6689ed 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java index 9870d339058..f5db7231aef 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java index 314945b1bbb..764697f4191 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java index 837b1f13e7a..73cccb0d2d3 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java @@ -64,7 +64,6 @@ public class DeprecatedObject { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java index 5de0e902a04..f77566c7746 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java index 55d3afa8167..2978c34e2cc 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java index f792d322ee6..13007002025 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java index 17fd4e08549..dc4dbac1001 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java @@ -433,7 +433,6 @@ public class EnumTest { this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java index 652898e6d00..1d8fb0178b9 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java @@ -62,7 +62,6 @@ public class File { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 2a26f6a490a..e9019a2ef31 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java index 08d43f2d0b4..0ae068735bd 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java @@ -62,7 +62,6 @@ public class Foo { this.bar = bar; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 64290b3fa02..0626a5810e6 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -64,7 +64,6 @@ public class FooGetDefaultResponse { this.string = string; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java index 0be153739ce..1efd4270dd5 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java @@ -528,7 +528,6 @@ public class FormatTest { this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2b2c88b9156..cdb08919cbf 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java index db52cbac669..b156198397f 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -74,7 +74,6 @@ public class HealthCheckResult { this.nullableMessage = JsonNullable.of(nullableMessage); } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java index 045d7b8a085..4070e6e0d39 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index b782bb90c22..ad65e2d8fc5 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java index e376774a161..28ff32d43f0 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java index e4082ed0ada..7cd7d657857 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java index bf32891f71e..4d903ec4d45 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java index b1cc1b13819..eabe6a173bb 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java index 07a612c1f00..9af78b50a14 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java index c5adee1fcba..e5640368c98 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java @@ -548,7 +548,6 @@ public class NullableClass extends HashMap { this.objectItemsNullable = objectItemsNullable; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java index c57472af9f0..b8453c0e955 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 1ed78c03935..718908a08cb 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -170,7 +170,6 @@ public class ObjectWithDeprecatedFields { this.bars = bars; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java index 09dadb18afa..cadf505edf8 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java index 93a3a257cda..d036a39e1c5 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java index d45896c6839..0b8b5f66164 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java @@ -63,7 +63,6 @@ public class OuterObjectWithEnumProperty { this.value = value; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java index f51472ecc70..3693c1e2cdc 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6d9dad261bd..9f25b2a6d30 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java index e4ab9de6df5..8c6588d73f4 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java index ef8add1aada..cf6ef04de76 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java index 95032c71bc0..b29fba7c1b6 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index a68ffae2eaf..d1b32ac9653 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index e41df9071f4..8fe930dfe2b 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 7b7e04b01c5..773db816ab8 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 656bc5ced98..46ec07ac55b 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -430,7 +430,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 38420a93f1a..0e5d01114b1 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index c9dafbb1f03..792fc1bbbe9 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 996c6413244..3f540e7de47 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index d7e667ed8d1..7231ea54b16 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java index ac820697618..a40c65533eb 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java @@ -106,7 +106,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 4f503dba5d6..e68f1d1d56a 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 698d386a9f2..b6189104c30 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java index 86f0262c685..52d07003963 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java index 7928f0f2d61..e80a952e274 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java @@ -112,6 +112,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 33d8deb1c1b..e357e3111ca 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -102,7 +102,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java index 8f0460343a9..ed4f3970651 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java index e6407e84848..a0a6af014cd 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java @@ -76,6 +76,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java index 89e6e65c05e..7c404d48482 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java index a78b9d41507..a599f6689ed 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java index 9870d339058..f5db7231aef 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java index 314945b1bbb..764697f4191 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java index 5de0e902a04..f77566c7746 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java index 55d3afa8167..2978c34e2cc 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java index f792d322ee6..13007002025 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java index 7ef8de6dfc8..0b2ba27fcb6 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java @@ -328,7 +328,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 62716f8c9c7..a338a0598c8 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java index ed2ed565601..9831eac4992 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java @@ -468,7 +468,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2b2c88b9156..cdb08919cbf 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java index 045d7b8a085..4070e6e0d39 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index b782bb90c22..ad65e2d8fc5 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java index e376774a161..28ff32d43f0 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java index e4082ed0ada..7cd7d657857 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelFile.java index 98f208168d2..51a513be4a1 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelFile.java @@ -63,7 +63,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelList.java index bf32891f71e..4d903ec4d45 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java index b1cc1b13819..eabe6a173bb 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java index 07a612c1f00..9af78b50a14 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java index c57472af9f0..b8453c0e955 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java index 3d0061c01c9..73e649ff1fa 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java index 445248fface..3a35d693a21 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java index f51472ecc70..3693c1e2cdc 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6d9dad261bd..9f25b2a6d30 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java index 0de3b216df4..bedacb16913 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java index ef8add1aada..cf6ef04de76 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index d5332fdb9ca..e18abf20e32 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -193,7 +193,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 24a66b05662..45ca7506a72 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -223,7 +223,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java index 95032c71bc0..b29fba7c1b6 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java index 955b3485b90..cf5cce31bc5 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java @@ -977,7 +977,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index a68ffae2eaf..d1b32ac9653 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index e41df9071f4..8fe930dfe2b 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 7b7e04b01c5..773db816ab8 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 656bc5ced98..46ec07ac55b 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -430,7 +430,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 38420a93f1a..0e5d01114b1 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index c9dafbb1f03..792fc1bbbe9 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 996c6413244..3f540e7de47 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index d7e667ed8d1..7231ea54b16 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java index ac820697618..a40c65533eb 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java @@ -106,7 +106,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 4f503dba5d6..e68f1d1d56a 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 698d386a9f2..b6189104c30 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java index 86f0262c685..52d07003963 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCat.java index 7928f0f2d61..e80a952e274 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCat.java @@ -112,6 +112,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 33d8deb1c1b..e357e3111ca 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -102,7 +102,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java index 8f0460343a9..ed4f3970651 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java index e6407e84848..a0a6af014cd 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java @@ -76,6 +76,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java index 89e6e65c05e..7c404d48482 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java index a78b9d41507..a599f6689ed 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java index 9870d339058..f5db7231aef 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java index 314945b1bbb..764697f4191 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java index 5de0e902a04..f77566c7746 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java index 55d3afa8167..2978c34e2cc 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java index f792d322ee6..13007002025 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java index 7ef8de6dfc8..0b2ba27fcb6 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java @@ -328,7 +328,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 62716f8c9c7..a338a0598c8 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java index ed2ed565601..9831eac4992 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java @@ -468,7 +468,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2b2c88b9156..cdb08919cbf 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java index 045d7b8a085..4070e6e0d39 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index b782bb90c22..ad65e2d8fc5 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java index e376774a161..28ff32d43f0 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java index e4082ed0ada..7cd7d657857 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelFile.java index 98f208168d2..51a513be4a1 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelFile.java @@ -63,7 +63,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelList.java index bf32891f71e..4d903ec4d45 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java index b1cc1b13819..eabe6a173bb 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java index 07a612c1f00..9af78b50a14 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java index c57472af9f0..b8453c0e955 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java index 3d0061c01c9..73e649ff1fa 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java index 445248fface..3a35d693a21 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java index f51472ecc70..3693c1e2cdc 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6d9dad261bd..9f25b2a6d30 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java index 0de3b216df4..bedacb16913 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java index ef8add1aada..cf6ef04de76 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index d5332fdb9ca..e18abf20e32 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -193,7 +193,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 24a66b05662..45ca7506a72 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -223,7 +223,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java index 95032c71bc0..b29fba7c1b6 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java index 955b3485b90..cf5cce31bc5 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java @@ -977,7 +977,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 7516f3b097e..c43986d9647 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -69,7 +69,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 1ee65debc9f..bd4679072e1 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -70,7 +70,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 53b8b4b7376..3906086eef8 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -69,7 +69,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index efe9d568afd..b0531df4da6 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -449,7 +449,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index d4c96364cfc..bd2a2951a4b 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -69,7 +69,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 77cec71c7fa..b0cbff0dacc 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -70,7 +70,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 1806bc04841..50228d4d481 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -69,7 +69,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 0d684da17d8..cb0968fc42f 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -69,7 +69,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java index f386e3dde82..acb913cfae4 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java @@ -112,7 +112,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index d81ea40e20a..6dd7e64b3e7 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -78,7 +78,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index a8d2692ab67..6562c7ce928 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -78,7 +78,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java index d5ef94f3846..95f19eae3cd 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -157,7 +157,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java index 3cdddf76cd7..15b1ac5c28a 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java @@ -116,6 +116,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 746f1a22dce..591388b6c28 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -106,7 +106,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java index 634ae02a198..56b88d871ef 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java @@ -221,7 +221,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java index abc0d07df3f..afc3047688c 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java @@ -80,6 +80,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/CatAllOf.java index 447c610d9d8..1c4b80b855c 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -67,7 +67,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java index 9b6ec8784a6..51f7622a1de 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java @@ -98,7 +98,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java index 16ea5f04a5a..de8ad8f3252 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java @@ -66,7 +66,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java index 117d21bc71a..cc804d1cde3 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java @@ -66,7 +66,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java index f72ea421f1a..d30a459de3b 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java @@ -77,6 +77,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/DogAllOf.java index a70f35ab402..8778fe82756 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -67,7 +67,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java index e7a89a07a09..b93236c6352 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -177,7 +177,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java index 81667453098..3bdbc15ca44 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java @@ -338,7 +338,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 0d3144fbcd9..4df6b8a5803 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -110,7 +110,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java index e746724a9ff..24c613991cf 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java @@ -495,7 +495,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index c775849bcda..bbca89ab084 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -86,7 +86,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java index 4dec1f53ec4..bbfdeb8f0b4 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java @@ -229,7 +229,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 9e3dbdfff1e..b3e2bf0b0d3 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -144,7 +144,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java index 29fef654373..d9ed0548012 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java @@ -98,7 +98,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 2a26389a36f..1dbf90b6780 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -129,7 +129,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java index f0097d3de33..7351630b941 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java @@ -67,7 +67,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java index 97a028a2c7e..53b3d72598c 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java @@ -67,7 +67,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java index 6fc184774d0..043fb21bb8e 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -67,7 +67,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java index 6a34675c6aa..3e5e56565e6 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java @@ -148,7 +148,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java index e9c8e4f5901..a15fbfe24cb 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -68,7 +68,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java index cc08d32e24f..7307432622b 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java @@ -260,7 +260,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java index a36a4699c03..a8d42de2a20 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -130,7 +130,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java index 631999a4bb9..bd73babf784 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java @@ -286,7 +286,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index abd01a50021..0515a265606 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -94,7 +94,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java index e4491c58358..194d84f8ef4 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -67,7 +67,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java index e33db0303fd..74dca8dc9b5 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java @@ -97,7 +97,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index f39e40e9666..cf982c67760 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -207,7 +207,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java index f34e64dcef0..a15d332f772 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -239,7 +239,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java index 07ac1e462b6..fe89dd47d9c 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java @@ -283,7 +283,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java index 390f93bd247..6f95936174f 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java @@ -1014,7 +1014,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index e6aa7fa5869..b2dff5b2170 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -62,7 +62,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 06a3bd4d975..99c7c6f6251 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -63,7 +63,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index bba5e524ba5..62f313b5188 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -62,7 +62,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 0d9b17e0fd3..f68ff4f22a9 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -402,7 +402,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index dc158ee4eff..9c89c6b2b17 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -62,7 +62,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index ce66f4f15a2..1eecddbf850 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -63,7 +63,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 1180ad885f4..7eb12149bd5 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -62,7 +62,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 69785c3d56e..e7aa07a8b87 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -62,7 +62,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java index 52424c0439c..f95e03a3a9e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java @@ -87,7 +87,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 722ada0466c..d16100dc831 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -71,7 +71,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 8245dddacb4..1ec3840ebb4 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -71,7 +71,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java index 053fc1a93fc..2e636bb0b7e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -142,7 +142,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java index fa1b61a61ee..f84c0565a4a 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java @@ -112,6 +112,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 7b41ea7b59c..587609a35dd 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -110,7 +110,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java index c62fb76c6f0..a7176ec699a 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java @@ -194,7 +194,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java index ebb5bdd59a7..ff312c3ccb9 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java @@ -61,6 +61,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java index 5814781dad3..57f23c08af1 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -59,7 +59,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java index cbaac501106..62c314786bf 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java @@ -87,7 +87,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java index 11e24ed8c15..e9853047524 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java @@ -59,7 +59,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java index ad5ded57f60..67e9c314dd3 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java @@ -59,7 +59,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java index bccf4e8494f..ca309c55238 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java @@ -61,6 +61,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java index df502e55dc0..5f25bae6c90 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -59,7 +59,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java index c51ab501286..a70e2d3c4fa 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -190,7 +190,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java index 67143c2afd8..1b8ff1e3f00 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java @@ -362,7 +362,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 84d96147bb7..12856a06ea6 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -99,7 +99,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java index 771fce7dae8..595f75f15ce 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java @@ -435,7 +435,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 9600a950f70..745d71fa1cb 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -78,7 +78,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java index 74c9baaf297..3fe40f3ceb0 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java @@ -222,7 +222,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 068accc90d0..04a283f5969 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -129,7 +129,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java index 3c298f17b38..c20a3350d40 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java @@ -86,7 +86,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 634092c753d..98e81aed6a0 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -113,7 +113,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java index 632a24a1983..b5dcaf367e0 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java @@ -59,7 +59,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java index 5958fb28b2d..8cb28c0f4e3 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java @@ -59,7 +59,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java index 69a6b6d3596..d60e7f37252 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -59,7 +59,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java index fb6083aa976..be6a4b2d93b 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java @@ -133,7 +133,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java index 4b8f043e911..8bbbf91359e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -61,7 +61,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java index 9bd544be1b1..1066c326ed6 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java @@ -245,7 +245,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java index 83bfeaa6036..58c7274521e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -115,7 +115,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java index 47de9feb983..923d68afa55 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java @@ -269,7 +269,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index e7e26e4c3fb..b49b9f6e7b2 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -85,7 +85,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java index 1c141677481..9b926f828a4 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -59,7 +59,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java index 6d2af47379e..8d3f5fae203 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java @@ -86,7 +86,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 5319bf4e0d1..d49917fe38f 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -184,7 +184,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 80521bbc16b..d1586fb3638 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -212,7 +212,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java index c681e6ddccf..e46aa37f7c8 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java @@ -248,7 +248,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java index b9352048f8a..9903913048e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java @@ -895,7 +895,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index a68ffae2eaf..d1b32ac9653 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index e41df9071f4..8fe930dfe2b 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 7b7e04b01c5..773db816ab8 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 656bc5ced98..46ec07ac55b 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -430,7 +430,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 38420a93f1a..0e5d01114b1 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index c9dafbb1f03..792fc1bbbe9 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 996c6413244..3f540e7de47 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index d7e667ed8d1..7231ea54b16 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java index ac820697618..a40c65533eb 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java @@ -106,7 +106,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 4f503dba5d6..e68f1d1d56a 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 698d386a9f2..b6189104c30 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java index 86f0262c685..52d07003963 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCat.java index 7928f0f2d61..e80a952e274 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCat.java @@ -112,6 +112,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 33d8deb1c1b..e357e3111ca 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -102,7 +102,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java index 8f0460343a9..ed4f3970651 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java index e6407e84848..a0a6af014cd 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java @@ -76,6 +76,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java index 89e6e65c05e..7c404d48482 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java index a78b9d41507..a599f6689ed 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java index 9870d339058..f5db7231aef 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java index 314945b1bbb..764697f4191 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java index 5de0e902a04..f77566c7746 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java index 55d3afa8167..2978c34e2cc 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java index f792d322ee6..13007002025 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java index 7ef8de6dfc8..0b2ba27fcb6 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java @@ -328,7 +328,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 62716f8c9c7..a338a0598c8 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java index ed2ed565601..9831eac4992 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java @@ -468,7 +468,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2b2c88b9156..cdb08919cbf 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java index 045d7b8a085..4070e6e0d39 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index b782bb90c22..ad65e2d8fc5 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java index e376774a161..28ff32d43f0 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java index e4082ed0ada..7cd7d657857 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelFile.java index 98f208168d2..51a513be4a1 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelFile.java @@ -63,7 +63,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelList.java index bf32891f71e..4d903ec4d45 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java index b1cc1b13819..eabe6a173bb 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java index 07a612c1f00..9af78b50a14 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java index c57472af9f0..b8453c0e955 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java index 3d0061c01c9..73e649ff1fa 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java index 445248fface..3a35d693a21 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java index f51472ecc70..3693c1e2cdc 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6d9dad261bd..9f25b2a6d30 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java index 0de3b216df4..bedacb16913 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java index ef8add1aada..cf6ef04de76 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index d5332fdb9ca..e18abf20e32 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -193,7 +193,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 24a66b05662..45ca7506a72 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -223,7 +223,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java index 95032c71bc0..b29fba7c1b6 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java index 955b3485b90..cf5cce31bc5 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java @@ -977,7 +977,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java index ae6f22ff7e6..da5171a054f 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 15f94f82a40..dfafbc5b2ce 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java index a7e56dad9aa..43a535ed359 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java index e3bc15787ad..74158a9b2eb 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -271,7 +271,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java index a3dfb40983b..e1a3ebb780a 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java index 54c65485694..bcf36d2d8e2 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Category.java index 998f801cc46..6fb3a740c3d 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Category.java @@ -97,7 +97,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java index fdc794743a5..8cb3529ef72 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -129,7 +129,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Order.java index 27f2091a238..130272bcf51 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Order.java @@ -259,7 +259,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java index 5ea3f6a2ed1..fa47ea018ad 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java @@ -280,7 +280,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Tag.java index d2b5aed75a7..f45052e1c9d 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Tag.java @@ -97,7 +97,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/User.java index 692ff39362e..a72584d46c5 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/User.java @@ -283,7 +283,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 8418b0b9853..ece7706af1d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -75,7 +75,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 87ca684b81a..301073a6ff0 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -76,7 +76,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index e51ead6b044..0649b7bb61c 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -75,7 +75,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 5b8cb3220b2..75fe8a77fcf 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -478,7 +478,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index c40a77e16d2..97cce0de607 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -75,7 +75,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index b6b9b70eedd..2dbaba31e3d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -76,7 +76,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index df46d42d6e3..5d329ba379b 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -75,7 +75,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 72fa3fd1879..e8b2ca8be2b 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -75,7 +75,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java index 9a39e4e2012..5d517bd7302 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java @@ -119,7 +119,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 44110955666..340c4bc13fd 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -84,7 +84,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index e055429bcca..7cb2459021f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -84,7 +84,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java index 15a8ad36bdd..efb117c1b07 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -168,7 +168,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java index 96c4f6486a9..26fcad09980 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java @@ -128,6 +128,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCatAllOf.java index bf1526857ae..617e7b6a1da 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -118,7 +118,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java index 5ee0fad069c..f236752bfc0 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java @@ -237,7 +237,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java index dba355c3a42..5d49eac98c8 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java @@ -86,6 +86,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java index 7eafd8fa288..1a3e13dfd3c 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -73,7 +73,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java index 3ae14a8a4f1..aa7564f66b5 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java @@ -105,7 +105,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java index c3811deb1bf..17724868acc 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java @@ -72,7 +72,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java index 408f75774e7..f54674aed58 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java @@ -72,7 +72,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java index e3c285cb3c0..b9dd97caa94 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java @@ -83,6 +83,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java index c0cd8c02386..334c5ff8c0b 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -73,7 +73,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java index 3f773e9833f..caa3a5fc0e9 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -194,7 +194,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java index a9eb0adf4d7..4507a8572fe 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java @@ -368,7 +368,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index cfbc024b887..eddb5c22f96 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -117,7 +117,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java index 6fd0fc74d61..77e2ae4889c 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java @@ -518,7 +518,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 8d17a0b8a73..776cb182051 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -82,7 +82,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java index ccce10e4b48..796d8f5b289 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java @@ -248,7 +248,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index bab8f1621f1..ac69d68d001 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -153,7 +153,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java index e924373ead0..3091fbe093a 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java @@ -106,7 +106,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 9de4150675f..1b9c66fb90e 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -139,7 +139,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelFile.java index 5ea992eb114..c9a633b9502 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelFile.java @@ -73,7 +73,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelList.java index 2a312ed9331..d956edcb721 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelList.java @@ -73,7 +73,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java index 8d1b414b0b7..333ba4e0a01 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -73,7 +73,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java index fc1158316e9..a9cbdbfbb83 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java @@ -147,7 +147,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java index 36b35c7299a..dde269e3700 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -73,7 +73,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java index 486d1a2824b..fd6e4549f90 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java @@ -281,7 +281,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java index 2464e94e5c0..05846343834 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -139,7 +139,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java index 9942b88e116..5f56e0a02ae 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java @@ -315,7 +315,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index d86bc539cce..9490b6e0622 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -93,7 +93,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java index 446af7f5e0e..4b865f05653 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -73,7 +73,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java index b24ff035a84..c85ecc1b58f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java @@ -105,7 +105,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index b5e088e78a0..1ba86661029 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -216,7 +216,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java index d4527114ae8..a969eaf9e0d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -249,7 +249,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java index 130e957aa7d..47f1b84e11a 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java @@ -303,7 +303,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java index f2225f607af..fa34d0b05b6 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java @@ -1105,7 +1105,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index a68ffae2eaf..d1b32ac9653 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index e41df9071f4..8fe930dfe2b 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 7b7e04b01c5..773db816ab8 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 0f7802e7cfe..5dbb3f42d39 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -430,7 +430,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 38420a93f1a..0e5d01114b1 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index c9dafbb1f03..792fc1bbbe9 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 996c6413244..3f540e7de47 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index d7e667ed8d1..7231ea54b16 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java index ac820697618..a40c65533eb 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java @@ -106,7 +106,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 4f503dba5d6..e68f1d1d56a 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 698d386a9f2..b6189104c30 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java index 86f0262c685..52d07003963 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCat.java index 7928f0f2d61..e80a952e274 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCat.java @@ -112,6 +112,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 33d8deb1c1b..e357e3111ca 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -102,7 +102,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java index 8f0460343a9..ed4f3970651 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java index e6407e84848..a0a6af014cd 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java @@ -76,6 +76,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java index 89e6e65c05e..7c404d48482 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java index a78b9d41507..a599f6689ed 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java index 9870d339058..f5db7231aef 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java index 314945b1bbb..764697f4191 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java index 5de0e902a04..f77566c7746 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java index 55d3afa8167..2978c34e2cc 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java index f792d322ee6..13007002025 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java index 7ef8de6dfc8..0b2ba27fcb6 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java @@ -328,7 +328,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 62716f8c9c7..a338a0598c8 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java index ed2ed565601..9831eac4992 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java @@ -468,7 +468,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2b2c88b9156..cdb08919cbf 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java index 723509bc90f..417563b5d44 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0af2b9c43e3..e90966d8648 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java index e376774a161..28ff32d43f0 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java index e4082ed0ada..7cd7d657857 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java index 98f208168d2..51a513be4a1 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java @@ -63,7 +63,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java index bf32891f71e..4d903ec4d45 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java index b1cc1b13819..eabe6a173bb 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java index 07a612c1f00..9af78b50a14 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java index c57472af9f0..b8453c0e955 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java index 3d0061c01c9..73e649ff1fa 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java index 445248fface..3a35d693a21 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java index 1684ba87f3b..f6f901c99f0 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6d9dad261bd..9f25b2a6d30 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java index 0de3b216df4..bedacb16913 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java index ef8add1aada..cf6ef04de76 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index cbbfd841189..202e142bddb 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -193,7 +193,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 83179bc2fd0..6be2e8f6eb8 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -223,7 +223,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java index 95032c71bc0..b29fba7c1b6 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java index 955b3485b90..cf5cce31bc5 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java @@ -977,7 +977,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index e8200553ab2..3c45f1fc84a 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -68,7 +68,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 7ec58cb31ef..190767650a5 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -69,7 +69,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 4a951a9ee93..b2e14e6a01e 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -68,7 +68,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 8e3262c9ca0..957897178a4 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -448,7 +448,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 1a5d4ee039a..6b63f8c6470 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -68,7 +68,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 19e27633b46..cfaa45e63c8 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -69,7 +69,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 74e1171c664..ee067e4bdbc 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -68,7 +68,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 68048830ae4..d2574d22d8c 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -68,7 +68,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java index 91cb0d6b432..49ce8ad9622 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java @@ -111,7 +111,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index a8f010e149a..9177806e1ea 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -77,7 +77,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 5f763efe2d4..b1b97c48f92 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -77,7 +77,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java index 04533e23ef4..018de202529 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -156,7 +156,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java index 3fcaf0c9225..cb9b9bd9a96 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java @@ -115,6 +115,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 6c0bb23d8c3..c9b7b7bf9b9 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -105,7 +105,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java index c4cec1dfdd3..85a7363acde 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java @@ -220,7 +220,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java index 469dd4a5547..f2255b50b92 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java @@ -79,6 +79,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java index f678a8e68e1..149c8334327 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -66,7 +66,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java index cc41e9f9bbb..db98e38d04c 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java @@ -97,7 +97,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java index 640c7e7f64e..f27e6602234 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java @@ -65,7 +65,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java index 51d82786848..dcaab8e67ca 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java @@ -65,7 +65,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java index 58471fd14aa..d4dac86eaef 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java @@ -76,6 +76,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java index 1139310f535..7d0c456524f 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -66,7 +66,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java index 8c852d1bffb..e67a710f1f9 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -176,7 +176,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java index d2017a8d86f..cce345eacbe 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java @@ -337,7 +337,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index f97392d0a30..451e3f3b707 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -109,7 +109,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java index 6d205cb03f8..2b21678a0f3 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java @@ -494,7 +494,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 1cce647184e..1fea556b2eb 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -85,7 +85,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java index 77ddaf9a501..53aafffc176 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java @@ -228,7 +228,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index a0dca748c46..5c07ddce048 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -143,7 +143,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java index 8c1f8d3019a..9fec85a142c 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java @@ -97,7 +97,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java index a50478222f7..4f03ac75627 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -128,7 +128,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java index 7ef37c8d48d..4528205a367 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java @@ -66,7 +66,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java index d4e547b9ebe..85806593098 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java @@ -66,7 +66,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java index ef6ba491632..76ba000a8d7 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -66,7 +66,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java index c46d58b4050..2ef7d373592 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java @@ -147,7 +147,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java index e37b72ed8a3..33ce4f21fc4 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -67,7 +67,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java index 221dca5d302..0a4269883b5 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java @@ -259,7 +259,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java index cd89b4fd527..7c0884d9428 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -129,7 +129,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java index f09487061b8..8e041025a75 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java @@ -285,7 +285,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index aa58e932e80..01583e7a1af 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -93,7 +93,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java index bf5d28f4ce4..e591ecb24c8 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -66,7 +66,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java index 6e0f9c74de8..f94da1cd07d 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java @@ -96,7 +96,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index a49f5ba7e8b..03857841174 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -206,7 +206,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java index ad80102f079..fdfe42fb025 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -238,7 +238,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java index 616e6e7af44..c68d011c326 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java @@ -282,7 +282,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java index 878fd0898c7..39785f0197e 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java @@ -1013,7 +1013,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 7262f72236b..cd9c1047973 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 86ea0dc3290..89ef30860c6 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -59,7 +59,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 3217915b619..6851472918d 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 1051d3bdafc..285876fa96e 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -383,7 +383,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 7299ac57367..21f462b26d5 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 24ff35983cb..9ef3d4bca00 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -59,7 +59,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 34204eee903..7df510e593c 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 8cc4539dccd..dc01e342b21 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java index 805245b5636..e72d8cf6d8c 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java @@ -81,7 +81,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index dc988dad259..8e85bba5a17 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -66,7 +66,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index d21623977b2..3dceb648866 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -66,7 +66,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java index ba80c07fec4..7389aa67003 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -134,7 +134,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java index 0934134ef1d..5c0294de675 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java @@ -108,6 +108,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCatAllOf.java index a4995b1f3bc..dc77482df48 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -106,7 +106,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java index 1c1a8c70ec3..68df4a1087b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java @@ -185,7 +185,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java index 8c0cb47f523..cbbde4050b4 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java @@ -57,6 +57,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java index d4046608181..1af3ba94019 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -55,7 +55,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java index 1dfb7754208..44dd9a5ded1 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java @@ -81,7 +81,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java index eae29993de2..7e21a4c0cae 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java @@ -55,7 +55,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java index b6564700cbd..e47f4bda5de 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java @@ -55,7 +55,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java index b7685e59ec6..9ac61811954 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java @@ -57,6 +57,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java index e9c148729fe..ba9be150d62 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -55,7 +55,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java index 4e7b0ea1855..65136ad6908 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -185,7 +185,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java index a4e074625bd..16d8e739f61 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -352,7 +352,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 7bba754fb40..92053e4f556 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -92,7 +92,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java index 1a2a7061b9a..4a67a31ec94 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java @@ -408,7 +408,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 372c20bf8c2..7262c5e77a8 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -73,7 +73,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java index 21f0bc158bd..e1171ab5e96 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java @@ -214,7 +214,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 375ab7405d3..32e24753481 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -120,7 +120,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java index 50d580b399d..e94dde7ca09 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java @@ -81,7 +81,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 9e61dadbdf6..2ea517fb5ee 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -107,7 +107,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelFile.java index 9b797d92c4d..d6250ed246b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelFile.java @@ -55,7 +55,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelList.java index c764b1708c7..62eb75ed7b5 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelList.java @@ -55,7 +55,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java index a6d47eb184d..607d9fecd6e 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -55,7 +55,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java index ccd23bc9a52..b6867bd15f5 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java @@ -125,7 +125,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java index dd92accf170..343c3b782ef 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -56,7 +56,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java index 71aebe6d380..cd6450bb82b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java @@ -235,7 +235,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java index 8ad961b0456..16a0936a8a4 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -108,7 +108,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java index d97fa08e243..1f9fdc39d7a 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java @@ -256,7 +256,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index e6294966e12..c8ed93e918b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -80,7 +80,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java index 224c95abe41..b6bf8823d34 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -55,7 +55,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java index ccead09e04b..2b31a772344 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java @@ -81,7 +81,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 15678a167f3..e19ec8f1bd8 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -170,7 +170,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 61476547fb4..5d6d048bbaa 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -196,7 +196,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java index 3928bcb1fde..061c87d0d06 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java @@ -237,7 +237,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java index 7e2f85b448b..70afa100804 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java @@ -858,7 +858,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 7262f72236b..cd9c1047973 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 86ea0dc3290..89ef30860c6 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -59,7 +59,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 3217915b619..6851472918d 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 1051d3bdafc..285876fa96e 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -383,7 +383,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 7299ac57367..21f462b26d5 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 24ff35983cb..9ef3d4bca00 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -59,7 +59,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 34204eee903..7df510e593c 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 8cc4539dccd..dc01e342b21 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java index 805245b5636..e72d8cf6d8c 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java @@ -81,7 +81,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index dc988dad259..8e85bba5a17 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -66,7 +66,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index d21623977b2..3dceb648866 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -66,7 +66,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java index ba80c07fec4..7389aa67003 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -134,7 +134,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java index 0934134ef1d..5c0294de675 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java @@ -108,6 +108,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCatAllOf.java index a4995b1f3bc..dc77482df48 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -106,7 +106,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java index 1c1a8c70ec3..68df4a1087b 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java @@ -185,7 +185,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java index 8c0cb47f523..cbbde4050b4 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java @@ -57,6 +57,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java index d4046608181..1af3ba94019 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -55,7 +55,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java index 1dfb7754208..44dd9a5ded1 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java @@ -81,7 +81,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java index eae29993de2..7e21a4c0cae 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java @@ -55,7 +55,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java index b6564700cbd..e47f4bda5de 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java @@ -55,7 +55,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java index b7685e59ec6..9ac61811954 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java @@ -57,6 +57,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java index e9c148729fe..ba9be150d62 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -55,7 +55,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java index 4e7b0ea1855..65136ad6908 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -185,7 +185,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java index a4e074625bd..16d8e739f61 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -352,7 +352,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 7bba754fb40..92053e4f556 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -92,7 +92,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java index 1a2a7061b9a..4a67a31ec94 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java @@ -408,7 +408,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 372c20bf8c2..7262c5e77a8 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -73,7 +73,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java index 21f0bc158bd..e1171ab5e96 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java @@ -214,7 +214,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 375ab7405d3..32e24753481 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -120,7 +120,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java index 50d580b399d..e94dde7ca09 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java @@ -81,7 +81,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 9e61dadbdf6..2ea517fb5ee 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -107,7 +107,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelFile.java index 9b797d92c4d..d6250ed246b 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelFile.java @@ -55,7 +55,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelList.java index c764b1708c7..62eb75ed7b5 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelList.java @@ -55,7 +55,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java index a6d47eb184d..607d9fecd6e 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -55,7 +55,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java index ccd23bc9a52..b6867bd15f5 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java @@ -125,7 +125,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java index dd92accf170..343c3b782ef 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -56,7 +56,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java index 71aebe6d380..cd6450bb82b 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java @@ -235,7 +235,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java index 8ad961b0456..16a0936a8a4 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -108,7 +108,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java index d97fa08e243..1f9fdc39d7a 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java @@ -256,7 +256,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index e6294966e12..c8ed93e918b 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -80,7 +80,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java index 224c95abe41..b6bf8823d34 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -55,7 +55,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java index ccead09e04b..2b31a772344 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java @@ -81,7 +81,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 15678a167f3..e19ec8f1bd8 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -170,7 +170,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 61476547fb4..5d6d048bbaa 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -196,7 +196,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java index 3928bcb1fde..061c87d0d06 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java @@ -237,7 +237,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java index 7e2f85b448b..70afa100804 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java @@ -858,7 +858,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 7262f72236b..cd9c1047973 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 86ea0dc3290..89ef30860c6 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -59,7 +59,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 3217915b619..6851472918d 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 1051d3bdafc..285876fa96e 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -383,7 +383,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 7299ac57367..21f462b26d5 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 24ff35983cb..9ef3d4bca00 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -59,7 +59,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 34204eee903..7df510e593c 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 8cc4539dccd..dc01e342b21 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -58,7 +58,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java index 805245b5636..e72d8cf6d8c 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java @@ -81,7 +81,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index dc988dad259..8e85bba5a17 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -66,7 +66,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index d21623977b2..3dceb648866 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -66,7 +66,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java index ba80c07fec4..7389aa67003 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -134,7 +134,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java index 0934134ef1d..5c0294de675 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java @@ -108,6 +108,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCatAllOf.java index a4995b1f3bc..dc77482df48 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -106,7 +106,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java index 1c1a8c70ec3..68df4a1087b 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java @@ -185,7 +185,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java index 8c0cb47f523..cbbde4050b4 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java @@ -57,6 +57,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/CatAllOf.java index d4046608181..1af3ba94019 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -55,7 +55,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java index 1dfb7754208..44dd9a5ded1 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java @@ -81,7 +81,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java index eae29993de2..7e21a4c0cae 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java @@ -55,7 +55,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java index b6564700cbd..e47f4bda5de 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java @@ -55,7 +55,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java index b7685e59ec6..9ac61811954 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java @@ -57,6 +57,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/DogAllOf.java index e9c148729fe..ba9be150d62 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -55,7 +55,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java index 4e7b0ea1855..65136ad6908 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -185,7 +185,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java index a4e074625bd..16d8e739f61 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java @@ -352,7 +352,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 7bba754fb40..92053e4f556 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -92,7 +92,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java index 1a2a7061b9a..4a67a31ec94 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java @@ -408,7 +408,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 372c20bf8c2..7262c5e77a8 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -73,7 +73,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java index 21f0bc158bd..e1171ab5e96 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java @@ -214,7 +214,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 375ab7405d3..32e24753481 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -120,7 +120,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java index 50d580b399d..e94dde7ca09 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java @@ -81,7 +81,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 9e61dadbdf6..2ea517fb5ee 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -107,7 +107,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelFile.java index 9b797d92c4d..d6250ed246b 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelFile.java @@ -55,7 +55,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelList.java index c764b1708c7..62eb75ed7b5 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelList.java @@ -55,7 +55,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java index a6d47eb184d..607d9fecd6e 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -55,7 +55,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java index ccd23bc9a52..b6867bd15f5 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java @@ -125,7 +125,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java index dd92accf170..343c3b782ef 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -56,7 +56,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java index 71aebe6d380..cd6450bb82b 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java @@ -235,7 +235,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java index 8ad961b0456..16a0936a8a4 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -108,7 +108,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java index d97fa08e243..1f9fdc39d7a 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java @@ -256,7 +256,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index e6294966e12..c8ed93e918b 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -80,7 +80,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java index 224c95abe41..b6bf8823d34 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -55,7 +55,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java index ccead09e04b..2b31a772344 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java @@ -81,7 +81,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 15678a167f3..e19ec8f1bd8 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -170,7 +170,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 61476547fb4..5d6d048bbaa 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -196,7 +196,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java index 3928bcb1fde..061c87d0d06 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java @@ -237,7 +237,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java index 7e2f85b448b..70afa100804 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java @@ -858,7 +858,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index a68ffae2eaf..d1b32ac9653 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index e41df9071f4..8fe930dfe2b 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 7b7e04b01c5..773db816ab8 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 656bc5ced98..46ec07ac55b 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -430,7 +430,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 38420a93f1a..0e5d01114b1 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index c9dafbb1f03..792fc1bbbe9 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 996c6413244..3f540e7de47 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index d7e667ed8d1..7231ea54b16 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java index ac820697618..a40c65533eb 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java @@ -106,7 +106,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 4f503dba5d6..e68f1d1d56a 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 698d386a9f2..b6189104c30 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java index 86f0262c685..52d07003963 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java index 7928f0f2d61..e80a952e274 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java @@ -112,6 +112,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 33d8deb1c1b..e357e3111ca 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -102,7 +102,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java index 8f0460343a9..ed4f3970651 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java index e6407e84848..a0a6af014cd 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java @@ -76,6 +76,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java index 89e6e65c05e..7c404d48482 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Category.java index a78b9d41507..a599f6689ed 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java index 9870d339058..f5db7231aef 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Client.java index 314945b1bbb..764697f4191 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Dog.java index 5de0e902a04..f77566c7746 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java index 55d3afa8167..2978c34e2cc 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java index f792d322ee6..13007002025 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java index 7ef8de6dfc8..0b2ba27fcb6 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java @@ -328,7 +328,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 62716f8c9c7..a338a0598c8 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java index fd10bc46a58..ce7dc954214 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java @@ -468,7 +468,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2b2c88b9156..cdb08919cbf 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java index 045d7b8a085..4070e6e0d39 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index b782bb90c22..ad65e2d8fc5 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java index e376774a161..28ff32d43f0 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java index e4082ed0ada..7cd7d657857 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelFile.java index 98f208168d2..51a513be4a1 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelFile.java @@ -63,7 +63,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java index bf32891f71e..4d903ec4d45 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java index b1cc1b13819..eabe6a173bb 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Name.java index 07a612c1f00..9af78b50a14 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java index c57472af9f0..b8453c0e955 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Order.java index 3d0061c01c9..73e649ff1fa 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java index 445248fface..3a35d693a21 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java index f51472ecc70..3693c1e2cdc 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6d9dad261bd..9f25b2a6d30 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java index 0de3b216df4..bedacb16913 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Tag.java index ef8add1aada..cf6ef04de76 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index d5332fdb9ca..e18abf20e32 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -193,7 +193,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 24a66b05662..45ca7506a72 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -223,7 +223,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/User.java index 95032c71bc0..b29fba7c1b6 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java index 955b3485b90..cf5cce31bc5 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java @@ -977,7 +977,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index a68ffae2eaf..d1b32ac9653 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesAnyType extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index e41df9071f4..8fe930dfe2b 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesArray extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 7b7e04b01c5..773db816ab8 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesBoolean extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 656bc5ced98..46ec07ac55b 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -430,7 +430,6 @@ public class AdditionalPropertiesClass { this.anytype3 = anytype3; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 38420a93f1a..0e5d01114b1 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesInteger extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index c9dafbb1f03..792fc1bbbe9 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -66,7 +66,6 @@ public class AdditionalPropertiesNumber extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 996c6413244..3f540e7de47 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesObject extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index d7e667ed8d1..7231ea54b16 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -65,7 +65,6 @@ public class AdditionalPropertiesString extends HashMap { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java index ac820697618..a40c65533eb 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java @@ -106,7 +106,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 4f503dba5d6..e68f1d1d56a 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 698d386a9f2..b6189104c30 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java index 86f0262c685..52d07003963 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCat.java index 7928f0f2d61..e80a952e274 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCat.java @@ -112,6 +112,17 @@ public class BigCat extends Cat { this.kind = kind; } + @Override + public BigCat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public BigCat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCatAllOf.java index 33d8deb1c1b..e357e3111ca 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -102,7 +102,6 @@ public class BigCatAllOf { this.kind = kind; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java index 8f0460343a9..ed4f3970651 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java index e6407e84848..a0a6af014cd 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java @@ -76,6 +76,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java index 89e6e65c05e..7c404d48482 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java index a78b9d41507..a599f6689ed 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java index 9870d339058..f5db7231aef 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java index 314945b1bbb..764697f4191 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java index 5de0e902a04..f77566c7746 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java index 55d3afa8167..2978c34e2cc 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java index f792d322ee6..13007002025 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java index 7ef8de6dfc8..0b2ba27fcb6 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java @@ -328,7 +328,6 @@ public class EnumTest { this.outerEnum = outerEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 62716f8c9c7..a338a0598c8 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java index fd10bc46a58..ce7dc954214 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java @@ -468,7 +468,6 @@ public class FormatTest { this.bigDecimal = bigDecimal; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2b2c88b9156..cdb08919cbf 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java index 045d7b8a085..4070e6e0d39 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index b782bb90c22..ad65e2d8fc5 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java index e376774a161..28ff32d43f0 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java index e4082ed0ada..7cd7d657857 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelFile.java index 98f208168d2..51a513be4a1 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelFile.java @@ -63,7 +63,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelList.java index bf32891f71e..4d903ec4d45 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java index b1cc1b13819..eabe6a173bb 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java index 07a612c1f00..9af78b50a14 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java index c57472af9f0..b8453c0e955 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java index 3d0061c01c9..73e649ff1fa 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java index 445248fface..3a35d693a21 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java index f51472ecc70..3693c1e2cdc 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6d9dad261bd..9f25b2a6d30 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java index 0de3b216df4..bedacb16913 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java index ef8add1aada..cf6ef04de76 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index d5332fdb9ca..e18abf20e32 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -193,7 +193,6 @@ public class TypeHolderDefault { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 24a66b05662..45ca7506a72 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -223,7 +223,6 @@ public class TypeHolderExample { this.arrayItem = arrayItem; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java index 95032c71bc0..b29fba7c1b6 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java index 955b3485b90..cf5cce31bc5 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java @@ -977,7 +977,6 @@ public class XmlItem { this.prefixNsWrappedArray = prefixNsWrappedArray; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 847501a73d1..93f18e0e902 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -110,7 +110,6 @@ public class AdditionalPropertiesClass { this.mapOfMapProperty = mapOfMapProperty; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java index 6baa5097113..0d63515ed34 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java @@ -93,7 +93,6 @@ public class AllOfWithSingleRef { this.singleRefType = singleRefType; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java index 59b3b92ad83..c020a225e9f 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java @@ -105,7 +105,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 04ac6b1aebc..642275fbb2e 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 4d1dc79e4db..aa31f56852a 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java index 10fc0f2c496..f4ad0883727 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Capitalization.java index e9676526995..4ac983b4e66 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Cat.java index 762c68f3b8b..bbea9ebbafa 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Cat.java @@ -73,6 +73,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/CatAllOf.java index 1698aee5332..917ad5bc1d1 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Category.java index 7012324ecc0..4cdee420aee 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ClassModel.java index 63f8e4250f9..9eb8bcb222b 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Client.java index a24c7a610a4..f8af7bb9f27 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DeprecatedObject.java index f748b441c2e..218244ef557 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DeprecatedObject.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DeprecatedObject.java @@ -64,7 +64,6 @@ public class DeprecatedObject { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Dog.java index e2d0287243f..af19ccec34d 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DogAllOf.java index caeaf3af061..fe797b69a73 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java index 640e3feff16..a1af0e7e51a 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java index dd09eef4554..7f09f74f272 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java @@ -433,7 +433,6 @@ public class EnumTest { this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 6db83b556b3..b2adc6547c1 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Foo.java index 6b1b4b846ce..4c74d8b69af 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Foo.java @@ -62,7 +62,6 @@ public class Foo { this.bar = bar; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 2b593f7aedd..485a558db54 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -64,7 +64,6 @@ public class FooGetDefaultResponse { this.string = string; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java index f0dbe431033..b223a7bbea0 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java @@ -528,7 +528,6 @@ public class FormatTest { this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index e65f75da939..8718094f4a2 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HealthCheckResult.java index 8ac56f5460b..b56b25c728e 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -74,7 +74,6 @@ public class HealthCheckResult { this.nullableMessage = JsonNullable.of(nullableMessage); } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java index 1147b6b54a9..8b97703abaf 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7761b5cc7b4..eb9651ec992 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Model200Response.java index da6e0dc6589..b6a94dc2fa3 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java index a8ff696e9ce..bba7c3d6baf 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelFile.java index 7d79db6626a..d901997d0bb 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelFile.java @@ -63,7 +63,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelList.java index 6e59aee06de..31e36d53de5 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelReturn.java index 0f151557e3c..fb6d9baaf11 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Name.java index 6f935862f75..94ecd4aaa30 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java index fa8f3609000..fc22dc1d0aa 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java @@ -548,7 +548,6 @@ public class NullableClass extends HashMap { this.objectItemsNullable = objectItemsNullable; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NumberOnly.java index 4dc4e082cc5..400a8653fd1 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index ad5c8e6265c..56f1f5a4c4a 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -170,7 +170,6 @@ public class ObjectWithDeprecatedFields { this.bars = bars; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java index b18ac238504..556f9281323 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterComposite.java index 5449db47823..48a7977e139 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java index 12a811c517b..ab43e36082a 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java @@ -63,7 +63,6 @@ public class OuterObjectWithEnumProperty { this.value = value; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java index 4497aebcc15..c818b3cc8a7 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index e5707b761ec..c7bf2be1cc1 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SpecialModelName.java index f7636280e61..25b81d1da5a 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Tag.java index 6c6b359e88f..5e613b3ae7a 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/User.java index 6310afd952d..9f6ff1ca527 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java index 1b89cb5808e..a47c80a27fb 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java +++ b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java @@ -203,7 +203,6 @@ public class ByteArrayObject { this.intField = intField; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index f391ae0e646..e75bfc5b2b9 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -110,7 +110,6 @@ public class AdditionalPropertiesClass { this.mapOfMapProperty = mapOfMapProperty; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java index 400ef6f1d44..ff55e37f2d7 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java @@ -93,7 +93,6 @@ public class AllOfWithSingleRef { this.singleRefType = singleRefType; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java index 2a5cd4ada19..fd52da7ba5e 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java @@ -105,7 +105,6 @@ public class Animal { this.color = color; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 4f503dba5d6..e68f1d1d56a 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly { this.arrayArrayNumber = arrayArrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 698d386a9f2..b6189104c30 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -73,7 +73,6 @@ public class ArrayOfNumberOnly { this.arrayNumber = arrayNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java index 86f0262c685..52d07003963 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -149,7 +149,6 @@ public class ArrayTest { this.arrayArrayOfModel = arrayArrayOfModel; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java index 8f0460343a9..ed4f3970651 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java @@ -212,7 +212,6 @@ public class Capitalization { this.ATT_NAME = ATT_NAME; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java index e14f5458acb..e9c3b88dd90 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java @@ -73,6 +73,17 @@ public class Cat extends Animal { this.declawed = declawed; } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java index 89e6e65c05e..7c404d48482 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -63,7 +63,6 @@ public class CatAllOf { this.declawed = declawed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java index a78b9d41507..a599f6689ed 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java @@ -92,7 +92,6 @@ public class Category { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java index 9870d339058..f5db7231aef 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java @@ -62,7 +62,6 @@ public class ClassModel { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java index 314945b1bbb..764697f4191 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java @@ -62,7 +62,6 @@ public class Client { this.client = client; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java index 837b1f13e7a..73cccb0d2d3 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java @@ -64,7 +64,6 @@ public class DeprecatedObject { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java index 5de0e902a04..f77566c7746 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java @@ -73,6 +73,17 @@ public class Dog extends Animal { this.breed = breed; } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } @Override public boolean equals(Object o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java index 55d3afa8167..2978c34e2cc 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -63,7 +63,6 @@ public class DogAllOf { this.breed = breed; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java index f792d322ee6..13007002025 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -172,7 +172,6 @@ public class EnumArrays { this.arrayEnum = arrayEnum; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java index 17fd4e08549..dc4dbac1001 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java @@ -433,7 +433,6 @@ public class EnumTest { this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 62716f8c9c7..a338a0598c8 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -103,7 +103,6 @@ public class FileSchemaTestClass { this.files = files; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Foo.java index 08d43f2d0b4..0ae068735bd 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Foo.java @@ -62,7 +62,6 @@ public class Foo { this.bar = bar; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 64290b3fa02..0626a5810e6 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -64,7 +64,6 @@ public class FooGetDefaultResponse { this.string = string; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java index 0be153739ce..1efd4270dd5 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java @@ -528,7 +528,6 @@ public class FormatTest { this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2b2c88b9156..cdb08919cbf 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -81,7 +81,6 @@ public class HasOnlyReadOnly { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java index db52cbac669..b156198397f 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -74,7 +74,6 @@ public class HealthCheckResult { this.nullableMessage = JsonNullable.of(nullableMessage); } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java index 723509bc90f..417563b5d44 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java @@ -221,7 +221,6 @@ public class MapTest { this.indirectMap = indirectMap; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0af2b9c43e3..e90966d8648 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -135,7 +135,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { this.map = map; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java index e376774a161..28ff32d43f0 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java @@ -93,7 +93,6 @@ public class Model200Response { this.propertyClass = propertyClass; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java index e4082ed0ada..7cd7d657857 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -123,7 +123,6 @@ public class ModelApiResponse { this.message = message; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelFile.java index 98f208168d2..51a513be4a1 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelFile.java @@ -63,7 +63,6 @@ public class ModelFile { this.sourceURI = sourceURI; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelList.java index bf32891f71e..4d903ec4d45 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelList.java @@ -63,7 +63,6 @@ public class ModelList { this._123list = _123list; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java index b1cc1b13819..eabe6a173bb 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -63,7 +63,6 @@ public class ModelReturn { this._return = _return; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java index 07a612c1f00..9af78b50a14 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java @@ -140,7 +140,6 @@ public class Name { - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java index 4d0fd3d25a1..59c75af68c1 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -548,7 +548,6 @@ public class NullableClass extends HashMap { this.objectItemsNullable = objectItemsNullable; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java index c57472af9f0..b8453c0e955 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -63,7 +63,6 @@ public class NumberOnly { this.justNumber = justNumber; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 1ed78c03935..718908a08cb 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -170,7 +170,6 @@ public class ObjectWithDeprecatedFields { this.bars = bars; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java index 3d0061c01c9..73e649ff1fa 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java @@ -250,7 +250,6 @@ public class Order { this.complete = complete; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java index 445248fface..3a35d693a21 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -123,7 +123,6 @@ public class OuterComposite { this.myBoolean = myBoolean; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java index d45896c6839..0b8b5f66164 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java @@ -63,7 +63,6 @@ public class OuterObjectWithEnumProperty { this.value = value; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java index 1684ba87f3b..f6f901c99f0 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java @@ -273,7 +273,6 @@ public class Pet { this.status = status; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6d9dad261bd..9f25b2a6d30 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -89,7 +89,6 @@ public class ReadOnlyFirst { this.baz = baz; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java index e4ab9de6df5..8c6588d73f4 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -63,7 +63,6 @@ public class SpecialModelName { this.$specialPropertyName = $specialPropertyName; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java index ef8add1aada..cf6ef04de76 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java @@ -92,7 +92,6 @@ public class Tag { this.name = name; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java index 95032c71bc0..b29fba7c1b6 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java @@ -272,7 +272,6 @@ public class User { this.userStatus = userStatus; } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java index e9c1b5b5893..1f8d53d1ad9 100644 --- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java +++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java @@ -539,10 +539,10 @@ public interface PathHandlerInterface { *

          Response headers: [CodegenProperty{openApiType='integer', baseName='X-Rate-Limit', complexType='null', getter='getxRateLimit', setter='setxRateLimit', description='calls per hour allowed by the user', dataType='Integer', datatypeWithEnum='Integer', dataFormat='int32', name='xRateLimit', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Rate-Limit;', baseType='Integer', containerType='null', title='null', unescapedDescription='calls per hour allowed by the user', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "integer", "format" : "int32" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isShort=true, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isPassword=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isEnumRef=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, isNew=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false, format=int32, dependentRequired=null, contains=null}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when token expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when token expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isShort=true, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isPassword=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isEnumRef=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, isNew=false, isOverridden=null, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false, format=int32, dependentRequired=null, contains=null}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when token expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when token expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "string", "format" : "date-time" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isPassword=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isEnumRef=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, isNew=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false, format=date-time, dependentRequired=null, contains=null}]

          +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isPassword=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isEnumRef=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, isNew=false, isOverridden=null, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false, format=date-time, dependentRequired=null, contains=null}]

          * *

          Produces: [{mediaType=application/xml}, {mediaType=application/json}]

          *

          Returns: {@link String}

          From 0973795996580005df2007769725b1d60e17e6fa Mon Sep 17 00:00:00 2001 From: Shane Perry Date: Wed, 29 Mar 2023 08:05:41 -0600 Subject: [PATCH 093/131] Added Micronaut configuration points (#15005) * Added ability to configure the AuthorizationFilter pattern * Added configuration for the Client annotation * Generated samples * Remove extra newline from template * Updated samples * Declarative client annotation path attribute only supported when id attribute is set * Cleaned up style of generated file --------- Co-authored-by: Shane Perry --- docs/generators/java-micronaut-client.md | 3 + .../languages/JavaMicronautClientCodegen.java | 51 ++++++++++++++++ .../java-micronaut/client/api.mustache | 4 +- .../client/auth/AuthorizationFilter.mustache | 2 +- .../micronaut/MicronautClientCodegenTest.java | 59 +++++++++++++++++++ 5 files changed, 117 insertions(+), 2 deletions(-) diff --git a/docs/generators/java-micronaut-client.md b/docs/generators/java-micronaut-client.md index 4b3b98490f6..8fc1e6f41d7 100644 --- a/docs/generators/java-micronaut-client.md +++ b/docs/generators/java-micronaut-client.md @@ -29,10 +29,13 @@ These options may be applied as additional-properties (cli) or configOptions (pl |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-micronaut-client| |artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator| |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0| +|authorizationFilterPattern|Configure the authorization filter pattern for the client. Generally defined when generating clients from multiple specification files| |null| +|basePathSeparator|Configure the separator to use between the application name and base path when referencing the property| |-| |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |build|Specify for which build tool to generate files|
          **gradle**
          Gradle configuration is generated for the project
          **all**
          Both Gradle and Maven configurations are generated
          **maven**
          Maven configuration is generated for the project
          |all| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|clientId|Configure the service ID for the Client| |null| |configureAuth|Configure all the authorization methods as specified in the file| |false| |containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateFormat|Specify the format pattern of date as a string| |null| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java index 9e8d2140fdc..cdf8b8a1fcf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java @@ -13,12 +13,20 @@ import org.openapitools.codegen.meta.Stability; public class JavaMicronautClientCodegen extends JavaMicronautAbstractCodegen { public static final String OPT_CONFIGURE_AUTH = "configureAuth"; + public static final String OPT_CONFIGURE_AUTH_FILTER_PATTERN = "configureAuthFilterPattern"; + public static final String OPT_CONFIGURE_CLIENT_ID = "configureClientId"; public static final String ADDITIONAL_CLIENT_TYPE_ANNOTATIONS = "additionalClientTypeAnnotations"; + public static final String AUTHORIZATION_FILTER_PATTERN = "authorizationFilterPattern"; + public static final String BASE_PATH_SEPARATOR = "basePathSeparator"; + public static final String CLIENT_ID = "clientId"; public static final String NAME = "java-micronaut-client"; protected boolean configureAuthorization; protected List additionalClientTypeAnnotations; + protected String authorizationFilterPattern; + protected String basePathSeparator = "-"; + protected String clientId; public JavaMicronautClientCodegen() { super(); @@ -33,6 +41,9 @@ public class JavaMicronautClientCodegen extends JavaMicronautAbstractCodegen { cliOptions.add(CliOption.newBoolean(OPT_CONFIGURE_AUTH, "Configure all the authorization methods as specified in the file", configureAuthorization)); cliOptions.add(CliOption.newString(ADDITIONAL_CLIENT_TYPE_ANNOTATIONS, "Additional annotations for client type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)")); + cliOptions.add(CliOption.newString(AUTHORIZATION_FILTER_PATTERN, "Configure the authorization filter pattern for the client. Generally defined when generating clients from multiple specification files")); + cliOptions.add(CliOption.newString(BASE_PATH_SEPARATOR, "Configure the separator to use between the application name and base path when referencing the property").defaultValue(basePathSeparator)); + cliOptions.add(CliOption.newString(CLIENT_ID, "Configure the service ID for the Client")); } @Override @@ -66,6 +77,14 @@ public class JavaMicronautClientCodegen extends JavaMicronautAbstractCodegen { // Write property that is present in server writePropertyBack(OPT_USE_AUTH, true); + writePropertyBack(OPT_CONFIGURE_AUTH_FILTER_PATTERN, false); + writePropertyBack(OPT_CONFIGURE_CLIENT_ID, false); + + if(additionalProperties.containsKey(BASE_PATH_SEPARATOR)) { + basePathSeparator = additionalProperties.get(BASE_PATH_SEPARATOR).toString(); + } + writePropertyBack(BASE_PATH_SEPARATOR, basePathSeparator); + final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/"); // Authorization files @@ -79,6 +98,12 @@ public class JavaMicronautClientCodegen extends JavaMicronautAbstractCodegen { supportingFiles.add(new SupportingFile("client/auth/configuration/ApiKeyAuthConfiguration.mustache", authConfigurationFolder, "ApiKeyAuthConfiguration.java")); supportingFiles.add(new SupportingFile("client/auth/configuration/ConfigurableAuthorization.mustache", authConfigurationFolder, "ConfigurableAuthorization.java")); supportingFiles.add(new SupportingFile("client/auth/configuration/HttpBasicAuthConfiguration.mustache", authConfigurationFolder, "HttpBasicAuthConfiguration.java")); + + if (additionalProperties.containsKey(AUTHORIZATION_FILTER_PATTERN)) { + String pattern = additionalProperties.get(AUTHORIZATION_FILTER_PATTERN).toString(); + this.setAuthorizationFilterPattern(pattern); + additionalProperties.put(AUTHORIZATION_FILTER_PATTERN, authorizationFilterPattern); + } } if (additionalProperties.containsKey(ADDITIONAL_CLIENT_TYPE_ANNOTATIONS)) { @@ -87,6 +112,18 @@ public class JavaMicronautClientCodegen extends JavaMicronautAbstractCodegen { additionalProperties.put(ADDITIONAL_CLIENT_TYPE_ANNOTATIONS, additionalClientTypeAnnotations); } + if (additionalProperties.containsKey(CLIENT_ID)) { + String id = additionalProperties.get(CLIENT_ID).toString(); + this.setClientId(id); + additionalProperties.put(CLIENT_ID, clientId); + } + + if (additionalProperties.containsKey(BASE_PATH_SEPARATOR)) { + String separator = additionalProperties.get(BASE_PATH_SEPARATOR).toString(); + this.setBasePathSeparator(separator); + additionalProperties.put(BASE_PATH_SEPARATOR, basePathSeparator); + } + // Api file apiTemplateFiles.clear(); apiTemplateFiles.put("client/api.mustache", ".java"); @@ -109,4 +146,18 @@ public class JavaMicronautClientCodegen extends JavaMicronautAbstractCodegen { public void setAdditionalClientTypeAnnotations(final List additionalClientTypeAnnotations) { this.additionalClientTypeAnnotations = additionalClientTypeAnnotations; } + + public void setAuthorizationFilterPattern(final String pattern) { + writePropertyBack(OPT_CONFIGURE_AUTH_FILTER_PATTERN, true); + this.authorizationFilterPattern = pattern; + } + + public void setClientId(final String id) { + writePropertyBack(OPT_CONFIGURE_CLIENT_ID, true); + this.clientId = id; + } + + public void setBasePathSeparator(final String separator) { + this.basePathSeparator = separator; + } } diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache index 842fe1f3f0d..fa531874e73 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache @@ -45,7 +45,9 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; {{{.}}} {{/additionalClientTypeAnnotations}} {{>common/generatedAnnotation}} -@Client("${{openbrace}}{{{applicationName}}}-base-path{{closebrace}}") +@Client({{#configureClientId}} + id = "{{clientId}}", + path = {{/configureClientId}}"${{openbrace}}{{{applicationName}}}{{basePathSeparator}}base-path{{closebrace}}") public interface {{classname}} { {{#operations}} {{#operation}} diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationFilter.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationFilter.mustache index 4c9c72d8779..a52b4294c6f 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationFilter.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/client/auth/AuthorizationFilter.mustache @@ -37,7 +37,7 @@ import {{javaxPackage}}.annotation.Generated; {{>common/generatedAnnotation}} -@Filter(Filter.MATCH_ALL_PATTERN) +@Filter({{#configureAuthFilterPattern}}"{{authorizationFilterPattern}}"{{/configureAuthFilterPattern}}{{^configureAuthFilterPattern}}Filter.MATCH_ALL_PATTERN{{/configureAuthFilterPattern}}) public class AuthorizationFilter implements HttpClientFilter { private static final Logger LOG = LoggerFactory.getLogger(ClientCredentialsHttpClientFilter.class); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java index af612bd47ca..2c449e9bfee 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java @@ -251,4 +251,63 @@ public class MicronautClientCodegenTest extends AbstractMicronautCodegenTest { assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "MyAdditionalAnnotation1(1,${param1})"); assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "MyAdditionalAnnotation2(2,${param2})"); } + + @Test + public void testDefaultAuthorizationFilterPattern() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "true"); + String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.SUPPORTING_FILES, CodegenConstants.APIS); + + // Micronaut AuthorizationFilter should default to match all patterns + assertFileContains(outputPath + "/src/main/java/org/openapitools/auth/AuthorizationFilter.java", "@Filter(Filter.MATCH_ALL_PATTERN)"); + } + + @Test + public void testAuthorizationFilterPattern() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "true"); + codegen.additionalProperties().put(JavaMicronautClientCodegen.AUTHORIZATION_FILTER_PATTERN, "pet/**"); + String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.SUPPORTING_FILES, CodegenConstants.APIS); + + // Micronaut AuthorizationFilter should match the provided pattern + assertFileContains(outputPath + "/src/main/java/org/openapitools/auth/AuthorizationFilter.java", "@Filter(\"pet/**\")"); + } + + @Test + public void testNoConfigureClientId() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.APIS); + + // Micronaut declarative http client should not specify a Client id + assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Client(\"${openapi-micronaut-client-base-path}\")"); + } + + @Test + public void testConfigureClientId() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.CLIENT_ID, "unit-test"); + String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.APIS); + + // Micronaut declarative http client should use the provided Client id + assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Client( id = \"unit-test\", path = \"${openapi-micronaut-client-base-path}\")"); + } + + @Test + public void testDefaultPathSeparator() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.APIS); + + // Micronaut declarative http client should use the default path separator + assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Client(\"${openapi-micronaut-client-base-path}\")"); + } + + @Test + public void testConfigurePathSeparator() { + JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); + codegen.additionalProperties().put(JavaMicronautClientCodegen.BASE_PATH_SEPARATOR, "."); + String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.APIS); + + // Micronaut declarative http client should use the provided path separator + assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Client(\"${openapi-micronaut-client.base-path}\")"); + } } From 4895b56089ee82f3c552882685d25de5b0c7ba61 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 30 Mar 2023 10:06:24 +0800 Subject: [PATCH 094/131] [python-nextgen] fix pattern with double quote (#15073) * fix pattern with double quote * fix test --- .../codegen/languages/PythonNextgenClientCodegen.java | 3 ++- .../resources/python-nextgen/model_generic.mustache | 2 +- ...etstore-with-fake-endpoints-models-for-testing.yaml | 3 +++ .../petstore/python-nextgen-aiohttp/docs/FormatTest.md | 1 + .../petstore_api/models/format_test.py | 10 +++++++++- .../python-nextgen-aiohttp/tests/test_model.py | 2 +- .../client/petstore/python-nextgen/docs/FormatTest.md | 1 + .../python-nextgen/petstore_api/models/format_test.py | 10 +++++++++- 8 files changed, 27 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java index ad8fb7e387e..376dc40786f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java @@ -1201,7 +1201,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements } } - vendorExtensions.put("x-regex", regex); + vendorExtensions.put("x-regex", regex.replace("\"","\\\"")); + vendorExtensions.put("x-pattern", pattern.replace("\"","\\\"")); vendorExtensions.put("x-modifiers", modifiers); } } diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache index ee8118cbc04..6715306d13b 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache @@ -33,7 +33,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}} @validator('{{{name}}}') def {{{name}}}_validate_regular_expression(cls, v): if not re.match(r"{{{.}}}", v{{#vendorExtensions.x-modifiers}} ,re.{{{.}}}{{/vendorExtensions.x-modifiers}}): - raise ValueError(r"must validate the regular expression {{{pattern}}}") + raise ValueError(r"must validate the regular expression {{{vendorExtensions.x-pattern}}}") return v {{/vendorExtensions.x-regex}} {{#isEnum}} diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml index 128fc52b403..c8e80e14301 100644 --- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1591,6 +1591,9 @@ components: string: type: string pattern: '/[a-z]/i' + string_with_double_quote_pattern: + type: string + pattern: 'this is "something"' byte: type: string format: byte diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md index 5ea09e1908a..d88718eaad1 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md @@ -12,6 +12,7 @@ Name | Type | Description | Notes **double** | **float** | | [optional] **decimal** | **decimal.Decimal** | | [optional] **string** | **str** | | [optional] +**string_with_double_quote_pattern** | **str** | | [optional] **byte** | **str** | | [optional] **binary** | **str** | | [optional] **var_date** | **date** | | diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py index 3090369756a..811d3a4ee27 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py @@ -34,6 +34,7 @@ class FormatTest(BaseModel): double: Optional[confloat(le=123.4, ge=67.8)] = None decimal: Optional[condecimal()] = None string: Optional[constr(strict=True)] = None + string_with_double_quote_pattern: Optional[constr(strict=True)] = None byte: Optional[StrictBytes] = None binary: Optional[StrictBytes] = None var_date: date = Field(..., alias="date") @@ -42,7 +43,7 @@ class FormatTest(BaseModel): password: constr(strict=True, max_length=64, min_length=10) = ... pattern_with_digits: Optional[constr(strict=True)] = Field(None, description="A string that is a 10 digit number. Can have leading zeros.") pattern_with_digits_and_delimiter: Optional[constr(strict=True)] = Field(None, description="A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") - __properties = ["integer", "int32", "int64", "number", "float", "double", "decimal", "string", "byte", "binary", "date", "dateTime", "uuid", "password", "pattern_with_digits", "pattern_with_digits_and_delimiter"] + __properties = ["integer", "int32", "int64", "number", "float", "double", "decimal", "string", "string_with_double_quote_pattern", "byte", "binary", "date", "dateTime", "uuid", "password", "pattern_with_digits", "pattern_with_digits_and_delimiter"] @validator('string') def string_validate_regular_expression(cls, v): @@ -50,6 +51,12 @@ class FormatTest(BaseModel): raise ValueError(r"must validate the regular expression /[a-z]/i") return v + @validator('string_with_double_quote_pattern') + def string_with_double_quote_pattern_validate_regular_expression(cls, v): + if not re.match(r"this is \"something\"", v): + raise ValueError(r"must validate the regular expression /this is \"something\"/") + return v + @validator('pattern_with_digits') def pattern_with_digits_validate_regular_expression(cls, v): if not re.match(r"^\d{10}$", v): @@ -105,6 +112,7 @@ class FormatTest(BaseModel): "double": obj.get("double"), "decimal": obj.get("decimal"), "string": obj.get("string"), + "string_with_double_quote_pattern": obj.get("string_with_double_quote_pattern"), "byte": obj.get("byte"), "binary": obj.get("binary"), "var_date": obj.get("date"), diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py index b67782c7745..e752abbe62e 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py @@ -209,7 +209,7 @@ class ModelTests(unittest.TestCase): a = petstore_api.FormatTest(number=39.8, float=123, byte=bytes("string", 'utf-8'), date="2013-09-17", password="testing09876") self.assertEqual(a.float, 123.0) - json_str = '{"number": 34.5, "float": "456", "date": "2013-12-08", "password": "empty1234567", "pattern_with_digits": "1234567890", "pattern_with_digits_and_delimiter": "image_123" , "string": "string"}' + json_str = "{\"number\": 34.5, \"float\": \"456\", \"date\": \"2013-12-08\", \"password\": \"empty1234567\", \"pattern_with_digits\": \"1234567890\", \"pattern_with_digits_and_delimiter\": \"image_123\", \"string_with_double_quote_pattern\": \"this is \\\"something\\\"\", \"string\": \"string\"}" # no exception thrown when assigning 456 (integer) to float type since strict is set to false f = petstore_api.FormatTest.from_json(json_str) self.assertEqual(f.float, 456.0) diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md b/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md index 5ea09e1908a..d88718eaad1 100755 --- a/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md +++ b/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md @@ -12,6 +12,7 @@ Name | Type | Description | Notes **double** | **float** | | [optional] **decimal** | **decimal.Decimal** | | [optional] **string** | **str** | | [optional] +**string_with_double_quote_pattern** | **str** | | [optional] **byte** | **str** | | [optional] **binary** | **str** | | [optional] **var_date** | **date** | | diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py index 1aab1462bd8..89f85aa14cd 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py @@ -34,6 +34,7 @@ class FormatTest(BaseModel): double: Optional[confloat(le=123.4, ge=67.8, strict=True)] = None decimal: Optional[condecimal()] = None string: Optional[constr(strict=True)] = None + string_with_double_quote_pattern: Optional[constr(strict=True)] = None byte: Optional[StrictBytes] = None binary: Optional[StrictBytes] = None var_date: date = Field(..., alias="date") @@ -43,7 +44,7 @@ class FormatTest(BaseModel): pattern_with_digits: Optional[constr(strict=True)] = Field(None, description="A string that is a 10 digit number. Can have leading zeros.") pattern_with_digits_and_delimiter: Optional[constr(strict=True)] = Field(None, description="A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") additional_properties: Dict[str, Any] = {} - __properties = ["integer", "int32", "int64", "number", "float", "double", "decimal", "string", "byte", "binary", "date", "dateTime", "uuid", "password", "pattern_with_digits", "pattern_with_digits_and_delimiter"] + __properties = ["integer", "int32", "int64", "number", "float", "double", "decimal", "string", "string_with_double_quote_pattern", "byte", "binary", "date", "dateTime", "uuid", "password", "pattern_with_digits", "pattern_with_digits_and_delimiter"] @validator('string') def string_validate_regular_expression(cls, v): @@ -51,6 +52,12 @@ class FormatTest(BaseModel): raise ValueError(r"must validate the regular expression /[a-z]/i") return v + @validator('string_with_double_quote_pattern') + def string_with_double_quote_pattern_validate_regular_expression(cls, v): + if not re.match(r"this is \"something\"", v): + raise ValueError(r"must validate the regular expression /this is \"something\"/") + return v + @validator('pattern_with_digits') def pattern_with_digits_validate_regular_expression(cls, v): if not re.match(r"^\d{10}$", v): @@ -112,6 +119,7 @@ class FormatTest(BaseModel): "double": obj.get("double"), "decimal": obj.get("decimal"), "string": obj.get("string"), + "string_with_double_quote_pattern": obj.get("string_with_double_quote_pattern"), "byte": obj.get("byte"), "binary": obj.get("binary"), "var_date": obj.get("date"), From 3ccd9be080774e7fc70e693634b9477b081cc152 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 30 Mar 2023 10:07:15 +0800 Subject: [PATCH 095/131] remove absolute_import (#15071) --- .../src/main/resources/python-nextgen/__init__api.mustache | 4 +--- .../src/main/resources/python-nextgen/__init__model.mustache | 4 +--- .../main/resources/python-nextgen/__init__package.mustache | 2 -- .../src/main/resources/python-nextgen/api.mustache | 2 -- .../src/main/resources/python-nextgen/api_client.mustache | 2 +- .../src/main/resources/python-nextgen/api_test.mustache | 2 -- .../src/main/resources/python-nextgen/configuration.mustache | 2 -- .../src/main/resources/python-nextgen/model_test.mustache | 2 -- .../src/main/resources/python-nextgen/rest.mustache | 2 -- .../client/echo_api/python-nextgen/openapi_client/__init__.py | 2 -- .../echo_api/python-nextgen/openapi_client/api/__init__.py | 3 +-- .../echo_api/python-nextgen/openapi_client/api/body_api.py | 2 -- .../echo_api/python-nextgen/openapi_client/api/form_api.py | 2 -- .../echo_api/python-nextgen/openapi_client/api/header_api.py | 2 -- .../echo_api/python-nextgen/openapi_client/api/path_api.py | 2 -- .../echo_api/python-nextgen/openapi_client/api/query_api.py | 2 -- .../echo_api/python-nextgen/openapi_client/api_client.py | 2 +- .../echo_api/python-nextgen/openapi_client/configuration.py | 2 -- .../echo_api/python-nextgen/openapi_client/models/__init__.py | 2 -- samples/client/echo_api/python-nextgen/openapi_client/rest.py | 2 -- .../petstore/python-nextgen-aiohttp/petstore_api/__init__.py | 2 -- .../python-nextgen-aiohttp/petstore_api/api/__init__.py | 3 +-- .../petstore_api/api/another_fake_api.py | 2 -- .../python-nextgen-aiohttp/petstore_api/api/default_api.py | 2 -- .../python-nextgen-aiohttp/petstore_api/api/fake_api.py | 2 -- .../petstore_api/api/fake_classname_tags123_api.py | 2 -- .../python-nextgen-aiohttp/petstore_api/api/pet_api.py | 2 -- .../python-nextgen-aiohttp/petstore_api/api/store_api.py | 2 -- .../python-nextgen-aiohttp/petstore_api/api/user_api.py | 2 -- .../python-nextgen-aiohttp/petstore_api/api_client.py | 2 +- .../python-nextgen-aiohttp/petstore_api/configuration.py | 2 -- .../python-nextgen-aiohttp/petstore_api/models/__init__.py | 2 -- .../client/petstore/python-nextgen/petstore_api/__init__.py | 2 -- .../petstore/python-nextgen/petstore_api/api/__init__.py | 3 +-- .../python-nextgen/petstore_api/api/another_fake_api.py | 2 -- .../petstore/python-nextgen/petstore_api/api/default_api.py | 2 -- .../petstore/python-nextgen/petstore_api/api/fake_api.py | 2 -- .../petstore_api/api/fake_classname_tags123_api.py | 2 -- .../petstore/python-nextgen/petstore_api/api/pet_api.py | 2 -- .../petstore/python-nextgen/petstore_api/api/store_api.py | 2 -- .../petstore/python-nextgen/petstore_api/api/user_api.py | 2 -- .../client/petstore/python-nextgen/petstore_api/api_client.py | 2 +- .../petstore/python-nextgen/petstore_api/configuration.py | 2 -- .../petstore/python-nextgen/petstore_api/models/__init__.py | 2 -- .../client/petstore/python-nextgen/petstore_api/rest.py | 2 -- 45 files changed, 9 insertions(+), 88 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/__init__api.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/__init__api.mustache index c2232a92f4c..8870835c81e 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/__init__api.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/__init__api.mustache @@ -1,7 +1,5 @@ -from __future__ import absolute_import - # flake8: noqa # import apis into api package {{#apiInfo}}{{#apis}}from {{apiPackage}}.{{classFilename}} import {{classname}} -{{/apis}}{{/apiInfo}} \ No newline at end of file +{{/apis}}{{/apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/__init__model.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/__init__model.mustache index 56487fff6a4..0e1b55e2ace 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/__init__model.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/__init__model.mustache @@ -3,11 +3,9 @@ # flake8: noqa {{>partial_header}} -from __future__ import absolute_import - # import models into model package {{#models}} {{#model}} from {{modelPackage}}.{{classFilename}} import {{classname}} {{/model}} -{{/models}} \ No newline at end of file +{{/models}} diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/__init__package.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/__init__package.mustache index f12543f1f63..f598fc38c28 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/__init__package.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/__init__package.mustache @@ -4,8 +4,6 @@ {{>partial_header}} -from __future__ import absolute_import - __version__ = "{{packageVersion}}" # import apis into sdk package diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/api.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/api.mustache index 592b8f687a4..f16945da847 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/api.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/api.mustache @@ -2,8 +2,6 @@ {{>partial_header}} -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache index ef005c5e9db..7006b19276e 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache @@ -1,6 +1,6 @@ # coding: utf-8 + {{>partial_header}} -from __future__ import absolute_import import atexit import datetime diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/api_test.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/api_test.mustache index a981c662a0d..c3bbe4b822f 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/api_test.mustache @@ -2,8 +2,6 @@ {{>partial_header}} -from __future__ import absolute_import - import unittest import {{packageName}} diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/configuration.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/configuration.mustache index ab50e67ea61..77b44197b2f 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/configuration.mustache @@ -2,8 +2,6 @@ {{>partial_header}} -from __future__ import absolute_import - import copy import logging {{^asyncio}} diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_test.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_test.mustache index 06d8b5fa95c..93ebf99b14f 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_test.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_test.mustache @@ -2,8 +2,6 @@ {{>partial_header}} -from __future__ import absolute_import - import unittest import datetime diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/rest.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/rest.mustache index 0e76f4eb996..89875d65542 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/rest.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/rest.mustache @@ -2,8 +2,6 @@ {{>partial_header}} -from __future__ import absolute_import - import io import json import logging diff --git a/samples/client/echo_api/python-nextgen/openapi_client/__init__.py b/samples/client/echo_api/python-nextgen/openapi_client/__init__.py index e9e75706830..1177a5d9b38 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/__init__.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/__init__.py @@ -15,8 +15,6 @@ """ -from __future__ import absolute_import - __version__ = "1.0.0" # import apis into sdk package diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/__init__.py b/samples/client/echo_api/python-nextgen/openapi_client/api/__init__.py index 541b1a8999a..411eed92583 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/__init__.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # flake8: noqa # import apis into api package @@ -8,3 +6,4 @@ from openapi_client.api.form_api import FormApi from openapi_client.api.header_api import HeaderApi from openapi_client.api.path_api import PathApi from openapi_client.api.query_api import QueryApi + diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py index 371e24d7302..ec77997499c 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/form_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/form_api.py index c1061ca2253..93ad860382f 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/form_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/form_api.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/header_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/header_api.py index 9eaaaae02f5..2a060aad18d 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/header_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/header_api.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/path_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/path_api.py index 34d1b7c2abb..9b22b402ab2 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/path_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/path_api.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py index 76524882431..aa4c8482613 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/query_api.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api_client.py b/samples/client/echo_api/python-nextgen/openapi_client/api_client.py index 7a508e6fbfb..3d6ec22afd6 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api_client.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api_client.py @@ -1,4 +1,5 @@ # coding: utf-8 + """ Echo Server API @@ -11,7 +12,6 @@ Do not edit the class manually. """ -from __future__ import absolute_import import atexit import datetime diff --git a/samples/client/echo_api/python-nextgen/openapi_client/configuration.py b/samples/client/echo_api/python-nextgen/openapi_client/configuration.py index 629814b7054..9276d8f0499 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/configuration.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/configuration.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - import copy import logging import multiprocessing diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py b/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py index efec638ad0b..29619e9c8dc 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py @@ -14,8 +14,6 @@ """ -from __future__ import absolute_import - # import models into model package from openapi_client.models.bird import Bird from openapi_client.models.category import Category diff --git a/samples/client/echo_api/python-nextgen/openapi_client/rest.py b/samples/client/echo_api/python-nextgen/openapi_client/rest.py index b705cbcb849..33f0615ee10 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/rest.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/rest.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - import io import json import logging diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py index bbf50585f34..31cf58fec33 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py @@ -14,8 +14,6 @@ """ -from __future__ import absolute_import - __version__ = "1.0.0" # import apis into sdk package diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/__init__.py index bc45197c40f..7a2616975a2 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # flake8: noqa # import apis into api package @@ -10,3 +8,4 @@ from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api from petstore_api.api.pet_api import PetApi from petstore_api.api.store_api import StoreApi from petstore_api.api.user_api import UserApi + diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/another_fake_api.py index b199686440b..e03a60ce0ef 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/another_fake_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/default_api.py index ed4f6708219..c497aac8916 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/default_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py index 4b9d11adc68..3afc7a2cc30 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_classname_tags123_api.py index 3e7d3df88d5..7443f859ed3 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_classname_tags123_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py index 9be3176520f..202512fcff2 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/store_api.py index 01fcb3a1a2b..92289931c84 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/store_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/user_api.py index 3d4eab42ccc..66d311856a9 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/user_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py index 9987a6267a7..ccb2e99402e 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py @@ -1,4 +1,5 @@ # coding: utf-8 + """ OpenAPI Petstore @@ -10,7 +11,6 @@ Do not edit the class manually. """ -from __future__ import absolute_import import atexit import datetime diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/configuration.py index c468ea8296a..ed439f7f5af 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/configuration.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import copy import logging import sys diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py index 5f313ba72ae..b6cd78aa71c 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - # import models into model package from petstore_api.models.additional_properties_class import AdditionalPropertiesClass from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py index bbf50585f34..31cf58fec33 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py @@ -14,8 +14,6 @@ """ -from __future__ import absolute_import - __version__ = "1.0.0" # import apis into sdk package diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/__init__.py index bc45197c40f..7a2616975a2 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # flake8: noqa # import apis into api package @@ -10,3 +8,4 @@ from petstore_api.api.fake_classname_tags123_api import FakeClassnameTags123Api from petstore_api.api.pet_api import PetApi from petstore_api.api.store_api import StoreApi from petstore_api.api.user_api import UserApi + diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/another_fake_api.py index e64b41e45ce..a52190eaf36 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/another_fake_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/default_api.py index 0fae685b825..cb77b64734c 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/default_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py index 8ce851d9f06..29b19f4fd6f 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_classname_tags123_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_classname_tags123_api.py index c596e1b5287..3221e3783b2 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_classname_tags123_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_classname_tags123_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py index 217108146f3..bff41ea66ae 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/store_api.py index 8a9239355c4..79931477f78 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/store_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/user_api.py index 1c3d3907326..bfa36bf0134 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/user_api.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import re # noqa: F401 from pydantic import validate_arguments, ValidationError diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py index 20ee02c7efb..f29e49a998b 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py @@ -1,4 +1,5 @@ # coding: utf-8 + """ OpenAPI Petstore @@ -10,7 +11,6 @@ Do not edit the class manually. """ -from __future__ import absolute_import import atexit import datetime diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/configuration.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/configuration.py index c6081bbaff2..a466557ad57 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/configuration.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import copy import logging import multiprocessing diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py index 5f313ba72ae..b6cd78aa71c 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py @@ -13,8 +13,6 @@ """ -from __future__ import absolute_import - # import models into model package from petstore_api.models.additional_properties_class import AdditionalPropertiesClass from petstore_api.models.all_of_with_single_ref import AllOfWithSingleRef diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/rest.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/rest.py index c12ef1c6504..e26c0b96ea2 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/rest.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/rest.py @@ -12,8 +12,6 @@ """ -from __future__ import absolute_import - import io import json import logging From 05fa5601ddfdce02b94d48ed71413f13d791b226 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 30 Mar 2023 10:07:34 +0800 Subject: [PATCH 096/131] [python-nextgen] fix circular reference import (#15070) * fix ciruclar reference import in python nextgen * update samples --- .../languages/PythonNextgenClientCodegen.java | 155 ++++++++++++++++-- ...ith-fake-endpoints-models-for-testing.yaml | 21 +++ .../.openapi-generator/FILES | 6 + .../petstore/python-nextgen-aiohttp/README.md | 3 + .../docs/CircularReferenceModel.md | 29 ++++ .../python-nextgen-aiohttp/docs/FirstRef.md | 29 ++++ .../python-nextgen-aiohttp/docs/SecondRef.md | 29 ++++ .../petstore_api/__init__.py | 3 + .../petstore_api/models/__init__.py | 3 + .../models/circular_reference_model.py | 75 +++++++++ .../petstore_api/models/first_ref.py | 75 +++++++++ .../petstore_api/models/second_ref.py | 75 +++++++++ .../test/test_circular_reference_model.py | 64 ++++++++ .../test/test_first_ref.py | 62 +++++++ .../test/test_second_ref.py | 62 +++++++ .../python-nextgen/.openapi-generator/FILES | 6 + .../client/petstore/python-nextgen/README.md | 3 + .../docs/CircularReferenceModel.md | 29 ++++ .../petstore/python-nextgen/docs/FirstRef.md | 29 ++++ .../petstore/python-nextgen/docs/SecondRef.md | 29 ++++ .../python-nextgen/petstore_api/__init__.py | 3 + .../petstore_api/models/__init__.py | 3 + .../models/circular_reference_model.py | 87 ++++++++++ .../petstore_api/models/first_ref.py | 87 ++++++++++ .../petstore_api/models/second_ref.py | 87 ++++++++++ .../test/test_circular_reference_model.py | 64 ++++++++ .../python-nextgen/test/test_first_ref.py | 62 +++++++ .../python-nextgen/test/test_second_ref.py | 62 +++++++ 28 files changed, 1230 insertions(+), 12 deletions(-) create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/CircularReferenceModel.md create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FirstRef.md create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/SecondRef.md create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/circular_reference_model.py create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/first_ref.py create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/second_ref.py create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_circular_reference_model.py create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_first_ref.py create mode 100644 samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_second_ref.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/docs/CircularReferenceModel.md create mode 100644 samples/openapi3/client/petstore/python-nextgen/docs/FirstRef.md create mode 100644 samples/openapi3/client/petstore/python-nextgen/docs/SecondRef.md create mode 100644 samples/openapi3/client/petstore/python-nextgen/petstore_api/models/circular_reference_model.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/petstore_api/models/first_ref.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/petstore_api/models/second_ref.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/test/test_circular_reference_model.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/test/test_first_ref.py create mode 100644 samples/openapi3/client/petstore/python-nextgen/test/test_second_ref.py diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java index 376dc40786f..2685fde8dbb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java @@ -64,6 +64,11 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements private String testFolder; + // map of set (model imports) + private HashMap> circularImports = new HashMap<>(); + // map of codegen models + private HashMap codegenModelMap = new HashMap<>(); + public PythonNextgenClientCodegen() { super(); @@ -404,6 +409,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements * @param typingImports typing imports * @param pydantic pydantic imports * @param datetimeImports datetime imports + * @param modelImports model imports + * @param classname class name * @return pydantic type * */ @@ -411,7 +418,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements Set typingImports, Set pydanticImports, Set datetimeImports, - Set modelImports) { + Set modelImports, + String classname) { if (cp == null) { // if codegen parameter (e.g. map/dict of undefined type) is null, default to string LOGGER.warn("Codegen property is null (e.g. map/dict of undefined type). Default to typing.Any."); @@ -432,11 +440,12 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements } pydanticImports.add("conlist"); return String.format(Locale.ROOT, "conlist(%s%s)", - getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports), + getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, classname), constraints); } else if (cp.isMap) { typingImports.add("Dict"); - return String.format(Locale.ROOT, "Dict[str, %s]", getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports)); + return String.format(Locale.ROOT, "Dict[str, %s]", + getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, classname)); } else if (cp.isString || cp.isBinary || cp.isByteArray) { if (cp.hasValidation) { List fieldCustomization = new ArrayList<>(); @@ -612,7 +621,7 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements CodegenMediaType cmt = contents.get(key); // TODO process the first one only at the moment if (cmt != null) - return getPydanticType(cmt.getSchema(), typingImports, pydanticImports, datetimeImports, modelImports); + return getPydanticType(cmt.getSchema(), typingImports, pydanticImports, datetimeImports, modelImports, classname); } throw new RuntimeException("Error! Failed to process getPydanticType when getting the content: " + cp); } else { @@ -627,6 +636,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements * @param typingImports typing imports * @param pydantic pydantic imports * @param datetimeImports datetime imports + * @param modelImports model imports + * @param classname class name * @return pydantic type * */ @@ -634,7 +645,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements Set typingImports, Set pydanticImports, Set datetimeImports, - Set modelImports) { + Set modelImports, + String classname) { if (cp == null) { // if codegen property (e.g. map/dict of undefined type) is null, default to string LOGGER.warn("Codegen property is null (e.g. map/dict of undefined type). Default to typing.Any."); @@ -674,11 +686,11 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements pydanticImports.add("conlist"); typingImports.add("List"); // for return type return String.format(Locale.ROOT, "conlist(%s%s)", - getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports), + getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, classname), constraints); } else if (cp.isMap) { typingImports.add("Dict"); - return String.format(Locale.ROOT, "Dict[str, %s]", getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports)); + return String.format(Locale.ROOT, "Dict[str, %s]", getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, classname)); } else if (cp.isString) { if (cp.hasValidation) { List fieldCustomization = new ArrayList<>(); @@ -846,10 +858,24 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements typingImports.add("Any"); return "Dict[str, Any]"; } else if (!cp.isPrimitiveType || cp.isModel) { // model - if (!cp.isCircularReference) { - // skip import if it's a circular reference + // skip import if it's a circular reference + if (classname == null) { + // for parameter model, import directly hasModelsToImport = true; modelImports.add(cp.dataType); + } else { + if (circularImports.containsKey(cp.dataType)) { + if (circularImports.get(cp.dataType).contains(classname)) { + // cp.dataType import map of set contains this model (classname), don't import + LOGGER.debug("Skipped importing {} in {} due to circular import.", cp.dataType, classname); + } else { + // not circular import, so ok to import it + hasModelsToImport = true; + modelImports.add(cp.dataType); + } + } else { + LOGGER.error("Failed to look up {} from the imports (map of set) of models.", cp.dataType); + } } return cp.dataType; } else { @@ -871,7 +897,7 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements List params = operation.allParams; for (CodegenParameter param : params) { - String typing = getPydanticType(param, typingImports, pydanticImports, datetimeImports, modelImports); + String typing = getPydanticType(param, typingImports, pydanticImports, datetimeImports, modelImports, null); List fields = new ArrayList<>(); String firstField = ""; @@ -923,7 +949,7 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements // update typing import for operation return type if (!StringUtils.isEmpty(operation.returnType)) { String typing = getPydanticType(operation.returnProperty, typingImports, - new TreeSet<>() /* skip pydantic import for return type */, datetimeImports, modelImports); + new TreeSet<>() /* skip pydantic import for return type */, datetimeImports, modelImports, null); } } @@ -983,6 +1009,18 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements @Override public Map postProcessAllModels(Map objs) { final Map processed = super.postProcessAllModels(objs); + + for (Map.Entry entry : objs.entrySet()) { + // create hash map of codegen model + CodegenModel cm = ModelUtils.getModelByName(entry.getKey(), objs); + codegenModelMap.put(cm.classname, ModelUtils.getModelByName(entry.getKey(), objs)); + } + + // create circular import + for (String m : codegenModelMap.keySet()) { + createImportMapOfSet(m, codegenModelMap); + } + for (Map.Entry entry : processed.entrySet()) { entry.setValue(postProcessModelsMap(entry.getValue())); } @@ -990,6 +1028,99 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements return processed; } + /** + * Update circularImports with the model name (key) and its imports gathered recursively + * + * @param modelName model name + * @param codegenModelMap a map of CodegenModel + */ + void createImportMapOfSet(String modelName, Map codegenModelMap) { + HashSet imports = new HashSet<>(); + circularImports.put(modelName, imports); + + CodegenModel cm = codegenModelMap.get(modelName); + + if (cm == null) { + LOGGER.warn("Failed to lookup model in createImportMapOfSet: " + modelName); + return; + } + + List codegenProperties = null; + if (cm.oneOf != null && !cm.oneOf.isEmpty()) { // oneOf + codegenProperties = cm.getComposedSchemas().getOneOf(); + } else if (cm.anyOf != null && !cm.anyOf.isEmpty()) { // anyOF + codegenProperties = cm.getComposedSchemas().getAnyOf(); + } else { // typical model + codegenProperties = cm.vars; + } + + for (CodegenProperty cp : codegenProperties) { + String modelNameFromDataType = getModelNameFromDataType(cp); + if (modelNameFromDataType != null) { // model + imports.add(modelNameFromDataType); // update import + // go through properties or sub-schemas of the model recursively to identify more (model) import if any + updateImportsFromCodegenModel(modelNameFromDataType, codegenModelMap.get(modelNameFromDataType), imports); + } + } + } + + /** + * Update set of imports from codegen model recursivly + * + * @param modelName model name + * @param cm codegen model + * @param imports set of imports + */ + public void updateImportsFromCodegenModel(String modelName, CodegenModel cm, Set imports) { + if (cm == null) { + LOGGER.warn("Failed to lookup model in createImportMapOfSet " + modelName); + return; + } + + List codegenProperties = null; + if (cm.oneOf != null && !cm.oneOf.isEmpty()) { // oneOfValidationError + codegenProperties = cm.getComposedSchemas().getOneOf(); + } else if (cm.anyOf != null && !cm.anyOf.isEmpty()) { // anyOF + codegenProperties = cm.getComposedSchemas().getAnyOf(); + } else { // typical model + codegenProperties = cm.vars; + } + + for (CodegenProperty cp : codegenProperties) { + String modelNameFromDataType = getModelNameFromDataType(cp); + if (modelNameFromDataType != null) { // model + if (modelName.equals(modelNameFromDataType)) { // self referencing + continue; + } else if (imports.contains(modelNameFromDataType)) { // circular import + continue; + } else { + imports.add(modelNameFromDataType); // update import + // go through properties of the model recursively to identify more (model) import if any + updateImportsFromCodegenModel(modelNameFromDataType, codegenModelMap.get(modelNameFromDataType), imports); + } + } + } + } + + /** + * Returns the model name (if any) from data type of codegen property. + * Returns null if it's not a model. + * + * @param cp Codegen property + * @return model name + */ + private String getModelNameFromDataType(CodegenProperty cp) { + if (cp.isArray) { + return getModelNameFromDataType(cp.items); + } else if (cp.isMap) { + return getModelNameFromDataType(cp.items); + } else if (!cp.isPrimitiveType || cp.isModel) { + return cp.dataType; + } else { + return null; + } + } + private ModelsMap postProcessModelsMap(ModelsMap objs) { // process enum in models objs = postProcessModelsEnum(objs); @@ -1044,7 +1175,7 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements //loop through properties/schemas to set up typing, pydantic for (CodegenProperty cp : codegenProperties) { - String typing = getPydanticType(cp, typingImports, pydanticImports, datetimeImports, modelImports); + String typing = getPydanticType(cp, typingImports, pydanticImports, datetimeImports, modelImports, model.classname); List fields = new ArrayList<>(); String firstField = ""; diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml index c8e80e14301..9dedcf30521 100644 --- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml @@ -2126,3 +2126,24 @@ components: properties: optionalDict: $ref: "#/components/schemas/DictWithAdditionalProperties" + Circular-Reference-Model: + type: object + properties: + size: + type: integer + nested: + $ref: '#/components/schemas/FirstRef' + FirstRef: + type: object + properties: + category: + type: string + self_ref: + $ref: '#/components/schemas/SecondRef' + SecondRef: + type: object + properties: + category: + type: string + circular_ref: + $ref: '#/components/schemas/Circular-Reference-Model' diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES index 5d9cf72b28b..970be2c4e66 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/FILES @@ -18,6 +18,7 @@ docs/Capitalization.md docs/Cat.md docs/CatAllOf.md docs/Category.md +docs/CircularReferenceModel.md docs/ClassModel.md docs/Client.md docs/Color.md @@ -34,6 +35,7 @@ docs/FakeApi.md docs/FakeClassnameTags123Api.md docs/File.md docs/FileSchemaTestClass.md +docs/FirstRef.md docs/Foo.md docs/FooGetDefaultResponse.md docs/FormatTest.md @@ -61,6 +63,7 @@ docs/Pet.md docs/PetApi.md docs/Pig.md docs/ReadOnlyFirst.md +docs/SecondRef.md docs/SelfReferenceModel.md docs/SingleRefType.md docs/SpecialCharacterEnum.md @@ -99,6 +102,7 @@ petstore_api/models/capitalization.py petstore_api/models/cat.py petstore_api/models/cat_all_of.py petstore_api/models/category.py +petstore_api/models/circular_reference_model.py petstore_api/models/class_model.py petstore_api/models/client.py petstore_api/models/color.py @@ -112,6 +116,7 @@ petstore_api/models/enum_class.py petstore_api/models/enum_test.py petstore_api/models/file.py petstore_api/models/file_schema_test_class.py +petstore_api/models/first_ref.py petstore_api/models/foo.py petstore_api/models/foo_get_default_response.py petstore_api/models/format_test.py @@ -138,6 +143,7 @@ petstore_api/models/parent_with_optional_dict.py petstore_api/models/pet.py petstore_api/models/pig.py petstore_api/models/read_only_first.py +petstore_api/models/second_ref.py petstore_api/models/self_reference_model.py petstore_api/models/single_ref_type.py petstore_api/models/special_character_enum.py diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md index 9a72457e234..e26d9f33e89 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/README.md @@ -146,6 +146,7 @@ Class | Method | HTTP request | Description - [Cat](docs/Cat.md) - [CatAllOf](docs/CatAllOf.md) - [Category](docs/Category.md) + - [CircularReferenceModel](docs/CircularReferenceModel.md) - [ClassModel](docs/ClassModel.md) - [Client](docs/Client.md) - [Color](docs/Color.md) @@ -159,6 +160,7 @@ Class | Method | HTTP request | Description - [EnumTest](docs/EnumTest.md) - [File](docs/File.md) - [FileSchemaTestClass](docs/FileSchemaTestClass.md) + - [FirstRef](docs/FirstRef.md) - [Foo](docs/Foo.md) - [FooGetDefaultResponse](docs/FooGetDefaultResponse.md) - [FormatTest](docs/FormatTest.md) @@ -185,6 +187,7 @@ Class | Method | HTTP request | Description - [Pet](docs/Pet.md) - [Pig](docs/Pig.md) - [ReadOnlyFirst](docs/ReadOnlyFirst.md) + - [SecondRef](docs/SecondRef.md) - [SelfReferenceModel](docs/SelfReferenceModel.md) - [SingleRefType](docs/SingleRefType.md) - [SpecialCharacterEnum](docs/SpecialCharacterEnum.md) diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/CircularReferenceModel.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/CircularReferenceModel.md new file mode 100644 index 00000000000..d5e97934d2b --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/CircularReferenceModel.md @@ -0,0 +1,29 @@ +# CircularReferenceModel + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**size** | **int** | | [optional] +**nested** | [**FirstRef**](FirstRef.md) | | [optional] + +## Example + +```python +from petstore_api.models.circular_reference_model import CircularReferenceModel + +# TODO update the JSON string below +json = "{}" +# create an instance of CircularReferenceModel from a JSON string +circular_reference_model_instance = CircularReferenceModel.from_json(json) +# print the JSON string representation of the object +print CircularReferenceModel.to_json() + +# convert the object into a dict +circular_reference_model_dict = circular_reference_model_instance.to_dict() +# create an instance of CircularReferenceModel from a dict +circular_reference_model_form_dict = circular_reference_model.from_dict(circular_reference_model_dict) +``` +[[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-nextgen-aiohttp/docs/FirstRef.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FirstRef.md new file mode 100644 index 00000000000..b5e7ab766b4 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FirstRef.md @@ -0,0 +1,29 @@ +# FirstRef + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**category** | **str** | | [optional] +**self_ref** | [**SecondRef**](SecondRef.md) | | [optional] + +## Example + +```python +from petstore_api.models.first_ref import FirstRef + +# TODO update the JSON string below +json = "{}" +# create an instance of FirstRef from a JSON string +first_ref_instance = FirstRef.from_json(json) +# print the JSON string representation of the object +print FirstRef.to_json() + +# convert the object into a dict +first_ref_dict = first_ref_instance.to_dict() +# create an instance of FirstRef from a dict +first_ref_form_dict = first_ref.from_dict(first_ref_dict) +``` +[[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-nextgen-aiohttp/docs/SecondRef.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/SecondRef.md new file mode 100644 index 00000000000..e6fb1e2d4f7 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/SecondRef.md @@ -0,0 +1,29 @@ +# SecondRef + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**category** | **str** | | [optional] +**circular_ref** | [**CircularReferenceModel**](CircularReferenceModel.md) | | [optional] + +## Example + +```python +from petstore_api.models.second_ref import SecondRef + +# TODO update the JSON string below +json = "{}" +# create an instance of SecondRef from a JSON string +second_ref_instance = SecondRef.from_json(json) +# print the JSON string representation of the object +print SecondRef.to_json() + +# convert the object into a dict +second_ref_dict = second_ref_instance.to_dict() +# create an instance of SecondRef from a dict +second_ref_form_dict = second_ref.from_dict(second_ref_dict) +``` +[[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-nextgen-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py index 31cf58fec33..417db16491d 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/__init__.py @@ -49,6 +49,7 @@ from petstore_api.models.capitalization import Capitalization from petstore_api.models.cat import Cat from petstore_api.models.cat_all_of import CatAllOf from petstore_api.models.category import Category +from petstore_api.models.circular_reference_model import CircularReferenceModel from petstore_api.models.class_model import ClassModel from petstore_api.models.client import Client from petstore_api.models.color import Color @@ -62,6 +63,7 @@ from petstore_api.models.enum_class import EnumClass from petstore_api.models.enum_test import EnumTest from petstore_api.models.file import File from petstore_api.models.file_schema_test_class import FileSchemaTestClass +from petstore_api.models.first_ref import FirstRef from petstore_api.models.foo import Foo from petstore_api.models.foo_get_default_response import FooGetDefaultResponse from petstore_api.models.format_test import FormatTest @@ -88,6 +90,7 @@ from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict from petstore_api.models.pet import Pet from petstore_api.models.pig import Pig from petstore_api.models.read_only_first import ReadOnlyFirst +from petstore_api.models.second_ref import SecondRef from petstore_api.models.self_reference_model import SelfReferenceModel from petstore_api.models.single_ref_type import SingleRefType from petstore_api.models.special_character_enum import SpecialCharacterEnum diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py index b6cd78aa71c..212f2096311 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/__init__.py @@ -28,6 +28,7 @@ from petstore_api.models.capitalization import Capitalization from petstore_api.models.cat import Cat from petstore_api.models.cat_all_of import CatAllOf from petstore_api.models.category import Category +from petstore_api.models.circular_reference_model import CircularReferenceModel from petstore_api.models.class_model import ClassModel from petstore_api.models.client import Client from petstore_api.models.color import Color @@ -41,6 +42,7 @@ from petstore_api.models.enum_class import EnumClass from petstore_api.models.enum_test import EnumTest from petstore_api.models.file import File from petstore_api.models.file_schema_test_class import FileSchemaTestClass +from petstore_api.models.first_ref import FirstRef from petstore_api.models.foo import Foo from petstore_api.models.foo_get_default_response import FooGetDefaultResponse from petstore_api.models.format_test import FormatTest @@ -67,6 +69,7 @@ from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict from petstore_api.models.pet import Pet from petstore_api.models.pig import Pig from petstore_api.models.read_only_first import ReadOnlyFirst +from petstore_api.models.second_ref import SecondRef from petstore_api.models.self_reference_model import SelfReferenceModel from petstore_api.models.single_ref_type import SingleRefType from petstore_api.models.special_character_enum import SpecialCharacterEnum diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/circular_reference_model.py new file mode 100644 index 00000000000..3a03dad4ddd --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/circular_reference_model.py @@ -0,0 +1,75 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Optional +from pydantic import BaseModel, StrictInt + +class CircularReferenceModel(BaseModel): + """ + CircularReferenceModel + """ + size: Optional[StrictInt] = None + nested: Optional[FirstRef] = None + __properties = ["size", "nested"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> CircularReferenceModel: + """Create an instance of CircularReferenceModel from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + }, + exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of nested + if self.nested: + _dict['nested'] = self.nested.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> CircularReferenceModel: + """Create an instance of CircularReferenceModel from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return CircularReferenceModel.parse_obj(obj) + + _obj = CircularReferenceModel.parse_obj({ + "size": obj.get("size"), + "nested": FirstRef.from_dict(obj.get("nested")) if obj.get("nested") is not None else None + }) + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/first_ref.py new file mode 100644 index 00000000000..0856f9b0daf --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/first_ref.py @@ -0,0 +1,75 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Optional +from pydantic import BaseModel, StrictStr + +class FirstRef(BaseModel): + """ + FirstRef + """ + category: Optional[StrictStr] = None + self_ref: Optional[SecondRef] = None + __properties = ["category", "self_ref"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> FirstRef: + """Create an instance of FirstRef from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + }, + exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of self_ref + if self.self_ref: + _dict['self_ref'] = self.self_ref.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> FirstRef: + """Create an instance of FirstRef from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return FirstRef.parse_obj(obj) + + _obj = FirstRef.parse_obj({ + "category": obj.get("category"), + "self_ref": SecondRef.from_dict(obj.get("self_ref")) if obj.get("self_ref") is not None else None + }) + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/second_ref.py new file mode 100644 index 00000000000..f00e2756920 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/second_ref.py @@ -0,0 +1,75 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Optional +from pydantic import BaseModel, StrictStr + +class SecondRef(BaseModel): + """ + SecondRef + """ + category: Optional[StrictStr] = None + circular_ref: Optional[CircularReferenceModel] = None + __properties = ["category", "circular_ref"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> SecondRef: + """Create an instance of SecondRef from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + }, + exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of circular_ref + if self.circular_ref: + _dict['circular_ref'] = self.circular_ref.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> SecondRef: + """Create an instance of SecondRef from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return SecondRef.parse_obj(obj) + + _obj = SecondRef.parse_obj({ + "category": obj.get("category"), + "circular_ref": CircularReferenceModel.from_dict(obj.get("circular_ref")) if obj.get("circular_ref") is not None else None + }) + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_circular_reference_model.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_circular_reference_model.py new file mode 100644 index 00000000000..f734d3fc0ff --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_circular_reference_model.py @@ -0,0 +1,64 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.circular_reference_model import CircularReferenceModel # noqa: E501 +from petstore_api.rest import ApiException + +class TestCircularReferenceModel(unittest.TestCase): + """CircularReferenceModel unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test CircularReferenceModel + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `CircularReferenceModel` + """ + model = petstore_api.models.circular_reference_model.CircularReferenceModel() # noqa: E501 + if include_optional : + return CircularReferenceModel( + size = 56, + nested = petstore_api.models.first_ref.FirstRef( + category = '', + self_ref = petstore_api.models.second_ref.SecondRef( + category = '', + circular_ref = petstore_api.models.circular_reference_model.Circular-Reference-Model( + size = 56, + nested = petstore_api.models.first_ref.FirstRef( + category = '', ), ), ), ) + ) + else : + return CircularReferenceModel( + ) + """ + + def testCircularReferenceModel(self): + """Test CircularReferenceModel""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_first_ref.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_first_ref.py new file mode 100644 index 00000000000..bcec1c0334b --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_first_ref.py @@ -0,0 +1,62 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.first_ref import FirstRef # noqa: E501 +from petstore_api.rest import ApiException + +class TestFirstRef(unittest.TestCase): + """FirstRef unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test FirstRef + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `FirstRef` + """ + model = petstore_api.models.first_ref.FirstRef() # noqa: E501 + if include_optional : + return FirstRef( + category = '', + self_ref = petstore_api.models.second_ref.SecondRef( + category = '', + circular_ref = petstore_api.models.circular_reference_model.Circular-Reference-Model( + size = 56, + nested = petstore_api.models.first_ref.FirstRef( + category = '', ), ), ) + ) + else : + return FirstRef( + ) + """ + + def testFirstRef(self): + """Test FirstRef""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_second_ref.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_second_ref.py new file mode 100644 index 00000000000..782892fd4e1 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/test/test_second_ref.py @@ -0,0 +1,62 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.second_ref import SecondRef # noqa: E501 +from petstore_api.rest import ApiException + +class TestSecondRef(unittest.TestCase): + """SecondRef unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test SecondRef + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `SecondRef` + """ + model = petstore_api.models.second_ref.SecondRef() # noqa: E501 + if include_optional : + return SecondRef( + category = '', + circular_ref = petstore_api.models.circular_reference_model.Circular-Reference-Model( + size = 56, + nested = petstore_api.models.first_ref.FirstRef( + category = '', + self_ref = petstore_api.models.second_ref.SecondRef( + category = '', ), ), ) + ) + else : + return SecondRef( + ) + """ + + def testSecondRef(self): + """Test SecondRef""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES index c84577aa151..1c063f5f802 100755 --- a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/FILES @@ -18,6 +18,7 @@ docs/Capitalization.md docs/Cat.md docs/CatAllOf.md docs/Category.md +docs/CircularReferenceModel.md docs/ClassModel.md docs/Client.md docs/Color.md @@ -34,6 +35,7 @@ docs/FakeApi.md docs/FakeClassnameTags123Api.md docs/File.md docs/FileSchemaTestClass.md +docs/FirstRef.md docs/Foo.md docs/FooGetDefaultResponse.md docs/FormatTest.md @@ -61,6 +63,7 @@ docs/Pet.md docs/PetApi.md docs/Pig.md docs/ReadOnlyFirst.md +docs/SecondRef.md docs/SelfReferenceModel.md docs/SingleRefType.md docs/SpecialCharacterEnum.md @@ -99,6 +102,7 @@ petstore_api/models/capitalization.py petstore_api/models/cat.py petstore_api/models/cat_all_of.py petstore_api/models/category.py +petstore_api/models/circular_reference_model.py petstore_api/models/class_model.py petstore_api/models/client.py petstore_api/models/color.py @@ -112,6 +116,7 @@ petstore_api/models/enum_class.py petstore_api/models/enum_test.py petstore_api/models/file.py petstore_api/models/file_schema_test_class.py +petstore_api/models/first_ref.py petstore_api/models/foo.py petstore_api/models/foo_get_default_response.py petstore_api/models/format_test.py @@ -138,6 +143,7 @@ petstore_api/models/parent_with_optional_dict.py petstore_api/models/pet.py petstore_api/models/pig.py petstore_api/models/read_only_first.py +petstore_api/models/second_ref.py petstore_api/models/self_reference_model.py petstore_api/models/single_ref_type.py petstore_api/models/special_character_enum.py diff --git a/samples/openapi3/client/petstore/python-nextgen/README.md b/samples/openapi3/client/petstore/python-nextgen/README.md index e64a6743b26..a7b98f0887e 100755 --- a/samples/openapi3/client/petstore/python-nextgen/README.md +++ b/samples/openapi3/client/petstore/python-nextgen/README.md @@ -146,6 +146,7 @@ Class | Method | HTTP request | Description - [Cat](docs/Cat.md) - [CatAllOf](docs/CatAllOf.md) - [Category](docs/Category.md) + - [CircularReferenceModel](docs/CircularReferenceModel.md) - [ClassModel](docs/ClassModel.md) - [Client](docs/Client.md) - [Color](docs/Color.md) @@ -159,6 +160,7 @@ Class | Method | HTTP request | Description - [EnumTest](docs/EnumTest.md) - [File](docs/File.md) - [FileSchemaTestClass](docs/FileSchemaTestClass.md) + - [FirstRef](docs/FirstRef.md) - [Foo](docs/Foo.md) - [FooGetDefaultResponse](docs/FooGetDefaultResponse.md) - [FormatTest](docs/FormatTest.md) @@ -185,6 +187,7 @@ Class | Method | HTTP request | Description - [Pet](docs/Pet.md) - [Pig](docs/Pig.md) - [ReadOnlyFirst](docs/ReadOnlyFirst.md) + - [SecondRef](docs/SecondRef.md) - [SelfReferenceModel](docs/SelfReferenceModel.md) - [SingleRefType](docs/SingleRefType.md) - [SpecialCharacterEnum](docs/SpecialCharacterEnum.md) diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/CircularReferenceModel.md b/samples/openapi3/client/petstore/python-nextgen/docs/CircularReferenceModel.md new file mode 100644 index 00000000000..d5e97934d2b --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/docs/CircularReferenceModel.md @@ -0,0 +1,29 @@ +# CircularReferenceModel + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**size** | **int** | | [optional] +**nested** | [**FirstRef**](FirstRef.md) | | [optional] + +## Example + +```python +from petstore_api.models.circular_reference_model import CircularReferenceModel + +# TODO update the JSON string below +json = "{}" +# create an instance of CircularReferenceModel from a JSON string +circular_reference_model_instance = CircularReferenceModel.from_json(json) +# print the JSON string representation of the object +print CircularReferenceModel.to_json() + +# convert the object into a dict +circular_reference_model_dict = circular_reference_model_instance.to_dict() +# create an instance of CircularReferenceModel from a dict +circular_reference_model_form_dict = circular_reference_model.from_dict(circular_reference_model_dict) +``` +[[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-nextgen/docs/FirstRef.md b/samples/openapi3/client/petstore/python-nextgen/docs/FirstRef.md new file mode 100644 index 00000000000..b5e7ab766b4 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/docs/FirstRef.md @@ -0,0 +1,29 @@ +# FirstRef + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**category** | **str** | | [optional] +**self_ref** | [**SecondRef**](SecondRef.md) | | [optional] + +## Example + +```python +from petstore_api.models.first_ref import FirstRef + +# TODO update the JSON string below +json = "{}" +# create an instance of FirstRef from a JSON string +first_ref_instance = FirstRef.from_json(json) +# print the JSON string representation of the object +print FirstRef.to_json() + +# convert the object into a dict +first_ref_dict = first_ref_instance.to_dict() +# create an instance of FirstRef from a dict +first_ref_form_dict = first_ref.from_dict(first_ref_dict) +``` +[[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-nextgen/docs/SecondRef.md b/samples/openapi3/client/petstore/python-nextgen/docs/SecondRef.md new file mode 100644 index 00000000000..e6fb1e2d4f7 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/docs/SecondRef.md @@ -0,0 +1,29 @@ +# SecondRef + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**category** | **str** | | [optional] +**circular_ref** | [**CircularReferenceModel**](CircularReferenceModel.md) | | [optional] + +## Example + +```python +from petstore_api.models.second_ref import SecondRef + +# TODO update the JSON string below +json = "{}" +# create an instance of SecondRef from a JSON string +second_ref_instance = SecondRef.from_json(json) +# print the JSON string representation of the object +print SecondRef.to_json() + +# convert the object into a dict +second_ref_dict = second_ref_instance.to_dict() +# create an instance of SecondRef from a dict +second_ref_form_dict = second_ref.from_dict(second_ref_dict) +``` +[[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-nextgen/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py index 31cf58fec33..417db16491d 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/__init__.py @@ -49,6 +49,7 @@ from petstore_api.models.capitalization import Capitalization from petstore_api.models.cat import Cat from petstore_api.models.cat_all_of import CatAllOf from petstore_api.models.category import Category +from petstore_api.models.circular_reference_model import CircularReferenceModel from petstore_api.models.class_model import ClassModel from petstore_api.models.client import Client from petstore_api.models.color import Color @@ -62,6 +63,7 @@ from petstore_api.models.enum_class import EnumClass from petstore_api.models.enum_test import EnumTest from petstore_api.models.file import File from petstore_api.models.file_schema_test_class import FileSchemaTestClass +from petstore_api.models.first_ref import FirstRef from petstore_api.models.foo import Foo from petstore_api.models.foo_get_default_response import FooGetDefaultResponse from petstore_api.models.format_test import FormatTest @@ -88,6 +90,7 @@ from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict from petstore_api.models.pet import Pet from petstore_api.models.pig import Pig from petstore_api.models.read_only_first import ReadOnlyFirst +from petstore_api.models.second_ref import SecondRef from petstore_api.models.self_reference_model import SelfReferenceModel from petstore_api.models.single_ref_type import SingleRefType from petstore_api.models.special_character_enum import SpecialCharacterEnum diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py index b6cd78aa71c..212f2096311 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/__init__.py @@ -28,6 +28,7 @@ from petstore_api.models.capitalization import Capitalization from petstore_api.models.cat import Cat from petstore_api.models.cat_all_of import CatAllOf from petstore_api.models.category import Category +from petstore_api.models.circular_reference_model import CircularReferenceModel from petstore_api.models.class_model import ClassModel from petstore_api.models.client import Client from petstore_api.models.color import Color @@ -41,6 +42,7 @@ from petstore_api.models.enum_class import EnumClass from petstore_api.models.enum_test import EnumTest from petstore_api.models.file import File from petstore_api.models.file_schema_test_class import FileSchemaTestClass +from petstore_api.models.first_ref import FirstRef from petstore_api.models.foo import Foo from petstore_api.models.foo_get_default_response import FooGetDefaultResponse from petstore_api.models.format_test import FormatTest @@ -67,6 +69,7 @@ from petstore_api.models.parent_with_optional_dict import ParentWithOptionalDict from petstore_api.models.pet import Pet from petstore_api.models.pig import Pig from petstore_api.models.read_only_first import ReadOnlyFirst +from petstore_api.models.second_ref import SecondRef from petstore_api.models.self_reference_model import SelfReferenceModel from petstore_api.models.single_ref_type import SingleRefType from petstore_api.models.special_character_enum import SpecialCharacterEnum diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/circular_reference_model.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/circular_reference_model.py new file mode 100644 index 00000000000..eacb22736b3 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/circular_reference_model.py @@ -0,0 +1,87 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Optional +from pydantic import BaseModel, StrictInt + +class CircularReferenceModel(BaseModel): + """ + CircularReferenceModel + """ + size: Optional[StrictInt] = None + nested: Optional[FirstRef] = None + additional_properties: Dict[str, Any] = {} + __properties = ["size", "nested"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> CircularReferenceModel: + """Create an instance of CircularReferenceModel from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + "additional_properties" + }, + exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of nested + if self.nested: + _dict['nested'] = self.nested.to_dict() + # puts key-value pairs in additional_properties in the top level + if self.additional_properties is not None: + for _key, _value in self.additional_properties.items(): + _dict[_key] = _value + + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> CircularReferenceModel: + """Create an instance of CircularReferenceModel from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return CircularReferenceModel.parse_obj(obj) + + _obj = CircularReferenceModel.parse_obj({ + "size": obj.get("size"), + "nested": FirstRef.from_dict(obj.get("nested")) if obj.get("nested") is not None else None + }) + # store additional fields in additional_properties + for _key in obj.keys(): + if _key not in cls.__properties: + _obj.additional_properties[_key] = obj.get(_key) + + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/first_ref.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/first_ref.py new file mode 100644 index 00000000000..31ac2390677 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/first_ref.py @@ -0,0 +1,87 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Optional +from pydantic import BaseModel, StrictStr + +class FirstRef(BaseModel): + """ + FirstRef + """ + category: Optional[StrictStr] = None + self_ref: Optional[SecondRef] = None + additional_properties: Dict[str, Any] = {} + __properties = ["category", "self_ref"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> FirstRef: + """Create an instance of FirstRef from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + "additional_properties" + }, + exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of self_ref + if self.self_ref: + _dict['self_ref'] = self.self_ref.to_dict() + # puts key-value pairs in additional_properties in the top level + if self.additional_properties is not None: + for _key, _value in self.additional_properties.items(): + _dict[_key] = _value + + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> FirstRef: + """Create an instance of FirstRef from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return FirstRef.parse_obj(obj) + + _obj = FirstRef.parse_obj({ + "category": obj.get("category"), + "self_ref": SecondRef.from_dict(obj.get("self_ref")) if obj.get("self_ref") is not None else None + }) + # store additional fields in additional_properties + for _key in obj.keys(): + if _key not in cls.__properties: + _obj.additional_properties[_key] = obj.get(_key) + + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/second_ref.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/second_ref.py new file mode 100644 index 00000000000..228c8b24b92 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/second_ref.py @@ -0,0 +1,87 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Optional +from pydantic import BaseModel, StrictStr + +class SecondRef(BaseModel): + """ + SecondRef + """ + category: Optional[StrictStr] = None + circular_ref: Optional[CircularReferenceModel] = None + additional_properties: Dict[str, Any] = {} + __properties = ["category", "circular_ref"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> SecondRef: + """Create an instance of SecondRef from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + "additional_properties" + }, + exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of circular_ref + if self.circular_ref: + _dict['circular_ref'] = self.circular_ref.to_dict() + # puts key-value pairs in additional_properties in the top level + if self.additional_properties is not None: + for _key, _value in self.additional_properties.items(): + _dict[_key] = _value + + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> SecondRef: + """Create an instance of SecondRef from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return SecondRef.parse_obj(obj) + + _obj = SecondRef.parse_obj({ + "category": obj.get("category"), + "circular_ref": CircularReferenceModel.from_dict(obj.get("circular_ref")) if obj.get("circular_ref") is not None else None + }) + # store additional fields in additional_properties + for _key in obj.keys(): + if _key not in cls.__properties: + _obj.additional_properties[_key] = obj.get(_key) + + return _obj + diff --git a/samples/openapi3/client/petstore/python-nextgen/test/test_circular_reference_model.py b/samples/openapi3/client/petstore/python-nextgen/test/test_circular_reference_model.py new file mode 100644 index 00000000000..f734d3fc0ff --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/test/test_circular_reference_model.py @@ -0,0 +1,64 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.circular_reference_model import CircularReferenceModel # noqa: E501 +from petstore_api.rest import ApiException + +class TestCircularReferenceModel(unittest.TestCase): + """CircularReferenceModel unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test CircularReferenceModel + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `CircularReferenceModel` + """ + model = petstore_api.models.circular_reference_model.CircularReferenceModel() # noqa: E501 + if include_optional : + return CircularReferenceModel( + size = 56, + nested = petstore_api.models.first_ref.FirstRef( + category = '', + self_ref = petstore_api.models.second_ref.SecondRef( + category = '', + circular_ref = petstore_api.models.circular_reference_model.Circular-Reference-Model( + size = 56, + nested = petstore_api.models.first_ref.FirstRef( + category = '', ), ), ), ) + ) + else : + return CircularReferenceModel( + ) + """ + + def testCircularReferenceModel(self): + """Test CircularReferenceModel""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen/test/test_first_ref.py b/samples/openapi3/client/petstore/python-nextgen/test/test_first_ref.py new file mode 100644 index 00000000000..bcec1c0334b --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/test/test_first_ref.py @@ -0,0 +1,62 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.first_ref import FirstRef # noqa: E501 +from petstore_api.rest import ApiException + +class TestFirstRef(unittest.TestCase): + """FirstRef unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test FirstRef + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `FirstRef` + """ + model = petstore_api.models.first_ref.FirstRef() # noqa: E501 + if include_optional : + return FirstRef( + category = '', + self_ref = petstore_api.models.second_ref.SecondRef( + category = '', + circular_ref = petstore_api.models.circular_reference_model.Circular-Reference-Model( + size = 56, + nested = petstore_api.models.first_ref.FirstRef( + category = '', ), ), ) + ) + else : + return FirstRef( + ) + """ + + def testFirstRef(self): + """Test FirstRef""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen/test/test_second_ref.py b/samples/openapi3/client/petstore/python-nextgen/test/test_second_ref.py new file mode 100644 index 00000000000..782892fd4e1 --- /dev/null +++ b/samples/openapi3/client/petstore/python-nextgen/test/test_second_ref.py @@ -0,0 +1,62 @@ +# 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 OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import absolute_import + +import unittest +import datetime + +import petstore_api +from petstore_api.models.second_ref import SecondRef # noqa: E501 +from petstore_api.rest import ApiException + +class TestSecondRef(unittest.TestCase): + """SecondRef unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test SecondRef + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `SecondRef` + """ + model = petstore_api.models.second_ref.SecondRef() # noqa: E501 + if include_optional : + return SecondRef( + category = '', + circular_ref = petstore_api.models.circular_reference_model.Circular-Reference-Model( + size = 56, + nested = petstore_api.models.first_ref.FirstRef( + category = '', + self_ref = petstore_api.models.second_ref.SecondRef( + category = '', ), ), ) + ) + else : + return SecondRef( + ) + """ + + def testSecondRef(self): + """Test SecondRef""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() From b59d5351761e6a9b1323d22cd38cc8f8835bc7f0 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 31 Mar 2023 16:16:58 +0800 Subject: [PATCH 097/131] [python-nextgen] Fix binary response (#15076) * fix binary response in python nextgen client * update samples --- .../languages/PythonNextgenClientCodegen.java | 4 +- .../python-nextgen/api_client.mustache | 9 +- .../src/test/resources/3_0/echo_api.yaml | 15 ++ .../echo_api/java/apache-httpclient/README.md | 6 +- .../java/apache-httpclient/api/openapi.yaml | 16 +++ .../java/apache-httpclient/docs/BodyApi.md | 63 +++++++++ .../org/openapitools/client/api/BodyApi.java | 68 +++++++++ .../echo_api/java/feign-gson/api/openapi.yaml | 16 +++ .../org/openapitools/client/api/BodyApi.java | 26 ++++ samples/client/echo_api/java/native/README.md | 7 +- .../echo_api/java/native/api/openapi.yaml | 16 +++ .../echo_api/java/native/docs/BodyApi.md | 128 +++++++++++++++++ .../org/openapitools/client/api/BodyApi.java | 66 +++++++++ .../echo_api/java/okhttp-gson/README.md | 6 +- .../java/okhttp-gson/api/openapi.yaml | 16 +++ .../echo_api/java/okhttp-gson/docs/BodyApi.md | 59 ++++++++ .../org/openapitools/client/api/BodyApi.java | 114 +++++++++++++++ .../client/echo_api/python-nextgen/README.md | 10 +- .../echo_api/python-nextgen/docs/BodyApi.md | 61 ++++++++ .../openapi_client/api/body_api.py | 132 ++++++++++++++++++ .../openapi_client/api_client.py | 9 +- .../python-nextgen/test/test_manual.py | 8 ++ .../python-nextgen-aiohttp/docs/FakeApi.md | 12 +- .../python-nextgen-aiohttp/docs/FormatTest.md | 4 +- .../python-nextgen-aiohttp/docs/PetApi.md | 8 +- .../petstore_api/api/fake_api.py | 12 +- .../petstore_api/api/pet_api.py | 8 +- .../petstore_api/api_client.py | 9 +- .../petstore_api/models/format_test.py | 10 +- .../petstore/python-nextgen/docs/FakeApi.md | 12 +- .../python-nextgen/docs/FormatTest.md | 4 +- .../petstore/python-nextgen/docs/PetApi.md | 8 +- .../petstore_api/api/fake_api.py | 12 +- .../petstore_api/api/pet_api.py | 8 +- .../python-nextgen/petstore_api/api_client.py | 9 +- .../petstore_api/models/format_test.py | 10 +- 36 files changed, 906 insertions(+), 75 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java index 2685fde8dbb..c2a5863fba8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java @@ -113,8 +113,10 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements typeMapping.put("array", "List"); typeMapping.put("set", "List"); typeMapping.put("map", "Dict"); - typeMapping.put("file", "str"); typeMapping.put("decimal", "decimal.Decimal"); + typeMapping.put("file", "bytearray"); + typeMapping.put("binary", "bytearray"); + typeMapping.put("ByteArray", "bytearray"); languageSpecificPrimitives.remove("file"); languageSpecificPrimitives.add("decimal.Decimal"); diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache index 7006b19276e..e394ad0a733 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/api_client.mustache @@ -241,7 +241,9 @@ class ApiClient(object): response_type = response_types_map.get(str(response_data.status), None) - if response_type not in ["file", "bytes"]: + if response_type == "bytearray": + response_data.data = response_data.data + else: match = None content_type = response_data.getheader('content-type') if content_type is not None: @@ -250,8 +252,9 @@ class ApiClient(object): response_data.data = response_data.data.decode(encoding) # deserialize response data - - if response_type: + if response_type == "bytearray": + return_data = response_data.data + elif response_type: return_data = self.deserialize(response_data, response_type) else: return_data = None diff --git a/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml b/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml index 860d590a829..4da38f3dd7e 100644 --- a/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml @@ -330,6 +330,21 @@ paths: text/plain: schema: type: string + /binary/gif: + post: + tags: + - body + summary: Test binary (gif) response body + description: Test binary (gif) response body + operationId: test/binary/gif + responses: + '200': + description: Successful operation + content: + image/gif: + schema: + type: string + format: binary components: requestBodies: diff --git a/samples/client/echo_api/java/apache-httpclient/README.md b/samples/client/echo_api/java/apache-httpclient/README.md index 260ee85a4bd..1145d8901a4 100644 --- a/samples/client/echo_api/java/apache-httpclient/README.md +++ b/samples/client/echo_api/java/apache-httpclient/README.md @@ -84,12 +84,11 @@ public class BodyApiExample { defaultClient.setBasePath("http://localhost:3000"); BodyApi apiInstance = new BodyApi(defaultClient); - Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store try { - Pet result = apiInstance.testEchoBodyPet(pet); + File result = apiInstance.testBinaryGif(); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling BodyApi#testEchoBodyPet"); + System.err.println("Exception when calling BodyApi#testBinaryGif"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -106,6 +105,7 @@ All URIs are relative to *http://localhost:3000* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- +*BodyApi* | [**testBinaryGif**](docs/BodyApi.md#testBinaryGif) | **POST** /binary/gif | Test binary (gif) response body *BodyApi* | [**testEchoBodyPet**](docs/BodyApi.md#testEchoBodyPet) | **POST** /echo/body/Pet | Test body parameter(s) *BodyApi* | [**testEchoBodyPetResponseString**](docs/BodyApi.md#testEchoBodyPetResponseString) | **POST** /echo/body/Pet/response_string | Test empty response body *FormApi* | [**testFormIntegerBooleanString**](docs/FormApi.md#testFormIntegerBooleanString) | **POST** /form/integer/boolean/string | Test form parameter(s) diff --git a/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml b/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml index 776a22706c7..3c38cd48549 100644 --- a/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml @@ -326,6 +326,22 @@ paths: - body x-content-type: application/json x-accepts: text/plain + /binary/gif: + post: + description: Test binary (gif) response body + operationId: test/binary/gif + responses: + "200": + content: + image/gif: + schema: + format: binary + type: string + description: Successful operation + summary: Test binary (gif) response body + tags: + - body + x-accepts: image/gif components: requestBodies: Pet: diff --git a/samples/client/echo_api/java/apache-httpclient/docs/BodyApi.md b/samples/client/echo_api/java/apache-httpclient/docs/BodyApi.md index a52e813762f..d32f0b77ce5 100644 --- a/samples/client/echo_api/java/apache-httpclient/docs/BodyApi.md +++ b/samples/client/echo_api/java/apache-httpclient/docs/BodyApi.md @@ -4,11 +4,74 @@ All URIs are relative to *http://localhost:3000* | Method | HTTP request | Description | |------------- | ------------- | -------------| +| [**testBinaryGif**](BodyApi.md#testBinaryGif) | **POST** /binary/gif | Test binary (gif) response body | | [**testEchoBodyPet**](BodyApi.md#testEchoBodyPet) | **POST** /echo/body/Pet | Test body parameter(s) | | [**testEchoBodyPetResponseString**](BodyApi.md#testEchoBodyPetResponseString) | **POST** /echo/body/Pet/response_string | Test empty response body | +## testBinaryGif + +> File testBinaryGif() + +Test binary (gif) response body + +Test binary (gif) response body + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.BodyApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost:3000"); + + BodyApi apiInstance = new BodyApi(defaultClient); + try { + File result = apiInstance.testBinaryGif(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling BodyApi#testBinaryGif"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +This endpoint does not need any parameter. + +### Return type + +[**File**](File.md) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: image/gif + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Successful operation | - | + + ## testEchoBodyPet > Pet testEchoBodyPet(pet) diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java index 6d28ab412f6..dd7df526dad 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java @@ -20,6 +20,7 @@ import org.openapitools.client.Configuration; import org.openapitools.client.model.*; import org.openapitools.client.Pair; +import java.io.File; import org.openapitools.client.model.Pet; @@ -52,6 +53,73 @@ public class BodyApi { this.apiClient = apiClient; } + /** + * Test binary (gif) response body + * Test binary (gif) response body + * @return File + * @throws ApiException if fails to make API call + */ + public File testBinaryGif() throws ApiException { + return this.testBinaryGif(Collections.emptyMap()); + } + + + /** + * Test binary (gif) response body + * Test binary (gif) response body + * @param additionalHeaders additionalHeaders for this call + * @return File + * @throws ApiException if fails to make API call + */ + public File testBinaryGif(Map additionalHeaders) throws ApiException { + Object localVarPostBody = null; + + // create path and map variables + String localVarPath = "/binary/gif"; + + StringJoiner localVarQueryStringJoiner = new StringJoiner("&"); + String localVarQueryParameterBaseName; + List localVarQueryParams = new ArrayList(); + List localVarCollectionQueryParams = new ArrayList(); + Map localVarHeaderParams = new HashMap(); + Map localVarCookieParams = new HashMap(); + Map localVarFormParams = new HashMap(); + + + localVarHeaderParams.putAll(additionalHeaders); + + + + final String[] localVarAccepts = { + "image/gif" + }; + final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + + final String[] localVarContentTypes = { + + }; + final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + TypeReference localVarReturnType = new TypeReference() {}; + return apiClient.invokeAPI( + localVarPath, + "POST", + localVarQueryParams, + localVarCollectionQueryParams, + localVarQueryStringJoiner.toString(), + localVarPostBody, + localVarHeaderParams, + localVarCookieParams, + localVarFormParams, + localVarAccept, + localVarContentType, + localVarAuthNames, + localVarReturnType + ); + } + /** * Test body parameter(s) * Test body parameter(s) diff --git a/samples/client/echo_api/java/feign-gson/api/openapi.yaml b/samples/client/echo_api/java/feign-gson/api/openapi.yaml index 776a22706c7..3c38cd48549 100644 --- a/samples/client/echo_api/java/feign-gson/api/openapi.yaml +++ b/samples/client/echo_api/java/feign-gson/api/openapi.yaml @@ -326,6 +326,22 @@ paths: - body x-content-type: application/json x-accepts: text/plain + /binary/gif: + post: + description: Test binary (gif) response body + operationId: test/binary/gif + responses: + "200": + content: + image/gif: + schema: + format: binary + type: string + description: Successful operation + summary: Test binary (gif) response body + tags: + - body + x-accepts: image/gif components: requestBodies: Pet: diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/api/BodyApi.java index 168667a31dc..13c3508214e 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/api/BodyApi.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/api/BodyApi.java @@ -4,6 +4,7 @@ import org.openapitools.client.ApiClient; import org.openapitools.client.EncodingUtils; import org.openapitools.client.model.ApiResponse; +import java.io.File; import org.openapitools.client.model.Pet; import java.util.ArrayList; @@ -16,6 +17,31 @@ import feign.*; public interface BodyApi extends ApiClient.Api { + /** + * Test binary (gif) response body + * Test binary (gif) response body + * @return File + */ + @RequestLine("POST /binary/gif") + @Headers({ + "Accept: image/gif", + }) + File testBinaryGif(); + + /** + * Test binary (gif) response body + * Similar to testBinaryGif but it also returns the http response headers . + * Test binary (gif) response body + * @return A ApiResponse that wraps the response boyd and the http headers. + */ + @RequestLine("POST /binary/gif") + @Headers({ + "Accept: image/gif", + }) + ApiResponse testBinaryGifWithHttpInfo(); + + + /** * Test body parameter(s) * Test body parameter(s) diff --git a/samples/client/echo_api/java/native/README.md b/samples/client/echo_api/java/native/README.md index a49e0a8658e..17877db7344 100644 --- a/samples/client/echo_api/java/native/README.md +++ b/samples/client/echo_api/java/native/README.md @@ -83,12 +83,11 @@ public class BodyApiExample { // Configure clients using the `defaultClient` object, such as // overriding the host and port, timeout, etc. BodyApi apiInstance = new BodyApi(defaultClient); - Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store try { - Pet result = apiInstance.testEchoBodyPet(pet); + File result = apiInstance.testBinaryGif(); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling BodyApi#testEchoBodyPet"); + System.err.println("Exception when calling BodyApi#testBinaryGif"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -105,6 +104,8 @@ All URIs are relative to *http://localhost:3000* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- +*BodyApi* | [**testBinaryGif**](docs/BodyApi.md#testBinaryGif) | **POST** /binary/gif | Test binary (gif) response body +*BodyApi* | [**testBinaryGifWithHttpInfo**](docs/BodyApi.md#testBinaryGifWithHttpInfo) | **POST** /binary/gif | Test binary (gif) response body *BodyApi* | [**testEchoBodyPet**](docs/BodyApi.md#testEchoBodyPet) | **POST** /echo/body/Pet | Test body parameter(s) *BodyApi* | [**testEchoBodyPetWithHttpInfo**](docs/BodyApi.md#testEchoBodyPetWithHttpInfo) | **POST** /echo/body/Pet | Test body parameter(s) *BodyApi* | [**testEchoBodyPetResponseString**](docs/BodyApi.md#testEchoBodyPetResponseString) | **POST** /echo/body/Pet/response_string | Test empty response body diff --git a/samples/client/echo_api/java/native/api/openapi.yaml b/samples/client/echo_api/java/native/api/openapi.yaml index 776a22706c7..3c38cd48549 100644 --- a/samples/client/echo_api/java/native/api/openapi.yaml +++ b/samples/client/echo_api/java/native/api/openapi.yaml @@ -326,6 +326,22 @@ paths: - body x-content-type: application/json x-accepts: text/plain + /binary/gif: + post: + description: Test binary (gif) response body + operationId: test/binary/gif + responses: + "200": + content: + image/gif: + schema: + format: binary + type: string + description: Successful operation + summary: Test binary (gif) response body + tags: + - body + x-accepts: image/gif components: requestBodies: Pet: diff --git a/samples/client/echo_api/java/native/docs/BodyApi.md b/samples/client/echo_api/java/native/docs/BodyApi.md index b8cf9a99059..5df7d7346f0 100644 --- a/samples/client/echo_api/java/native/docs/BodyApi.md +++ b/samples/client/echo_api/java/native/docs/BodyApi.md @@ -4,6 +4,8 @@ All URIs are relative to *http://localhost:3000* | Method | HTTP request | Description | |------------- | ------------- | -------------| +| [**testBinaryGif**](BodyApi.md#testBinaryGif) | **POST** /binary/gif | Test binary (gif) response body | +| [**testBinaryGifWithHttpInfo**](BodyApi.md#testBinaryGifWithHttpInfo) | **POST** /binary/gif | Test binary (gif) response body | | [**testEchoBodyPet**](BodyApi.md#testEchoBodyPet) | **POST** /echo/body/Pet | Test body parameter(s) | | [**testEchoBodyPetWithHttpInfo**](BodyApi.md#testEchoBodyPetWithHttpInfo) | **POST** /echo/body/Pet | Test body parameter(s) | | [**testEchoBodyPetResponseString**](BodyApi.md#testEchoBodyPetResponseString) | **POST** /echo/body/Pet/response_string | Test empty response body | @@ -11,6 +13,132 @@ All URIs are relative to *http://localhost:3000* +## testBinaryGif + +> File testBinaryGif() + +Test binary (gif) response body + +Test binary (gif) response body + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.BodyApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost:3000"); + + BodyApi apiInstance = new BodyApi(defaultClient); + try { + File result = apiInstance.testBinaryGif(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling BodyApi#testBinaryGif"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +This endpoint does not need any parameter. + +### Return type + +[**File**](File.md) + + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: image/gif + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Successful operation | - | + +## testBinaryGifWithHttpInfo + +> ApiResponse testBinaryGif testBinaryGifWithHttpInfo() + +Test binary (gif) response body + +Test binary (gif) response body + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.BodyApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost:3000"); + + BodyApi apiInstance = new BodyApi(defaultClient); + try { + ApiResponse response = apiInstance.testBinaryGifWithHttpInfo(); + System.out.println("Status code: " + response.getStatusCode()); + System.out.println("Response headers: " + response.getHeaders()); + System.out.println("Response body: " + response.getData()); + } catch (ApiException e) { + System.err.println("Exception when calling BodyApi#testBinaryGif"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Response headers: " + e.getResponseHeaders()); + System.err.println("Reason: " + e.getResponseBody()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +This endpoint does not need any parameter. + +### Return type + +ApiResponse<[**File**](File.md)> + + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: image/gif + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Successful operation | - | + + ## testEchoBodyPet > Pet testEchoBodyPet(pet) diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java index 1c6538a454e..0b3e56358ab 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java @@ -17,6 +17,7 @@ import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; import org.openapitools.client.Pair; +import java.io.File; import org.openapitools.client.model.Pet; import com.fasterxml.jackson.core.type.TypeReference; @@ -81,6 +82,71 @@ public class BodyApi { return operationId + " call failed with: " + statusCode + " - " + body; } + /** + * Test binary (gif) response body + * Test binary (gif) response body + * @return File + * @throws ApiException if fails to make API call + */ + public File testBinaryGif() throws ApiException { + ApiResponse localVarResponse = testBinaryGifWithHttpInfo(); + return localVarResponse.getData(); + } + + /** + * Test binary (gif) response body + * Test binary (gif) response body + * @return ApiResponse<File> + * @throws ApiException if fails to make API call + */ + public ApiResponse testBinaryGifWithHttpInfo() throws ApiException { + HttpRequest.Builder localVarRequestBuilder = testBinaryGifRequestBuilder(); + try { + HttpResponse localVarResponse = memberVarHttpClient.send( + localVarRequestBuilder.build(), + HttpResponse.BodyHandlers.ofInputStream()); + if (memberVarResponseInterceptor != null) { + memberVarResponseInterceptor.accept(localVarResponse); + } + try { + if (localVarResponse.statusCode()/ 100 != 2) { + throw getApiException("testBinaryGif", localVarResponse); + } + return new ApiResponse( + localVarResponse.statusCode(), + localVarResponse.headers().map(), + localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + ); + } finally { + } + } catch (IOException e) { + throw new ApiException(e); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new ApiException(e); + } + } + + private HttpRequest.Builder testBinaryGifRequestBuilder() throws ApiException { + + HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder(); + + String localVarPath = "/binary/gif"; + + localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); + + localVarRequestBuilder.header("Accept", "image/gif"); + + localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody()); + if (memberVarReadTimeout != null) { + localVarRequestBuilder.timeout(memberVarReadTimeout); + } + if (memberVarInterceptor != null) { + memberVarInterceptor.accept(localVarRequestBuilder); + } + return localVarRequestBuilder; + } /** * Test body parameter(s) * Test body parameter(s) diff --git a/samples/client/echo_api/java/okhttp-gson/README.md b/samples/client/echo_api/java/okhttp-gson/README.md index a830f5579c8..20765f701d1 100644 --- a/samples/client/echo_api/java/okhttp-gson/README.md +++ b/samples/client/echo_api/java/okhttp-gson/README.md @@ -91,12 +91,11 @@ public class Example { defaultClient.setBasePath("http://localhost:3000"); BodyApi apiInstance = new BodyApi(defaultClient); - Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store try { - Pet result = apiInstance.testEchoBodyPet(pet); + File result = apiInstance.testBinaryGif(); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling BodyApi#testEchoBodyPet"); + System.err.println("Exception when calling BodyApi#testBinaryGif"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -113,6 +112,7 @@ All URIs are relative to *http://localhost:3000* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- +*BodyApi* | [**testBinaryGif**](docs/BodyApi.md#testBinaryGif) | **POST** /binary/gif | Test binary (gif) response body *BodyApi* | [**testEchoBodyPet**](docs/BodyApi.md#testEchoBodyPet) | **POST** /echo/body/Pet | Test body parameter(s) *BodyApi* | [**testEchoBodyPetResponseString**](docs/BodyApi.md#testEchoBodyPetResponseString) | **POST** /echo/body/Pet/response_string | Test empty response body *FormApi* | [**testFormIntegerBooleanString**](docs/FormApi.md#testFormIntegerBooleanString) | **POST** /form/integer/boolean/string | Test form parameter(s) diff --git a/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml b/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml index 776a22706c7..3c38cd48549 100644 --- a/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml @@ -326,6 +326,22 @@ paths: - body x-content-type: application/json x-accepts: text/plain + /binary/gif: + post: + description: Test binary (gif) response body + operationId: test/binary/gif + responses: + "200": + content: + image/gif: + schema: + format: binary + type: string + description: Successful operation + summary: Test binary (gif) response body + tags: + - body + x-accepts: image/gif components: requestBodies: Pet: diff --git a/samples/client/echo_api/java/okhttp-gson/docs/BodyApi.md b/samples/client/echo_api/java/okhttp-gson/docs/BodyApi.md index e1892e21946..3211dfe5b52 100644 --- a/samples/client/echo_api/java/okhttp-gson/docs/BodyApi.md +++ b/samples/client/echo_api/java/okhttp-gson/docs/BodyApi.md @@ -4,10 +4,69 @@ All URIs are relative to *http://localhost:3000* | Method | HTTP request | Description | |------------- | ------------- | -------------| +| [**testBinaryGif**](BodyApi.md#testBinaryGif) | **POST** /binary/gif | Test binary (gif) response body | | [**testEchoBodyPet**](BodyApi.md#testEchoBodyPet) | **POST** /echo/body/Pet | Test body parameter(s) | | [**testEchoBodyPetResponseString**](BodyApi.md#testEchoBodyPetResponseString) | **POST** /echo/body/Pet/response_string | Test empty response body | + +# **testBinaryGif** +> File testBinaryGif() + +Test binary (gif) response body + +Test binary (gif) response body + +### Example +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.BodyApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost:3000"); + + BodyApi apiInstance = new BodyApi(defaultClient); + try { + File result = apiInstance.testBinaryGif(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling BodyApi#testBinaryGif"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters +This endpoint does not need any parameter. + +### Return type + +[**File**](File.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: image/gif + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Successful operation | - | + # **testEchoBodyPet** > Pet testEchoBodyPet(pet) diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/api/BodyApi.java index 6717ac2686f..fcd4f4fca3d 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/api/BodyApi.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/api/BodyApi.java @@ -27,6 +27,7 @@ import com.google.gson.reflect.TypeToken; import java.io.IOException; +import java.io.File; import org.openapitools.client.model.Pet; import java.lang.reflect.Type; @@ -73,6 +74,119 @@ public class BodyApi { this.localCustomBaseUrl = customBaseUrl; } + /** + * Build call for testBinaryGif + * @param _callback Callback for upload/download progress + * @return Call to execute + * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
          Status Code Description Response Headers
          200 Successful operation -
          + */ + public okhttp3.Call testBinaryGifCall(final ApiCallback _callback) throws ApiException { + String basePath = null; + // Operation Servers + String[] localBasePaths = new String[] { }; + + // Determine Base Path to Use + if (localCustomBaseUrl != null){ + basePath = localCustomBaseUrl; + } else if ( localBasePaths.length > 0 ) { + basePath = localBasePaths[localHostIndex]; + } else { + basePath = null; + } + + Object localVarPostBody = null; + + // create path and map variables + String localVarPath = "/binary/gif"; + + List localVarQueryParams = new ArrayList(); + List localVarCollectionQueryParams = new ArrayList(); + Map localVarHeaderParams = new HashMap(); + Map localVarCookieParams = new HashMap(); + Map localVarFormParams = new HashMap(); + + final String[] localVarAccepts = { + "image/gif" + }; + final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); + if (localVarAccept != null) { + localVarHeaderParams.put("Accept", localVarAccept); + } + + final String[] localVarContentTypes = { + }; + final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes); + if (localVarContentType != null) { + localVarHeaderParams.put("Content-Type", localVarContentType); + } + + String[] localVarAuthNames = new String[] { }; + return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback); + } + + @SuppressWarnings("rawtypes") + private okhttp3.Call testBinaryGifValidateBeforeCall(final ApiCallback _callback) throws ApiException { + return testBinaryGifCall(_callback); + + } + + /** + * Test binary (gif) response body + * Test binary (gif) response body + * @return File + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
          Status Code Description Response Headers
          200 Successful operation -
          + */ + public File testBinaryGif() throws ApiException { + ApiResponse localVarResp = testBinaryGifWithHttpInfo(); + return localVarResp.getData(); + } + + /** + * Test binary (gif) response body + * Test binary (gif) response body + * @return ApiResponse<File> + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
          Status Code Description Response Headers
          200 Successful operation -
          + */ + public ApiResponse testBinaryGifWithHttpInfo() throws ApiException { + okhttp3.Call localVarCall = testBinaryGifValidateBeforeCall(null); + Type localVarReturnType = new TypeToken(){}.getType(); + return localVarApiClient.execute(localVarCall, localVarReturnType); + } + + /** + * Test binary (gif) response body (asynchronously) + * Test binary (gif) response body + * @param _callback The callback to be executed when the API call finishes + * @return The request call + * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
          Status Code Description Response Headers
          200 Successful operation -
          + */ + public okhttp3.Call testBinaryGifAsync(final ApiCallback _callback) throws ApiException { + + okhttp3.Call localVarCall = testBinaryGifValidateBeforeCall(_callback); + Type localVarReturnType = new TypeToken(){}.getType(); + localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); + return localVarCall; + } /** * Build call for testEchoBodyPet * @param pet Pet object that needs to be added to the store (optional) diff --git a/samples/client/echo_api/python-nextgen/README.md b/samples/client/echo_api/python-nextgen/README.md index 0161a1364cd..1762a748c33 100644 --- a/samples/client/echo_api/python-nextgen/README.md +++ b/samples/client/echo_api/python-nextgen/README.md @@ -68,15 +68,14 @@ configuration = openapi_client.Configuration( with openapi_client.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = openapi_client.BodyApi(api_client) - pet = openapi_client.Pet() # Pet | Pet object that needs to be added to the store (optional) try: - # Test body parameter(s) - api_response = api_instance.test_echo_body_pet(pet=pet) - print("The response of BodyApi->test_echo_body_pet:\n") + # Test binary (gif) response body + api_response = api_instance.test_binary_gif() + print("The response of BodyApi->test_binary_gif:\n") pprint(api_response) except ApiException as e: - print("Exception when calling BodyApi->test_echo_body_pet: %s\n" % e) + print("Exception when calling BodyApi->test_binary_gif: %s\n" % e) ``` @@ -86,6 +85,7 @@ All URIs are relative to *http://localhost:3000* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- +*BodyApi* | [**test_binary_gif**](docs/BodyApi.md#test_binary_gif) | **POST** /binary/gif | Test binary (gif) response body *BodyApi* | [**test_echo_body_pet**](docs/BodyApi.md#test_echo_body_pet) | **POST** /echo/body/Pet | Test body parameter(s) *BodyApi* | [**test_echo_body_pet_response_string**](docs/BodyApi.md#test_echo_body_pet_response_string) | **POST** /echo/body/Pet/response_string | Test empty response body *FormApi* | [**test_form_integer_boolean_string**](docs/FormApi.md#test_form_integer_boolean_string) | **POST** /form/integer/boolean/string | Test form parameter(s) diff --git a/samples/client/echo_api/python-nextgen/docs/BodyApi.md b/samples/client/echo_api/python-nextgen/docs/BodyApi.md index 3ca11a7e656..cbe30800e20 100644 --- a/samples/client/echo_api/python-nextgen/docs/BodyApi.md +++ b/samples/client/echo_api/python-nextgen/docs/BodyApi.md @@ -4,10 +4,71 @@ All URIs are relative to *http://localhost:3000* Method | HTTP request | Description ------------- | ------------- | ------------- +[**test_binary_gif**](BodyApi.md#test_binary_gif) | **POST** /binary/gif | Test binary (gif) response body [**test_echo_body_pet**](BodyApi.md#test_echo_body_pet) | **POST** /echo/body/Pet | Test body parameter(s) [**test_echo_body_pet_response_string**](BodyApi.md#test_echo_body_pet_response_string) | **POST** /echo/body/Pet/response_string | Test empty response body +# **test_binary_gif** +> bytearray test_binary_gif() + +Test binary (gif) response body + +Test binary (gif) response body + +### Example + +```python +from __future__ import print_function +import time +import os +import openapi_client +from openapi_client.rest import ApiException +from pprint import pprint +# Defining the host is optional and defaults to http://localhost:3000 +# See configuration.py for a list of all supported configuration parameters. +configuration = openapi_client.Configuration( + host = "http://localhost:3000" +) + + +# Enter a context with an instance of the API client +with openapi_client.ApiClient(configuration) as api_client: + # Create an instance of the API class + api_instance = openapi_client.BodyApi(api_client) + + try: + # Test binary (gif) response body + api_response = api_instance.test_binary_gif() + print("The response of BodyApi->test_binary_gif:\n") + pprint(api_response) + except Exception as e: + print("Exception when calling BodyApi->test_binary_gif: %s\n" % e) +``` + +### Parameters +This endpoint does not need any parameter. + +### Return type + +[**bytearray**](bytearray.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: image/gif + +### 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) + # **test_echo_body_pet** > Pet test_echo_body_pet(pet=pet) diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py b/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py index ec77997499c..facd438c83e 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api/body_api.py @@ -43,6 +43,138 @@ class BodyApi(object): api_client = ApiClient.get_default() self.api_client = api_client + @validate_arguments + def test_binary_gif(self, **kwargs) -> bytearray: # noqa: E501 + """Test binary (gif) response body # noqa: E501 + + Test binary (gif) response body # noqa: E501 + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.test_binary_gif(async_req=True) + >>> result = thread.get() + + :param async_req: Whether to execute the request asynchronously. + :type async_req: bool, optional + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :type _preload_content: bool, optional + :param _request_timeout: 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. + :return: Returns the result object. + If the method is called asynchronously, + returns the request thread. + :rtype: bytearray + """ + kwargs['_return_http_data_only'] = True + return self.test_binary_gif_with_http_info(**kwargs) # noqa: E501 + + @validate_arguments + def test_binary_gif_with_http_info(self, **kwargs): # noqa: E501 + """Test binary (gif) response body # noqa: E501 + + Test binary (gif) response body # noqa: E501 + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.test_binary_gif_with_http_info(async_req=True) + >>> result = thread.get() + + :param async_req: Whether to execute the request asynchronously. + :type async_req: bool, optional + :param _return_http_data_only: response data without head status code + and headers + :type _return_http_data_only: bool, optional + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :type _preload_content: bool, optional + :param _request_timeout: 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. + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the authentication + in the spec for a single request. + :type _request_auth: dict, optional + :type _content_type: string, optional: force content-type for the request + :return: Returns the result object. + If the method is called asynchronously, + returns the request thread. + :rtype: tuple(bytearray, status_code(int), headers(HTTPHeaderDict)) + """ + + _params = locals() + + _all_params = [ + ] + _all_params.extend( + [ + 'async_req', + '_return_http_data_only', + '_preload_content', + '_request_timeout', + '_request_auth', + '_content_type', + '_headers' + ] + ) + + # validate the arguments + for _key, _val in _params['kwargs'].items(): + if _key not in _all_params: + raise ApiTypeError( + "Got an unexpected keyword argument '%s'" + " to method test_binary_gif" % _key + ) + _params[_key] = _val + del _params['kwargs'] + + _collection_formats = {} + + # process the path parameters + _path_params = {} + + # process the query parameters + _query_params = [] + # process the header parameters + _header_params = dict(_params.get('_headers', {})) + # process the form parameters + _form_params = [] + _files = {} + # process the body parameter + _body_params = None + # set the HTTP header `Accept` + _header_params['Accept'] = self.api_client.select_header_accept( + ['image/gif']) # noqa: E501 + + # authentication setting + _auth_settings = [] # noqa: E501 + + _response_types_map = { + '200': "bytearray", + } + + return self.api_client.call_api( + '/binary/gif', 'POST', + _path_params, + _query_params, + _header_params, + body=_body_params, + post_params=_form_params, + files=_files, + response_types_map=_response_types_map, + auth_settings=_auth_settings, + async_req=_params.get('async_req'), + _return_http_data_only=_params.get('_return_http_data_only'), # noqa: E501 + _preload_content=_params.get('_preload_content', True), + _request_timeout=_params.get('_request_timeout'), + collection_formats=_collection_formats, + _request_auth=_params.get('_request_auth')) + @validate_arguments def test_echo_body_pet(self, pet : Annotated[Optional[Pet], Field(description="Pet object that needs to be added to the store")] = None, **kwargs) -> Pet: # noqa: E501 """Test body parameter(s) # noqa: E501 diff --git a/samples/client/echo_api/python-nextgen/openapi_client/api_client.py b/samples/client/echo_api/python-nextgen/openapi_client/api_client.py index 3d6ec22afd6..e569b865ea9 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/api_client.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/api_client.py @@ -229,7 +229,9 @@ class ApiClient(object): response_type = response_types_map.get(str(response_data.status), None) - if response_type not in ["file", "bytes"]: + if response_type == "bytearray": + response_data.data = response_data.data + else: match = None content_type = response_data.getheader('content-type') if content_type is not None: @@ -238,8 +240,9 @@ class ApiClient(object): response_data.data = response_data.data.decode(encoding) # deserialize response data - - if response_type: + if response_type == "bytearray": + return_data = response_data.data + elif response_type: return_data = self.deserialize(response_data, response_type) else: return_data = None diff --git a/samples/client/echo_api/python-nextgen/test/test_manual.py b/samples/client/echo_api/python-nextgen/test/test_manual.py index e36d55271ef..d89e6145304 100644 --- a/samples/client/echo_api/python-nextgen/test/test_manual.py +++ b/samples/client/echo_api/python-nextgen/test/test_manual.py @@ -14,6 +14,7 @@ from __future__ import absolute_import import unittest import datetime +import base64 import openapi_client from openapi_client.api.query_api import QueryApi # noqa: E501 @@ -51,6 +52,13 @@ class TestManual(unittest.TestCase): e = EchoServerResponseParser(api_response) self.assertEqual(e.path, "/query/datetime/date/string?datetime_query=2013-10-20T19%3A20%3A30.000000-0500&date_query=2013-10-20&string_query=string_query_example") + def testBinaryGif(self): + api_instance = openapi_client.BodyApi() + + # Test binary response + api_response = api_instance.test_binary_gif() + self.assertEqual((base64.b64encode(api_response)).decode("utf-8"), "R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==") + class EchoServerResponseParser(): def __init__(self, http_response): if http_response is None: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md index e8970e82d3c..aba30bd3e1e 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md @@ -612,7 +612,7 @@ configuration = petstore_api.Configuration( async with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) - body = 'body_example' # str | image to upload + body = petstore_api.bytearray() # bytearray | image to upload try: await api_instance.test_body_with_binary(body) @@ -624,7 +624,7 @@ async with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | **str**| image to upload | + **body** | **bytearray**| image to upload | ### Return type @@ -934,13 +934,13 @@ async with petstore_api.ApiClient(configuration) as api_client: number = 3.4 # float | None double = 3.4 # float | None pattern_without_delimiter = 'pattern_without_delimiter_example' # str | None - byte = 'byte_example' # str | None + byte = petstore_api.bytearray() # bytearray | None integer = 56 # int | None (optional) int32 = 56 # int | None (optional) int64 = 56 # int | None (optional) float = 3.4 # float | None (optional) string = 'string_example' # str | None (optional) - binary = 'binary_example' # str | None (optional) + binary = petstore_api.bytearray() # bytearray | None (optional) var_date = '2013-10-20' # date | None (optional) date_time = '2013-10-20T19:20:30+01:00' # datetime | None (optional) password = 'password_example' # str | None (optional) @@ -960,13 +960,13 @@ Name | Type | Description | Notes **number** | **float**| None | **double** | **float**| None | **pattern_without_delimiter** | **str**| None | - **byte** | **str**| None | + **byte** | **bytearray**| None | **integer** | **int**| None | [optional] **int32** | **int**| None | [optional] **int64** | **int**| None | [optional] **float** | **float**| None | [optional] **string** | **str**| None | [optional] - **binary** | **str**| None | [optional] + **binary** | **bytearray**| None | [optional] **var_date** | **date**| None | [optional] **date_time** | **datetime**| None | [optional] **password** | **str**| None | [optional] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md index d88718eaad1..9ab2ba76245 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md @@ -13,8 +13,8 @@ Name | Type | Description | Notes **decimal** | **decimal.Decimal** | | [optional] **string** | **str** | | [optional] **string_with_double_quote_pattern** | **str** | | [optional] -**byte** | **str** | | [optional] -**binary** | **str** | | [optional] +**byte** | [**bytearray**](bytearray.md) | | [optional] +**binary** | [**bytearray**](bytearray.md) | | [optional] **var_date** | **date** | | **date_time** | **datetime** | | [optional] **uuid** | **str** | | [optional] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/PetApi.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/PetApi.md index efeab229b1b..ffd45c7f4f9 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/PetApi.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/PetApi.md @@ -1176,7 +1176,7 @@ async with petstore_api.ApiClient(configuration) as api_client: api_instance = petstore_api.PetApi(api_client) pet_id = 56 # int | ID of pet to update additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional) - file = 'file_example' # str | file to upload (optional) + file = petstore_api.bytearray() # bytearray | file to upload (optional) try: # uploads an image @@ -1193,7 +1193,7 @@ Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **pet_id** | **int**| ID of pet to update | **additional_metadata** | **str**| Additional data to pass to server | [optional] - **file** | **str**| file to upload | [optional] + **file** | **bytearray**| file to upload | [optional] ### Return type @@ -1250,7 +1250,7 @@ async with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.PetApi(api_client) pet_id = 56 # int | ID of pet to update - required_file = 'required_file_example' # str | file to upload + required_file = petstore_api.bytearray() # bytearray | file to upload additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional) try: @@ -1267,7 +1267,7 @@ async with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **pet_id** | **int**| ID of pet to update | - **required_file** | **str**| file to upload | + **required_file** | **bytearray**| file to upload | **additional_metadata** | **str**| Additional data to pass to server | [optional] ### Return type diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py index 3afc7a2cc30..aa5c5a4118c 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py @@ -1310,7 +1310,7 @@ class FakeApi(object): >>> result = thread.get() :param body: image to upload (required) - :type body: str + :type body: bytearray :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _preload_content: if False, the urllib3.HTTPResponse object will @@ -1343,7 +1343,7 @@ class FakeApi(object): >>> result = thread.get() :param body: image to upload (required) - :type body: str + :type body: bytearray :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _return_http_data_only: response data without head status code @@ -2085,7 +2085,7 @@ class FakeApi(object): :param pattern_without_delimiter: None (required) :type pattern_without_delimiter: str :param byte: None (required) - :type byte: str + :type byte: bytearray :param integer: None :type integer: int :param int32: None @@ -2097,7 +2097,7 @@ class FakeApi(object): :param string: None :type string: str :param binary: None - :type binary: str + :type binary: bytearray :param var_date: None :type var_date: date :param date_time: None @@ -2144,7 +2144,7 @@ class FakeApi(object): :param pattern_without_delimiter: None (required) :type pattern_without_delimiter: str :param byte: None (required) - :type byte: str + :type byte: bytearray :param integer: None :type integer: int :param int32: None @@ -2156,7 +2156,7 @@ class FakeApi(object): :param string: None :type string: str :param binary: None - :type binary: str + :type binary: bytearray :param var_date: None :type var_date: date :param date_time: None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py index 202512fcff2..afc8cc96162 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/pet_api.py @@ -1145,7 +1145,7 @@ class PetApi(object): :param additional_metadata: Additional data to pass to server :type additional_metadata: str :param file: file to upload - :type file: str + :type file: bytearray :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _preload_content: if False, the urllib3.HTTPResponse object will @@ -1182,7 +1182,7 @@ class PetApi(object): :param additional_metadata: Additional data to pass to server :type additional_metadata: str :param file: file to upload - :type file: str + :type file: bytearray :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _return_http_data_only: response data without head status code @@ -1316,7 +1316,7 @@ class PetApi(object): :param pet_id: ID of pet to update (required) :type pet_id: int :param required_file: file to upload (required) - :type required_file: str + :type required_file: bytearray :param additional_metadata: Additional data to pass to server :type additional_metadata: str :param async_req: Whether to execute the request asynchronously. @@ -1353,7 +1353,7 @@ class PetApi(object): :param pet_id: ID of pet to update (required) :type pet_id: int :param required_file: file to upload (required) - :type required_file: str + :type required_file: bytearray :param additional_metadata: Additional data to pass to server :type additional_metadata: str :param async_req: Whether to execute the request asynchronously. diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py index ccb2e99402e..c75ef6f2ad3 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api_client.py @@ -229,7 +229,9 @@ class ApiClient(object): response_type = response_types_map.get(str(response_data.status), None) - if response_type not in ["file", "bytes"]: + if response_type == "bytearray": + response_data.data = response_data.data + else: match = None content_type = response_data.getheader('content-type') if content_type is not None: @@ -238,8 +240,9 @@ class ApiClient(object): response_data.data = response_data.data.decode(encoding) # deserialize response data - - if response_type: + if response_type == "bytearray": + return_data = response_data.data + elif response_type: return_data = self.deserialize(response_data, response_type) else: return_data = None diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py index 811d3a4ee27..c8b1eb5e694 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py @@ -92,6 +92,12 @@ class FormatTest(BaseModel): exclude={ }, exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of byte + if self.byte: + _dict['byte'] = self.byte.to_dict() + # override the default output from pydantic by calling `to_dict()` of binary + if self.binary: + _dict['binary'] = self.binary.to_dict() return _dict @classmethod @@ -113,8 +119,8 @@ class FormatTest(BaseModel): "decimal": obj.get("decimal"), "string": obj.get("string"), "string_with_double_quote_pattern": obj.get("string_with_double_quote_pattern"), - "byte": obj.get("byte"), - "binary": obj.get("binary"), + "byte": bytearray.from_dict(obj.get("byte")) if obj.get("byte") is not None else None, + "binary": bytearray.from_dict(obj.get("binary")) if obj.get("binary") is not None else None, "var_date": obj.get("date"), "date_time": obj.get("dateTime"), "uuid": obj.get("uuid"), diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md b/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md index 83ceaf660d5..34f265a1b56 100755 --- a/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md @@ -612,7 +612,7 @@ configuration = petstore_api.Configuration( with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) - body = 'body_example' # str | image to upload + body = petstore_api.bytearray() # bytearray | image to upload try: api_instance.test_body_with_binary(body) @@ -624,7 +624,7 @@ with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **body** | **str**| image to upload | + **body** | **bytearray**| image to upload | ### Return type @@ -934,13 +934,13 @@ with petstore_api.ApiClient(configuration) as api_client: number = 3.4 # float | None double = 3.4 # float | None pattern_without_delimiter = 'pattern_without_delimiter_example' # str | None - byte = 'byte_example' # str | None + byte = petstore_api.bytearray() # bytearray | None integer = 56 # int | None (optional) int32 = 56 # int | None (optional) int64 = 56 # int | None (optional) float = 3.4 # float | None (optional) string = 'string_example' # str | None (optional) - binary = 'binary_example' # str | None (optional) + binary = petstore_api.bytearray() # bytearray | None (optional) var_date = '2013-10-20' # date | None (optional) date_time = '2013-10-20T19:20:30+01:00' # datetime | None (optional) password = 'password_example' # str | None (optional) @@ -960,13 +960,13 @@ Name | Type | Description | Notes **number** | **float**| None | **double** | **float**| None | **pattern_without_delimiter** | **str**| None | - **byte** | **str**| None | + **byte** | **bytearray**| None | **integer** | **int**| None | [optional] **int32** | **int**| None | [optional] **int64** | **int**| None | [optional] **float** | **float**| None | [optional] **string** | **str**| None | [optional] - **binary** | **str**| None | [optional] + **binary** | **bytearray**| None | [optional] **var_date** | **date**| None | [optional] **date_time** | **datetime**| None | [optional] **password** | **str**| None | [optional] diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md b/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md index d88718eaad1..9ab2ba76245 100755 --- a/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md +++ b/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md @@ -13,8 +13,8 @@ Name | Type | Description | Notes **decimal** | **decimal.Decimal** | | [optional] **string** | **str** | | [optional] **string_with_double_quote_pattern** | **str** | | [optional] -**byte** | **str** | | [optional] -**binary** | **str** | | [optional] +**byte** | [**bytearray**](bytearray.md) | | [optional] +**binary** | [**bytearray**](bytearray.md) | | [optional] **var_date** | **date** | | **date_time** | **datetime** | | [optional] **uuid** | **str** | | [optional] diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/PetApi.md b/samples/openapi3/client/petstore/python-nextgen/docs/PetApi.md index 5b395675ee6..1a33b030317 100755 --- a/samples/openapi3/client/petstore/python-nextgen/docs/PetApi.md +++ b/samples/openapi3/client/petstore/python-nextgen/docs/PetApi.md @@ -1176,7 +1176,7 @@ with petstore_api.ApiClient(configuration) as api_client: api_instance = petstore_api.PetApi(api_client) pet_id = 56 # int | ID of pet to update additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional) - file = 'file_example' # str | file to upload (optional) + file = petstore_api.bytearray() # bytearray | file to upload (optional) try: # uploads an image @@ -1193,7 +1193,7 @@ Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **pet_id** | **int**| ID of pet to update | **additional_metadata** | **str**| Additional data to pass to server | [optional] - **file** | **str**| file to upload | [optional] + **file** | **bytearray**| file to upload | [optional] ### Return type @@ -1250,7 +1250,7 @@ with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.PetApi(api_client) pet_id = 56 # int | ID of pet to update - required_file = 'required_file_example' # str | file to upload + required_file = petstore_api.bytearray() # bytearray | file to upload additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional) try: @@ -1267,7 +1267,7 @@ with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **pet_id** | **int**| ID of pet to update | - **required_file** | **str**| file to upload | + **required_file** | **bytearray**| file to upload | **additional_metadata** | **str**| Additional data to pass to server | [optional] ### Return type diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py index 29b19f4fd6f..19abb688c13 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py @@ -1221,7 +1221,7 @@ class FakeApi(object): >>> result = thread.get() :param body: image to upload (required) - :type body: str + :type body: bytearray :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _preload_content: if False, the urllib3.HTTPResponse object will @@ -1252,7 +1252,7 @@ class FakeApi(object): >>> result = thread.get() :param body: image to upload (required) - :type body: str + :type body: bytearray :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _return_http_data_only: response data without head status code @@ -1946,7 +1946,7 @@ class FakeApi(object): :param pattern_without_delimiter: None (required) :type pattern_without_delimiter: str :param byte: None (required) - :type byte: str + :type byte: bytearray :param integer: None :type integer: int :param int32: None @@ -1958,7 +1958,7 @@ class FakeApi(object): :param string: None :type string: str :param binary: None - :type binary: str + :type binary: bytearray :param var_date: None :type var_date: date :param date_time: None @@ -2003,7 +2003,7 @@ class FakeApi(object): :param pattern_without_delimiter: None (required) :type pattern_without_delimiter: str :param byte: None (required) - :type byte: str + :type byte: bytearray :param integer: None :type integer: int :param int32: None @@ -2015,7 +2015,7 @@ class FakeApi(object): :param string: None :type string: str :param binary: None - :type binary: str + :type binary: bytearray :param var_date: None :type var_date: date :param date_time: None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py index bff41ea66ae..e375a7c5559 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/pet_api.py @@ -1066,7 +1066,7 @@ class PetApi(object): :param additional_metadata: Additional data to pass to server :type additional_metadata: str :param file: file to upload - :type file: str + :type file: bytearray :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _preload_content: if False, the urllib3.HTTPResponse object will @@ -1101,7 +1101,7 @@ class PetApi(object): :param additional_metadata: Additional data to pass to server :type additional_metadata: str :param file: file to upload - :type file: str + :type file: bytearray :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _return_http_data_only: response data without head status code @@ -1227,7 +1227,7 @@ class PetApi(object): :param pet_id: ID of pet to update (required) :type pet_id: int :param required_file: file to upload (required) - :type required_file: str + :type required_file: bytearray :param additional_metadata: Additional data to pass to server :type additional_metadata: str :param async_req: Whether to execute the request asynchronously. @@ -1262,7 +1262,7 @@ class PetApi(object): :param pet_id: ID of pet to update (required) :type pet_id: int :param required_file: file to upload (required) - :type required_file: str + :type required_file: bytearray :param additional_metadata: Additional data to pass to server :type additional_metadata: str :param async_req: Whether to execute the request asynchronously. diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py index f29e49a998b..96347377863 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api_client.py @@ -228,7 +228,9 @@ class ApiClient(object): response_type = response_types_map.get(str(response_data.status), None) - if response_type not in ["file", "bytes"]: + if response_type == "bytearray": + response_data.data = response_data.data + else: match = None content_type = response_data.getheader('content-type') if content_type is not None: @@ -237,8 +239,9 @@ class ApiClient(object): response_data.data = response_data.data.decode(encoding) # deserialize response data - - if response_type: + if response_type == "bytearray": + return_data = response_data.data + elif response_type: return_data = self.deserialize(response_data, response_type) else: return_data = None diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py index 89f85aa14cd..4fe80d0e6aa 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py @@ -94,6 +94,12 @@ class FormatTest(BaseModel): "additional_properties" }, exclude_none=True) + # override the default output from pydantic by calling `to_dict()` of byte + if self.byte: + _dict['byte'] = self.byte.to_dict() + # override the default output from pydantic by calling `to_dict()` of binary + if self.binary: + _dict['binary'] = self.binary.to_dict() # puts key-value pairs in additional_properties in the top level if self.additional_properties is not None: for _key, _value in self.additional_properties.items(): @@ -120,8 +126,8 @@ class FormatTest(BaseModel): "decimal": obj.get("decimal"), "string": obj.get("string"), "string_with_double_quote_pattern": obj.get("string_with_double_quote_pattern"), - "byte": obj.get("byte"), - "binary": obj.get("binary"), + "byte": bytearray.from_dict(obj.get("byte")) if obj.get("byte") is not None else None, + "binary": bytearray.from_dict(obj.get("binary")) if obj.get("binary") is not None else None, "var_date": obj.get("date"), "date_time": obj.get("dateTime"), "uuid": obj.get("uuid"), From 1710615fd81cce9938aa60d488899b48cc14799a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 31 Mar 2023 22:40:23 +0800 Subject: [PATCH 098/131] fix python nextgen github workflow (#15092) --- .../main/resources/python-nextgen/github-workflow.mustache | 6 +++--- .../echo_api/python-nextgen/.github/workflows/python.yml | 6 +++--- .../python-nextgen-aiohttp/.github/workflows/python.yml | 6 +++--- .../petstore/python-nextgen/.github/workflows/python.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/github-workflow.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/github-workflow.mustache index 2698fdd76e5..d7e9a2017de 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/github-workflow.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/github-workflow.mustache @@ -16,12 +16,12 @@ jobs: matrix: python-version: ["3.7", "3.8", "3.9", "3.10"] - steps:s + steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }}s + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip @@ -35,4 +35,4 @@ jobs: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Test with pytest run: | - pytest \ No newline at end of file + pytest diff --git a/samples/client/echo_api/python-nextgen/.github/workflows/python.yml b/samples/client/echo_api/python-nextgen/.github/workflows/python.yml index 75e792da558..9c031b37f5a 100644 --- a/samples/client/echo_api/python-nextgen/.github/workflows/python.yml +++ b/samples/client/echo_api/python-nextgen/.github/workflows/python.yml @@ -15,12 +15,12 @@ jobs: matrix: python-version: ["3.7", "3.8", "3.9", "3.10"] - steps:s + steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }}s + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip @@ -34,4 +34,4 @@ jobs: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Test with pytest run: | - pytest \ No newline at end of file + pytest diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.github/workflows/python.yml b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.github/workflows/python.yml index 28a13b8f38e..3cef12d7476 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.github/workflows/python.yml +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.github/workflows/python.yml @@ -15,12 +15,12 @@ jobs: matrix: python-version: ["3.7", "3.8", "3.9", "3.10"] - steps:s + steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }}s + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip @@ -34,4 +34,4 @@ jobs: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Test with pytest run: | - pytest \ No newline at end of file + pytest diff --git a/samples/openapi3/client/petstore/python-nextgen/.github/workflows/python.yml b/samples/openapi3/client/petstore/python-nextgen/.github/workflows/python.yml index 28a13b8f38e..3cef12d7476 100644 --- a/samples/openapi3/client/petstore/python-nextgen/.github/workflows/python.yml +++ b/samples/openapi3/client/petstore/python-nextgen/.github/workflows/python.yml @@ -15,12 +15,12 @@ jobs: matrix: python-version: ["3.7", "3.8", "3.9", "3.10"] - steps:s + steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }}s + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip @@ -34,4 +34,4 @@ jobs: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Test with pytest run: | - pytest \ No newline at end of file + pytest From 0dc84520e79ee84f0b5bcf70168cf7e19ba8e9ee Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 1 Apr 2023 10:23:38 +0800 Subject: [PATCH 099/131] [python-nextgen] use __fields_set__ to determine if the field is needed in to_dict (#15086) * use __fields_set__ to determine if the field is needed * fix tests --- .../python-nextgen/model_generic.mustache | 3 +- .../openapi_client/models/default_value.py | 9 +++-- .../petstore_api/models/enum_test.py | 3 +- .../models/health_check_result.py | 3 +- .../petstore_api/models/nullable_class.py | 33 ++++++++++++------- .../models/outer_object_with_enum_property.py | 3 +- .../tests/test_model.py | 2 +- .../petstore_api/models/enum_test.py | 3 +- .../models/health_check_result.py | 3 +- .../petstore_api/models/nullable_class.py | 33 ++++++++++++------- .../models/outer_object_with_enum_property.py | 3 +- .../python-nextgen/tests/test_model.py | 9 ++++- 12 files changed, 73 insertions(+), 34 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache index 6715306d13b..71661abb123 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/model_generic.mustache @@ -162,7 +162,8 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}} {{#allVars}} {{#isNullable}} # set to None if {{{name}}} (nullable) is None - if self.{{name}} is None: + # and __fields_set__ contains the field + if self.{{name}} is None and "{{{name}}}" in self.__fields_set__: _dict['{{{baseName}}}'] = None {{/isNullable}} diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py b/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py index b4a7d1160c8..0d54cfc46c2 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/default_value.py @@ -71,15 +71,18 @@ class DefaultValue(BaseModel): }, exclude_none=True) # set to None if array_string_nullable (nullable) is None - if self.array_string_nullable is None: + # and __fields_set__ contains the field + if self.array_string_nullable is None and "array_string_nullable" in self.__fields_set__: _dict['array_string_nullable'] = None # set to None if array_string_extension_nullable (nullable) is None - if self.array_string_extension_nullable is None: + # and __fields_set__ contains the field + if self.array_string_extension_nullable is None and "array_string_extension_nullable" in self.__fields_set__: _dict['array_string_extension_nullable'] = None # set to None if string_nullable (nullable) is None - if self.string_nullable is None: + # and __fields_set__ contains the field + if self.string_nullable is None and "string_nullable" in self.__fields_set__: _dict['string_nullable'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py index 5f097942ba5..fc634228f93 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py @@ -103,7 +103,8 @@ class EnumTest(BaseModel): }, exclude_none=True) # set to None if outer_enum (nullable) is None - if self.outer_enum is None: + # and __fields_set__ contains the field + if self.outer_enum is None and "outer_enum" in self.__fields_set__: _dict['outerEnum'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/health_check_result.py index 78ca4ed2852..8f674067ff8 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/health_check_result.py @@ -53,7 +53,8 @@ class HealthCheckResult(BaseModel): }, exclude_none=True) # set to None if nullable_message (nullable) is None - if self.nullable_message is None: + # and __fields_set__ contains the field + if self.nullable_message is None and "nullable_message" in self.__fields_set__: _dict['NullableMessage'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/nullable_class.py index dcc98c94545..32d313365d6 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/nullable_class.py @@ -65,47 +65,58 @@ class NullableClass(BaseModel): }, exclude_none=True) # set to None if required_integer_prop (nullable) is None - if self.required_integer_prop is None: + # and __fields_set__ contains the field + if self.required_integer_prop is None and "required_integer_prop" in self.__fields_set__: _dict['required_integer_prop'] = None # set to None if integer_prop (nullable) is None - if self.integer_prop is None: + # and __fields_set__ contains the field + if self.integer_prop is None and "integer_prop" in self.__fields_set__: _dict['integer_prop'] = None # set to None if number_prop (nullable) is None - if self.number_prop is None: + # and __fields_set__ contains the field + if self.number_prop is None and "number_prop" in self.__fields_set__: _dict['number_prop'] = None # set to None if boolean_prop (nullable) is None - if self.boolean_prop is None: + # and __fields_set__ contains the field + if self.boolean_prop is None and "boolean_prop" in self.__fields_set__: _dict['boolean_prop'] = None # set to None if string_prop (nullable) is None - if self.string_prop is None: + # and __fields_set__ contains the field + if self.string_prop is None and "string_prop" in self.__fields_set__: _dict['string_prop'] = None # set to None if date_prop (nullable) is None - if self.date_prop is None: + # and __fields_set__ contains the field + if self.date_prop is None and "date_prop" in self.__fields_set__: _dict['date_prop'] = None # set to None if datetime_prop (nullable) is None - if self.datetime_prop is None: + # and __fields_set__ contains the field + if self.datetime_prop is None and "datetime_prop" in self.__fields_set__: _dict['datetime_prop'] = None # set to None if array_nullable_prop (nullable) is None - if self.array_nullable_prop is None: + # and __fields_set__ contains the field + if self.array_nullable_prop is None and "array_nullable_prop" in self.__fields_set__: _dict['array_nullable_prop'] = None # set to None if array_and_items_nullable_prop (nullable) is None - if self.array_and_items_nullable_prop is None: + # and __fields_set__ contains the field + if self.array_and_items_nullable_prop is None and "array_and_items_nullable_prop" in self.__fields_set__: _dict['array_and_items_nullable_prop'] = None # set to None if object_nullable_prop (nullable) is None - if self.object_nullable_prop is None: + # and __fields_set__ contains the field + if self.object_nullable_prop is None and "object_nullable_prop" in self.__fields_set__: _dict['object_nullable_prop'] = None # set to None if object_and_items_nullable_prop (nullable) is None - if self.object_and_items_nullable_prop is None: + # and __fields_set__ contains the field + if self.object_and_items_nullable_prop is None and "object_and_items_nullable_prop" in self.__fields_set__: _dict['object_and_items_nullable_prop'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_object_with_enum_property.py index f41c127a780..db3e40fb412 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/outer_object_with_enum_property.py @@ -56,7 +56,8 @@ class OuterObjectWithEnumProperty(BaseModel): }, exclude_none=True) # set to None if str_value (nullable) is None - if self.str_value is None: + # and __fields_set__ contains the field + if self.str_value is None and "str_value" in self.__fields_set__: _dict['str_value'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py index e752abbe62e..c9dc0681baf 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py @@ -195,7 +195,7 @@ class ModelTests(unittest.TestCase): # test enum ref property # test to_json d = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1) - self.assertEqual(d.to_json(), '{"value": 1, "str_value": null}') + self.assertEqual(d.to_json(), '{"value": 1}') d2 = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1, str_value=petstore_api.OuterEnum.DELIVERED) self.assertEqual(d2.to_json(), '{"str_value": "delivered", "value": 1}') # test from_json (round trip) diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py index 560b95f7bb4..20db0d562a7 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/enum_test.py @@ -110,7 +110,8 @@ class EnumTest(BaseModel): _dict[_key] = _value # set to None if outer_enum (nullable) is None - if self.outer_enum is None: + # and __fields_set__ contains the field + if self.outer_enum is None and "outer_enum" in self.__fields_set__: _dict['outerEnum'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/health_check_result.py index df9fe934a8d..51dcd4cdccf 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/health_check_result.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/health_check_result.py @@ -60,7 +60,8 @@ class HealthCheckResult(BaseModel): _dict[_key] = _value # set to None if nullable_message (nullable) is None - if self.nullable_message is None: + # and __fields_set__ contains the field + if self.nullable_message is None and "nullable_message" in self.__fields_set__: _dict['NullableMessage'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/nullable_class.py index 5ead496e689..6c77bc263fa 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/nullable_class.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/nullable_class.py @@ -65,47 +65,58 @@ class NullableClass(BaseModel): }, exclude_none=True) # set to None if required_integer_prop (nullable) is None - if self.required_integer_prop is None: + # and __fields_set__ contains the field + if self.required_integer_prop is None and "required_integer_prop" in self.__fields_set__: _dict['required_integer_prop'] = None # set to None if integer_prop (nullable) is None - if self.integer_prop is None: + # and __fields_set__ contains the field + if self.integer_prop is None and "integer_prop" in self.__fields_set__: _dict['integer_prop'] = None # set to None if number_prop (nullable) is None - if self.number_prop is None: + # and __fields_set__ contains the field + if self.number_prop is None and "number_prop" in self.__fields_set__: _dict['number_prop'] = None # set to None if boolean_prop (nullable) is None - if self.boolean_prop is None: + # and __fields_set__ contains the field + if self.boolean_prop is None and "boolean_prop" in self.__fields_set__: _dict['boolean_prop'] = None # set to None if string_prop (nullable) is None - if self.string_prop is None: + # and __fields_set__ contains the field + if self.string_prop is None and "string_prop" in self.__fields_set__: _dict['string_prop'] = None # set to None if date_prop (nullable) is None - if self.date_prop is None: + # and __fields_set__ contains the field + if self.date_prop is None and "date_prop" in self.__fields_set__: _dict['date_prop'] = None # set to None if datetime_prop (nullable) is None - if self.datetime_prop is None: + # and __fields_set__ contains the field + if self.datetime_prop is None and "datetime_prop" in self.__fields_set__: _dict['datetime_prop'] = None # set to None if array_nullable_prop (nullable) is None - if self.array_nullable_prop is None: + # and __fields_set__ contains the field + if self.array_nullable_prop is None and "array_nullable_prop" in self.__fields_set__: _dict['array_nullable_prop'] = None # set to None if array_and_items_nullable_prop (nullable) is None - if self.array_and_items_nullable_prop is None: + # and __fields_set__ contains the field + if self.array_and_items_nullable_prop is None and "array_and_items_nullable_prop" in self.__fields_set__: _dict['array_and_items_nullable_prop'] = None # set to None if object_nullable_prop (nullable) is None - if self.object_nullable_prop is None: + # and __fields_set__ contains the field + if self.object_nullable_prop is None and "object_nullable_prop" in self.__fields_set__: _dict['object_nullable_prop'] = None # set to None if object_and_items_nullable_prop (nullable) is None - if self.object_and_items_nullable_prop is None: + # and __fields_set__ contains the field + if self.object_and_items_nullable_prop is None and "object_and_items_nullable_prop" in self.__fields_set__: _dict['object_and_items_nullable_prop'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_object_with_enum_property.py index 28a7bd69b9d..93e47d8b48b 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_object_with_enum_property.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/outer_object_with_enum_property.py @@ -63,7 +63,8 @@ class OuterObjectWithEnumProperty(BaseModel): _dict[_key] = _value # set to None if str_value (nullable) is None - if self.str_value is None: + # and __fields_set__ contains the field + if self.str_value is None and "str_value" in self.__fields_set__: _dict['str_value'] = None return _dict diff --git a/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py b/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py index 935c489dada..c32a36c7460 100644 --- a/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py +++ b/samples/openapi3/client/petstore/python-nextgen/tests/test_model.py @@ -289,7 +289,7 @@ class ModelTests(unittest.TestCase): # test enum ref property # test to_json d = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1) - self.assertEqual(d.to_json(), '{"value": 1, "str_value": null}') + self.assertEqual(d.to_json(), '{"value": 1}') d2 = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1, str_value=petstore_api.OuterEnum.DELIVERED) self.assertEqual(d2.to_json(), '{"str_value": "delivered", "value": 1}') # test from_json (round trip) @@ -297,6 +297,13 @@ class ModelTests(unittest.TestCase): self.assertEqual(d3.str_value, petstore_api.OuterEnum.DELIVERED) self.assertEqual(d3.value, petstore_api.OuterEnumInteger.NUMBER_1) self.assertEqual(d3.to_json(), '{"str_value": "delivered", "value": 1}') + d4 = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1, str_value=None) + self.assertEqual(d4.to_json(), '{"value": 1, "str_value": null}') + d5 = petstore_api.OuterObjectWithEnumProperty(value=petstore_api.OuterEnumInteger.NUMBER_1) + self.assertEqual(d5.__fields_set__, {'value'}) + d5.str_value = None # set None explicitly + self.assertEqual(d5.__fields_set__, {'value', 'str_value'}) + self.assertEqual(d5.to_json(), '{"value": 1, "str_value": null}') def test_valdiator(self): # test regular expression From c838b1d1f9b723ba3ddaaba1472bb6739efb5448 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Fri, 31 Mar 2023 22:36:10 -0400 Subject: [PATCH 100/131] made default strings use string literal (#15049) --- .../csharp-netcore/Configuration.mustache | 2 +- .../generichost/ModelSignature.mustache | 2 +- .../csharp-netcore/modelGeneric.mustache | 4 +- ...odels-for-testing-with-http-signature.yaml | 11 +- .../.openapi-generator/FILES | 2 + .../README.md | 1 + .../api/openapi.yaml | 9 + .../docs/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 77 ++++++++ .../src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../Model/LiteralStringClass.cs | 179 ++++++++++++++++++ .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../.openapi-generator/FILES | 2 + .../api/openapi.yaml | 9 + .../docs/models/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 76 ++++++++ .../Client/HostConfiguration.cs | 1 + .../src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../Model/LiteralStringClass.cs | 172 +++++++++++++++++ .../.openapi-generator/FILES | 2 + .../api/openapi.yaml | 9 + .../docs/models/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 76 ++++++++ .../Client/HostConfiguration.cs | 1 + .../src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../Model/LiteralStringClass.cs | 170 +++++++++++++++++ .../.openapi-generator/FILES | 2 + .../api/openapi.yaml | 9 + .../docs/models/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 76 ++++++++ .../Client/HostConfiguration.cs | 1 + .../src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../Model/LiteralStringClass.cs | 170 +++++++++++++++++ .../.openapi-generator/FILES | 2 + .../OpenAPIClient-httpclient/README.md | 1 + .../OpenAPIClient-httpclient/api/openapi.yaml | 9 + .../docs/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 77 ++++++++ .../src/Org.OpenAPITools/Model/Animal.cs | 4 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 4 +- .../Model/LiteralStringClass.cs | 148 +++++++++++++++ .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../.openapi-generator/FILES | 2 + .../OpenAPIClient-net47/README.md | 1 + .../OpenAPIClient-net47/api/openapi.yaml | 9 + .../docs/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 77 ++++++++ .../src/Org.OpenAPITools/Model/Animal.cs | 4 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 4 +- .../Model/LiteralStringClass.cs | 147 ++++++++++++++ .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../.openapi-generator/FILES | 2 + .../OpenAPIClient-net48/README.md | 1 + .../OpenAPIClient-net48/api/openapi.yaml | 9 + .../docs/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 77 ++++++++ .../src/Org.OpenAPITools/Model/Animal.cs | 4 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 4 +- .../Model/LiteralStringClass.cs | 147 ++++++++++++++ .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../.openapi-generator/FILES | 2 + .../OpenAPIClient-net5.0/README.md | 1 + .../OpenAPIClient-net5.0/api/openapi.yaml | 9 + .../docs/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 77 ++++++++ .../src/Org.OpenAPITools/Model/Animal.cs | 4 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 4 +- .../Model/LiteralStringClass.cs | 147 ++++++++++++++ .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../.openapi-generator/FILES | 2 + .../OpenAPIClient-unityWebRequest/README.md | 1 + .../api/openapi.yaml | 9 + .../docs/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 74 ++++++++ .../src/Org.OpenAPITools/Model/Animal.cs | 4 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 4 +- .../Model/LiteralStringClass.cs | 138 ++++++++++++++ .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../OpenAPIClient/.openapi-generator/FILES | 2 + .../csharp-netcore/OpenAPIClient/README.md | 1 + .../OpenAPIClient/api/openapi.yaml | 9 + .../OpenAPIClient/docs/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 77 ++++++++ .../src/Org.OpenAPITools/Model/Animal.cs | 4 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 4 +- .../Model/LiteralStringClass.cs | 147 ++++++++++++++ .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../.openapi-generator/FILES | 2 + .../OpenAPIClientCore/README.md | 1 + .../OpenAPIClientCore/api/openapi.yaml | 9 + .../docs/LiteralStringClass.md | 11 ++ .../Model/LiteralStringClassTests.cs | 77 ++++++++ .../src/Org.OpenAPITools/Model/Animal.cs | 4 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 4 +- .../Model/LiteralStringClass.cs | 135 +++++++++++++ .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- 133 files changed, 2885 insertions(+), 82 deletions(-) create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/docs/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/LiteralStringClass.md create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache index 7f43f567b32..7ee1b93d7e8 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache @@ -145,7 +145,7 @@ namespace {{packageName}}.Client { "{{{name}}}", new Dictionary { {"description", "{{{description}}}{{^description}}No description provided{{/description}}"}, - {"default_value", "{{{defaultValue}}}"}, + {"default_value", {{#isString}}{{^isEnum}}@{{/isEnum}}{{/isString}}"{{{defaultValue}}}"}, {{#enumValues}} {{#-first}} { diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelSignature.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelSignature.mustache index 1cc9190e969..86e22d57f06 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelSignature.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelSignature.mustache @@ -1 +1 @@ -{{#model.allVars}}{{>PropertyDataType}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#defaultValue}} = {{^isDateTime}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default{{/isDateTime}}{{/defaultValue}}{{^defaultValue}}{{#isNullable}} = default{{/isNullable}}{{/defaultValue}} {{/model.allVars}} \ No newline at end of file +{{#model.allVars}}{{>PropertyDataType}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#defaultValue}} = {{^isDateTime}}{{#isString}}{{^isEnum}}@{{/isEnum}}{{/isString}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default{{/isDateTime}}{{/defaultValue}}{{^defaultValue}}{{#isNullable}} = default{{/isNullable}}{{/defaultValue}} {{/model.allVars}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache index 15a41f6a2e0..4ad255aef4c 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache @@ -134,7 +134,7 @@ {{#hasOnlyReadOnly}} [JsonConstructorAttribute] {{/hasOnlyReadOnly}} - public {{classname}}({{#readWriteVars}}{{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#defaultValue}}{{^isDateTime}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default({{{datatypeWithEnum}}}){{/isDateTime}}{{/defaultValue}}{{^defaultValue}}default({{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}}){{/defaultValue}}{{^-last}}, {{/-last}}{{/readWriteVars}}){{#parent}} : base({{#parentVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{^-last}}, {{/-last}}{{/parentVars}}){{/parent}} + public {{classname}}({{#readWriteVars}}{{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#defaultValue}}{{^isDateTime}}{{#isString}}{{^isEnum}}@{{/isEnum}}{{/isString}}{{{defaultValue}}}{{/isDateTime}}{{#isDateTime}}default({{{datatypeWithEnum}}}){{/isDateTime}}{{/defaultValue}}{{^defaultValue}}default({{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}}{{/isEnum}}){{/defaultValue}}{{^-last}}, {{/-last}}{{/readWriteVars}}){{#parent}} : base({{#parentVars}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{^-last}}, {{/-last}}{{/parentVars}}){{/parent}} { {{#vars}} {{^isInherited}} @@ -178,7 +178,7 @@ {{^conditionalSerialization}} {{^vendorExtensions.x-csharp-value-type}} // use default value if no "{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}" provided - this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} ?? {{{defaultValue}}}; + this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} ?? {{#isString}}@{{/isString}}{{{defaultValue}}}; {{/vendorExtensions.x-csharp-value-type}} {{#vendorExtensions.x-csharp-value-type}} this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 21d824b0084..c9d94efc91f 100644 --- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -2259,4 +2259,13 @@ components: type: object properties: value: - type: string \ No newline at end of file + type: string + LiteralStringClass: + type: object + properties: + escapedLiteralString: + type: string + default: C:\\Users\\username + unescapedLiteralString: + type: string + default: C:\Users\username \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES index ca00a1d0b12..838976ae425 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES @@ -51,6 +51,7 @@ docs/HasOnlyReadOnly.md docs/HealthCheckResult.md docs/IsoscelesTriangle.md docs/List.md +docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -167,6 +168,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md index 56476d9a949..786ac93aab8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md @@ -193,6 +193,7 @@ Class | Method | HTTP request | Description - [Model.HealthCheckResult](docs/HealthCheckResult.md) - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md) - [Model.List](docs/List.md) + - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md new file mode 100644 index 00000000000..6d3e0d50c1f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..74dc17b9f4a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,77 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs index 6d4cbf3cb87..1089897a9c0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// className (required). /// color (default to "red"). - public Animal(string className = default(string), string color = "red") + public Animal(string className = default(string), string color = @"red") { // to ensure "className" is required (not null) if (className == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs index a9643944cca..6ce34d4b957 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// declawed. /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = @"Cat", string color = @"red") : base(className, color) { this._Declawed = declawed; if (this.Declawed != null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs index dd09bcdc936..babb18e4c04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs @@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model /// /// id. /// name (required) (default to "default-name"). - public Category(long id = default(long), string name = "default-name") + public Category(long id = default(long), string name = @"default-name") { // to ensure "name" is required (not null) if (name == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs index 268c386ae2e..450f8c3a0a4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// breed. /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = @"Dog", string color = @"red") : base(className, color) { this._Breed = breed; if (this.Breed != null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs index dcbf1143534..1380ddea88a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// bar (default to "bar"). - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..60124dbf916 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,179 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + [DataContract(Name = "LiteralStringClass")] + public partial class LiteralStringClass : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username"). + /// unescapedLiteralString (default to "C:\Users\username"). + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [DataMember(Name = "escapedLiteralString", EmitDefaultValue = false)] + public string EscapedLiteralString + { + get{ return _EscapedLiteralString;} + set + { + _EscapedLiteralString = value; + _flagEscapedLiteralString = true; + } + } + private string _EscapedLiteralString; + private bool _flagEscapedLiteralString; + + /// + /// Returns false as EscapedLiteralString should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeEscapedLiteralString() + { + return _flagEscapedLiteralString; + } + /// + /// Gets or Sets UnescapedLiteralString + /// + [DataMember(Name = "unescapedLiteralString", EmitDefaultValue = false)] + public string UnescapedLiteralString + { + get{ return _UnescapedLiteralString;} + set + { + _UnescapedLiteralString = value; + _flagUnescapedLiteralString = true; + } + } + private string _UnescapedLiteralString; + private bool _flagUnescapedLiteralString; + + /// + /// Returns false as UnescapedLiteralString should not be serialized given that it's read-only. + /// + /// false (boolean) + public bool ShouldSerializeUnescapedLiteralString() + { + return _flagUnescapedLiteralString; + } + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as LiteralStringClass).AreEqual; + } + + /// + /// Returns true if LiteralStringClass instances are equal + /// + /// Instance of LiteralStringClass to be compared + /// Boolean + public bool Equals(LiteralStringClass input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.EscapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.EscapedLiteralString.GetHashCode(); + } + if (this.UnescapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.UnescapedLiteralString.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs index 49bed679864..7e2a820d32c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// petType (required) (default to "ParentPet"). - public ParentPet(string petType = "ParentPet") : base(petType) + public ParentPet(string petType = @"ParentPet") : base(petType) { this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES index 9d9da2869df..35efa408b97 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES @@ -54,6 +54,7 @@ docs/models/HasOnlyReadOnly.md docs/models/HealthCheckResult.md docs/models/IsoscelesTriangle.md docs/models/List.md +docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MixedPropertiesAndAdditionalPropertiesClass.md @@ -173,6 +174,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md new file mode 100644 index 00000000000..78202190965 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..7e31808e097 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,76 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8bd9635ba09..4b882f79e6a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -92,6 +92,7 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new HealthCheckResultJsonConverter()); _jsonOptions.Converters.Add(new IsoscelesTriangleJsonConverter()); _jsonOptions.Converters.Add(new ListJsonConverter()); + _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MixedPropertiesAndAdditionalPropertiesClassJsonConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs index 2aa4113882f..1337f2e6e9e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - public Animal(string className, string color = "red") + public Animal(string className, string color = @"red") { ClassName = className; Color = color; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs index fd222ece114..7dd556c2132 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs @@ -38,7 +38,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = "red") : base(className, color) + internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = @"red") : base(className, color) { Dictionary = dictionary; CatAllOf = catAllOf; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs index bf40829d283..7e8cde62ae7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// id /// name (default to "default-name") [JsonConstructor] - public Category(long id, string name = "default-name") + public Category(long id, string name = @"default-name") { Id = id; Name = name; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs index ef7bfd2e9e3..b05156f1233 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs @@ -37,7 +37,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - internal Dog(DogAllOf dogAllOf, string className, string color = "red") : base(className, color) + internal Dog(DogAllOf dogAllOf, string className, string color = @"red") : base(className, color) { DogAllOf = dogAllOf; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs index ee4aaf4bbdc..037f719500a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model /// /// bar (default to "bar") [JsonConstructor] - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { Bar = bar; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..0c942dc6894 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,172 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +#nullable enable + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + public partial class LiteralStringClass : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username") + /// unescapedLiteralString (default to "C:\Users\username") + [JsonConstructor] + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + EscapedLiteralString = escapedLiteralString; + UnescapedLiteralString = unescapedLiteralString; + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [JsonPropertyName("escapedLiteralString")] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [JsonPropertyName("unescapedLiteralString")] + public string UnescapedLiteralString { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type LiteralStringClass + /// + public class LiteralStringClassJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override LiteralStringClass Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + string escapedLiteralString = default; + string unescapedLiteralString = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string? propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "escapedLiteralString": + escapedLiteralString = utf8JsonReader.GetString(); + break; + case "unescapedLiteralString": + unescapedLiteralString = utf8JsonReader.GetString(); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (escapedLiteralString == null) + throw new ArgumentNullException(nameof(escapedLiteralString), "Property is required for class LiteralStringClass."); + + if (unescapedLiteralString == null) + throw new ArgumentNullException(nameof(unescapedLiteralString), "Property is required for class LiteralStringClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new LiteralStringClass(escapedLiteralString, unescapedLiteralString); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, LiteralStringClass literalStringClass, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WriteString("escapedLiteralString", literalStringClass.EscapedLiteralString); + writer.WriteString("unescapedLiteralString", literalStringClass.UnescapedLiteralString); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES index 9d9da2869df..35efa408b97 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES @@ -54,6 +54,7 @@ docs/models/HasOnlyReadOnly.md docs/models/HealthCheckResult.md docs/models/IsoscelesTriangle.md docs/models/List.md +docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MixedPropertiesAndAdditionalPropertiesClass.md @@ -173,6 +174,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md new file mode 100644 index 00000000000..78202190965 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..7e31808e097 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,76 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index 34478d4be16..e5399ebe850 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -90,6 +90,7 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new HealthCheckResultJsonConverter()); _jsonOptions.Converters.Add(new IsoscelesTriangleJsonConverter()); _jsonOptions.Converters.Add(new ListJsonConverter()); + _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MixedPropertiesAndAdditionalPropertiesClassJsonConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs index 830bec45669..0061eef68ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs @@ -34,7 +34,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - public Animal(string className, string color = "red") + public Animal(string className, string color = @"red") { ClassName = className; Color = color; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs index 012918369b3..63a7cbf5597 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = "red") : base(className, color) + internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = @"red") : base(className, color) { Dictionary = dictionary; CatAllOf = catAllOf; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs index b8e0407d843..719a929f6e4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs @@ -34,7 +34,7 @@ namespace Org.OpenAPITools.Model /// id /// name (default to "default-name") [JsonConstructor] - public Category(long id, string name = "default-name") + public Category(long id, string name = @"default-name") { Id = id; Name = name; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs index 094c1d2fc79..6bb6413c6d9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - internal Dog(DogAllOf dogAllOf, string className, string color = "red") : base(className, color) + internal Dog(DogAllOf dogAllOf, string className, string color = @"red") : base(className, color) { DogAllOf = dogAllOf; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs index 84c8b8ea016..6b389a8547a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs @@ -33,7 +33,7 @@ namespace Org.OpenAPITools.Model /// /// bar (default to "bar") [JsonConstructor] - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { Bar = bar; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..6247b0187ac --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,170 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + public partial class LiteralStringClass : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username") + /// unescapedLiteralString (default to "C:\Users\username") + [JsonConstructor] + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + EscapedLiteralString = escapedLiteralString; + UnescapedLiteralString = unescapedLiteralString; + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [JsonPropertyName("escapedLiteralString")] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [JsonPropertyName("unescapedLiteralString")] + public string UnescapedLiteralString { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type LiteralStringClass + /// + public class LiteralStringClassJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override LiteralStringClass Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + string escapedLiteralString = default; + string unescapedLiteralString = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "escapedLiteralString": + escapedLiteralString = utf8JsonReader.GetString(); + break; + case "unescapedLiteralString": + unescapedLiteralString = utf8JsonReader.GetString(); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (escapedLiteralString == null) + throw new ArgumentNullException(nameof(escapedLiteralString), "Property is required for class LiteralStringClass."); + + if (unescapedLiteralString == null) + throw new ArgumentNullException(nameof(unescapedLiteralString), "Property is required for class LiteralStringClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new LiteralStringClass(escapedLiteralString, unescapedLiteralString); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, LiteralStringClass literalStringClass, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WriteString("escapedLiteralString", literalStringClass.EscapedLiteralString); + writer.WriteString("unescapedLiteralString", literalStringClass.UnescapedLiteralString); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES index 9d9da2869df..35efa408b97 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES @@ -54,6 +54,7 @@ docs/models/HasOnlyReadOnly.md docs/models/HealthCheckResult.md docs/models/IsoscelesTriangle.md docs/models/List.md +docs/models/LiteralStringClass.md docs/models/Mammal.md docs/models/MapTest.md docs/models/MixedPropertiesAndAdditionalPropertiesClass.md @@ -173,6 +174,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md new file mode 100644 index 00000000000..78202190965 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..7e31808e097 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,76 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index 34478d4be16..e5399ebe850 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -90,6 +90,7 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new HealthCheckResultJsonConverter()); _jsonOptions.Converters.Add(new IsoscelesTriangleJsonConverter()); _jsonOptions.Converters.Add(new ListJsonConverter()); + _jsonOptions.Converters.Add(new LiteralStringClassJsonConverter()); _jsonOptions.Converters.Add(new MammalJsonConverter()); _jsonOptions.Converters.Add(new MapTestJsonConverter()); _jsonOptions.Converters.Add(new MixedPropertiesAndAdditionalPropertiesClassJsonConverter()); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs index 830bec45669..0061eef68ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs @@ -34,7 +34,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - public Animal(string className, string color = "red") + public Animal(string className, string color = @"red") { ClassName = className; Color = color; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs index 012918369b3..63a7cbf5597 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = "red") : base(className, color) + internal Cat(Dictionary dictionary, CatAllOf catAllOf, string className, string color = @"red") : base(className, color) { Dictionary = dictionary; CatAllOf = catAllOf; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs index b8e0407d843..719a929f6e4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs @@ -34,7 +34,7 @@ namespace Org.OpenAPITools.Model /// id /// name (default to "default-name") [JsonConstructor] - public Category(long id, string name = "default-name") + public Category(long id, string name = @"default-name") { Id = id; Name = name; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs index 094c1d2fc79..6bb6413c6d9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model /// className /// color (default to "red") [JsonConstructor] - internal Dog(DogAllOf dogAllOf, string className, string color = "red") : base(className, color) + internal Dog(DogAllOf dogAllOf, string className, string color = @"red") : base(className, color) { DogAllOf = dogAllOf; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs index 84c8b8ea016..6b389a8547a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs @@ -33,7 +33,7 @@ namespace Org.OpenAPITools.Model /// /// bar (default to "bar") [JsonConstructor] - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { Bar = bar; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..6247b0187ac --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,170 @@ +// +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + public partial class LiteralStringClass : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username") + /// unescapedLiteralString (default to "C:\Users\username") + [JsonConstructor] + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + EscapedLiteralString = escapedLiteralString; + UnescapedLiteralString = unescapedLiteralString; + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [JsonPropertyName("escapedLiteralString")] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [JsonPropertyName("unescapedLiteralString")] + public string UnescapedLiteralString { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public Dictionary AdditionalProperties { get; } = new Dictionary(); + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + + /// + /// A Json converter for type LiteralStringClass + /// + public class LiteralStringClassJsonConverter : JsonConverter + { + /// + /// A Json reader. + /// + /// + /// + /// + /// + /// + public override LiteralStringClass Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions) + { + int currentDepth = utf8JsonReader.CurrentDepth; + + if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + JsonTokenType startingTokenType = utf8JsonReader.TokenType; + + string escapedLiteralString = default; + string unescapedLiteralString = default; + + while (utf8JsonReader.Read()) + { + if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth) + break; + + if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1) + { + string propertyName = utf8JsonReader.GetString(); + utf8JsonReader.Read(); + + switch (propertyName) + { + case "escapedLiteralString": + escapedLiteralString = utf8JsonReader.GetString(); + break; + case "unescapedLiteralString": + unescapedLiteralString = utf8JsonReader.GetString(); + break; + default: + break; + } + } + } + +#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + if (escapedLiteralString == null) + throw new ArgumentNullException(nameof(escapedLiteralString), "Property is required for class LiteralStringClass."); + + if (unescapedLiteralString == null) + throw new ArgumentNullException(nameof(unescapedLiteralString), "Property is required for class LiteralStringClass."); + +#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' +#pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' + + return new LiteralStringClass(escapedLiteralString, unescapedLiteralString); + } + + /// + /// A Json writer + /// + /// + /// + /// + /// + public override void Write(Utf8JsonWriter writer, LiteralStringClass literalStringClass, JsonSerializerOptions jsonSerializerOptions) + { + writer.WriteStartObject(); + + writer.WriteString("escapedLiteralString", literalStringClass.EscapedLiteralString); + writer.WriteString("unescapedLiteralString", literalStringClass.UnescapedLiteralString); + + writer.WriteEndObject(); + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES index 8b5e6fe3c0c..d0801197efe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES @@ -51,6 +51,7 @@ docs/HasOnlyReadOnly.md docs/HealthCheckResult.md docs/IsoscelesTriangle.md docs/List.md +docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -164,6 +165,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md index 759cb8d2847..704da570647 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md @@ -218,6 +218,7 @@ Class | Method | HTTP request | Description - [Model.HealthCheckResult](docs/HealthCheckResult.md) - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md) - [Model.List](docs/List.md) + - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/LiteralStringClass.md new file mode 100644 index 00000000000..6d3e0d50c1f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..74dc17b9f4a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,77 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs index dc511478a57..7300b6da74e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs @@ -50,7 +50,7 @@ namespace Org.OpenAPITools.Model /// /// className (required). /// color (default to "red"). - public Animal(string className = default(string), string color = "red") + public Animal(string className = default(string), string color = @"red") { // to ensure "className" is required (not null) if (className == null) @@ -59,7 +59,7 @@ namespace Org.OpenAPITools.Model } this.ClassName = className; // use default value if no "color" provided - this.Color = color ?? "red"; + this.Color = color ?? @"red"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs index e151f038ad2..d2f07b2e063 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// declawed. /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = @"Cat", string color = @"red") : base(className, color) { this.Declawed = declawed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs index 7a758fc8b15..f8ceed16884 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Model /// /// id. /// name (required) (default to "default-name"). - public Category(long id = default(long), string name = "default-name") + public Category(long id = default(long), string name = @"default-name") { // to ensure "name" is required (not null) if (name == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs index 10944760277..f8432044266 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// breed. /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = @"Dog", string color = @"red") : base(className, color) { this.Breed = breed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs index c42991826b1..d7a83d189b8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs @@ -37,10 +37,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// bar (default to "bar"). - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { // use default value if no "bar" provided - this.Bar = bar ?? "bar"; + this.Bar = bar ?? @"bar"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..2694ca6bba3 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,148 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using FileParameter = Org.OpenAPITools.Client.FileParameter; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + [DataContract(Name = "LiteralStringClass")] + public partial class LiteralStringClass : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username"). + /// unescapedLiteralString (default to "C:\Users\username"). + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + // use default value if no "escapedLiteralString" provided + this.EscapedLiteralString = escapedLiteralString ?? @"C:\\Users\\username"; + // use default value if no "unescapedLiteralString" provided + this.UnescapedLiteralString = unescapedLiteralString ?? @"C:\Users\username"; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [DataMember(Name = "escapedLiteralString", EmitDefaultValue = false)] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [DataMember(Name = "unescapedLiteralString", EmitDefaultValue = false)] + public string UnescapedLiteralString { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as LiteralStringClass).AreEqual; + } + + /// + /// Returns true if LiteralStringClass instances are equal + /// + /// Instance of LiteralStringClass to be compared + /// Boolean + public bool Equals(LiteralStringClass input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.EscapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.EscapedLiteralString.GetHashCode(); + } + if (this.UnescapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.UnescapedLiteralString.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs index b717f6edf83..5a74e4fd34f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// petType (required) (default to "ParentPet"). - public ParentPet(string petType = "ParentPet") : base(petType) + public ParentPet(string petType = @"ParentPet") : base(petType) { this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES index ca00a1d0b12..838976ae425 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES @@ -51,6 +51,7 @@ docs/HasOnlyReadOnly.md docs/HealthCheckResult.md docs/IsoscelesTriangle.md docs/List.md +docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -167,6 +168,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md index 9a4d19d4718..49208c7379d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md @@ -205,6 +205,7 @@ Class | Method | HTTP request | Description - [Model.HealthCheckResult](docs/HealthCheckResult.md) - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md) - [Model.List](docs/List.md) + - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/LiteralStringClass.md new file mode 100644 index 00000000000..6d3e0d50c1f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..74dc17b9f4a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,77 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs index 83397018b70..bcfe3744a9d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// className (required). /// color (default to "red"). - public Animal(string className = default(string), string color = "red") + public Animal(string className = default(string), string color = @"red") { // to ensure "className" is required (not null) if (className == null) @@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model } this.ClassName = className; // use default value if no "color" provided - this.Color = color ?? "red"; + this.Color = color ?? @"red"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs index 86ceaeed1ab..0a48e9411bc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// declawed. /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = @"Cat", string color = @"red") : base(className, color) { this.Declawed = declawed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs index 94dea2b30bb..380112546ce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs @@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model /// /// id. /// name (required) (default to "default-name"). - public Category(long id = default(long), string name = "default-name") + public Category(long id = default(long), string name = @"default-name") { // to ensure "name" is required (not null) if (name == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs index 786270d1c4d..610859341db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// breed. /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = @"Dog", string color = @"red") : base(className, color) { this.Breed = breed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs index e64aac7b631..2c74cfce99f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs @@ -36,10 +36,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// bar (default to "bar"). - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { // use default value if no "bar" provided - this.Bar = bar ?? "bar"; + this.Bar = bar ?? @"bar"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..51815067591 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,147 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + [DataContract(Name = "LiteralStringClass")] + public partial class LiteralStringClass : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username"). + /// unescapedLiteralString (default to "C:\Users\username"). + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + // use default value if no "escapedLiteralString" provided + this.EscapedLiteralString = escapedLiteralString ?? @"C:\\Users\\username"; + // use default value if no "unescapedLiteralString" provided + this.UnescapedLiteralString = unescapedLiteralString ?? @"C:\Users\username"; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [DataMember(Name = "escapedLiteralString", EmitDefaultValue = false)] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [DataMember(Name = "unescapedLiteralString", EmitDefaultValue = false)] + public string UnescapedLiteralString { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as LiteralStringClass).AreEqual; + } + + /// + /// Returns true if LiteralStringClass instances are equal + /// + /// Instance of LiteralStringClass to be compared + /// Boolean + public bool Equals(LiteralStringClass input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.EscapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.EscapedLiteralString.GetHashCode(); + } + if (this.UnescapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.UnescapedLiteralString.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs index 49bed679864..7e2a820d32c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// petType (required) (default to "ParentPet"). - public ParentPet(string petType = "ParentPet") : base(petType) + public ParentPet(string petType = @"ParentPet") : base(petType) { this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES index ca00a1d0b12..838976ae425 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES @@ -51,6 +51,7 @@ docs/HasOnlyReadOnly.md docs/HealthCheckResult.md docs/IsoscelesTriangle.md docs/List.md +docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -167,6 +168,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md index 9a4d19d4718..49208c7379d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md @@ -205,6 +205,7 @@ Class | Method | HTTP request | Description - [Model.HealthCheckResult](docs/HealthCheckResult.md) - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md) - [Model.List](docs/List.md) + - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/LiteralStringClass.md new file mode 100644 index 00000000000..6d3e0d50c1f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..74dc17b9f4a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,77 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs index 83397018b70..bcfe3744a9d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// className (required). /// color (default to "red"). - public Animal(string className = default(string), string color = "red") + public Animal(string className = default(string), string color = @"red") { // to ensure "className" is required (not null) if (className == null) @@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model } this.ClassName = className; // use default value if no "color" provided - this.Color = color ?? "red"; + this.Color = color ?? @"red"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs index 86ceaeed1ab..0a48e9411bc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// declawed. /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = @"Cat", string color = @"red") : base(className, color) { this.Declawed = declawed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs index 94dea2b30bb..380112546ce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs @@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model /// /// id. /// name (required) (default to "default-name"). - public Category(long id = default(long), string name = "default-name") + public Category(long id = default(long), string name = @"default-name") { // to ensure "name" is required (not null) if (name == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs index 786270d1c4d..610859341db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// breed. /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = @"Dog", string color = @"red") : base(className, color) { this.Breed = breed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs index e64aac7b631..2c74cfce99f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs @@ -36,10 +36,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// bar (default to "bar"). - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { // use default value if no "bar" provided - this.Bar = bar ?? "bar"; + this.Bar = bar ?? @"bar"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..51815067591 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,147 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + [DataContract(Name = "LiteralStringClass")] + public partial class LiteralStringClass : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username"). + /// unescapedLiteralString (default to "C:\Users\username"). + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + // use default value if no "escapedLiteralString" provided + this.EscapedLiteralString = escapedLiteralString ?? @"C:\\Users\\username"; + // use default value if no "unescapedLiteralString" provided + this.UnescapedLiteralString = unescapedLiteralString ?? @"C:\Users\username"; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [DataMember(Name = "escapedLiteralString", EmitDefaultValue = false)] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [DataMember(Name = "unescapedLiteralString", EmitDefaultValue = false)] + public string UnescapedLiteralString { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as LiteralStringClass).AreEqual; + } + + /// + /// Returns true if LiteralStringClass instances are equal + /// + /// Instance of LiteralStringClass to be compared + /// Boolean + public bool Equals(LiteralStringClass input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.EscapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.EscapedLiteralString.GetHashCode(); + } + if (this.UnescapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.UnescapedLiteralString.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs index 49bed679864..7e2a820d32c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// petType (required) (default to "ParentPet"). - public ParentPet(string petType = "ParentPet") : base(petType) + public ParentPet(string petType = @"ParentPet") : base(petType) { this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES index ca00a1d0b12..838976ae425 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES @@ -51,6 +51,7 @@ docs/HasOnlyReadOnly.md docs/HealthCheckResult.md docs/IsoscelesTriangle.md docs/List.md +docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -167,6 +168,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md index 9a4d19d4718..49208c7379d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md @@ -205,6 +205,7 @@ Class | Method | HTTP request | Description - [Model.HealthCheckResult](docs/HealthCheckResult.md) - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md) - [Model.List](docs/List.md) + - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/LiteralStringClass.md new file mode 100644 index 00000000000..6d3e0d50c1f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..74dc17b9f4a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,77 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs index 83397018b70..bcfe3744a9d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// className (required). /// color (default to "red"). - public Animal(string className = default(string), string color = "red") + public Animal(string className = default(string), string color = @"red") { // to ensure "className" is required (not null) if (className == null) @@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model } this.ClassName = className; // use default value if no "color" provided - this.Color = color ?? "red"; + this.Color = color ?? @"red"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs index 86ceaeed1ab..0a48e9411bc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// declawed. /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = @"Cat", string color = @"red") : base(className, color) { this.Declawed = declawed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs index 94dea2b30bb..380112546ce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs @@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model /// /// id. /// name (required) (default to "default-name"). - public Category(long id = default(long), string name = "default-name") + public Category(long id = default(long), string name = @"default-name") { // to ensure "name" is required (not null) if (name == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs index 786270d1c4d..610859341db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// breed. /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = @"Dog", string color = @"red") : base(className, color) { this.Breed = breed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs index e64aac7b631..2c74cfce99f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs @@ -36,10 +36,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// bar (default to "bar"). - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { // use default value if no "bar" provided - this.Bar = bar ?? "bar"; + this.Bar = bar ?? @"bar"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..51815067591 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,147 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + [DataContract(Name = "LiteralStringClass")] + public partial class LiteralStringClass : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username"). + /// unescapedLiteralString (default to "C:\Users\username"). + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + // use default value if no "escapedLiteralString" provided + this.EscapedLiteralString = escapedLiteralString ?? @"C:\\Users\\username"; + // use default value if no "unescapedLiteralString" provided + this.UnescapedLiteralString = unescapedLiteralString ?? @"C:\Users\username"; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [DataMember(Name = "escapedLiteralString", EmitDefaultValue = false)] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [DataMember(Name = "unescapedLiteralString", EmitDefaultValue = false)] + public string UnescapedLiteralString { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as LiteralStringClass).AreEqual; + } + + /// + /// Returns true if LiteralStringClass instances are equal + /// + /// Instance of LiteralStringClass to be compared + /// Boolean + public bool Equals(LiteralStringClass input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.EscapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.EscapedLiteralString.GetHashCode(); + } + if (this.UnescapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.UnescapedLiteralString.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs index 49bed679864..7e2a820d32c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// petType (required) (default to "ParentPet"). - public ParentPet(string petType = "ParentPet") : base(petType) + public ParentPet(string petType = @"ParentPet") : base(petType) { this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES index fa47c7aafc2..36ec9d64116 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES @@ -49,6 +49,7 @@ docs/HasOnlyReadOnly.md docs/HealthCheckResult.md docs/IsoscelesTriangle.md docs/List.md +docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -163,6 +164,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md index 7f0b8a19018..d916762b2cf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md @@ -179,6 +179,7 @@ Class | Method | HTTP request | Description - [Model.HealthCheckResult](HealthCheckResult.md) - [Model.IsoscelesTriangle](IsoscelesTriangle.md) - [Model.List](List.md) + - [Model.LiteralStringClass](LiteralStringClass.md) - [Model.Mammal](Mammal.md) - [Model.MapTest](MapTest.md) - [Model.MixedPropertiesAndAdditionalPropertiesClass](MixedPropertiesAndAdditionalPropertiesClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md new file mode 100644 index 00000000000..6d3e0d50c1f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..fe53ed94de6 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,74 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; +using NUnit.Framework; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Test] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + /// + /// Test the property 'EscapedLiteralString' + /// + [Test] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Test] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + } +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs index 543f842e5c4..0073454f667 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs @@ -40,7 +40,7 @@ namespace Org.OpenAPITools.Model /// /// className (required). /// color (default to "red"). - public Animal(string className = default(string), string color = "red") + public Animal(string className = default(string), string color = @"red") { // to ensure "className" is required (not null) if (className == null) @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model } this.ClassName = className; // use default value if no "color" provided - this.Color = color ?? "red"; + this.Color = color ?? @"red"; } /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs index 467db4f788e..2d02542a517 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs @@ -41,7 +41,7 @@ namespace Org.OpenAPITools.Model /// declawed. /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = @"Cat", string color = @"red") : base(className, color) { this.Declawed = declawed; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs index 2d9702a6d7f..52680d66e36 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs @@ -40,7 +40,7 @@ namespace Org.OpenAPITools.Model /// /// id. /// name (required) (default to "default-name"). - public Category(long id = default(long), string name = "default-name") + public Category(long id = default(long), string name = @"default-name") { // to ensure "name" is required (not null) if (name == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs index b027dd79ebf..cda8e3ca41c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs @@ -41,7 +41,7 @@ namespace Org.OpenAPITools.Model /// breed. /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = @"Dog", string color = @"red") : base(className, color) { this.Breed = breed; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs index b496a89c893..704abb10128 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs @@ -34,10 +34,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// bar (default to "bar"). - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { // use default value if no "bar" provided - this.Bar = bar ?? "bar"; + this.Bar = bar ?? @"bar"; } /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..fdca36d43a8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,138 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + [DataContract(Name = "LiteralStringClass")] + public partial class LiteralStringClass : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username"). + /// unescapedLiteralString (default to "C:\Users\username"). + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + // use default value if no "escapedLiteralString" provided + this.EscapedLiteralString = escapedLiteralString ?? @"C:\\Users\\username"; + // use default value if no "unescapedLiteralString" provided + this.UnescapedLiteralString = unescapedLiteralString ?? @"C:\Users\username"; + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [DataMember(Name = "escapedLiteralString", EmitDefaultValue = false)] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [DataMember(Name = "unescapedLiteralString", EmitDefaultValue = false)] + public string UnescapedLiteralString { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as LiteralStringClass); + } + + /// + /// Returns true if LiteralStringClass instances are equal + /// + /// Instance of LiteralStringClass to be compared + /// Boolean + public bool Equals(LiteralStringClass input) + { + if (input == null) + { + return false; + } + return + ( + this.EscapedLiteralString == input.EscapedLiteralString || + (this.EscapedLiteralString != null && + this.EscapedLiteralString.Equals(input.EscapedLiteralString)) + ) && + ( + this.UnescapedLiteralString == input.UnescapedLiteralString || + (this.UnescapedLiteralString != null && + this.UnescapedLiteralString.Equals(input.UnescapedLiteralString)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.EscapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.EscapedLiteralString.GetHashCode(); + } + if (this.UnescapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.UnescapedLiteralString.GetHashCode(); + } + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs index 63f93900d87..3ab62d6dbff 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs @@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// petType (required) (default to "ParentPet"). - public ParentPet(string petType = "ParentPet") : base(petType) + public ParentPet(string petType = @"ParentPet") : base(petType) { } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES index 28e7c49aedb..3f6001fe8dd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES @@ -51,6 +51,7 @@ docs/HasOnlyReadOnly.md docs/HealthCheckResult.md docs/IsoscelesTriangle.md docs/List.md +docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -166,6 +167,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md index 56476d9a949..786ac93aab8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md @@ -193,6 +193,7 @@ Class | Method | HTTP request | Description - [Model.HealthCheckResult](docs/HealthCheckResult.md) - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md) - [Model.List](docs/List.md) + - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/LiteralStringClass.md new file mode 100644 index 00000000000..6d3e0d50c1f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..74dc17b9f4a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,77 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs index 83397018b70..bcfe3744a9d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// className (required). /// color (default to "red"). - public Animal(string className = default(string), string color = "red") + public Animal(string className = default(string), string color = @"red") { // to ensure "className" is required (not null) if (className == null) @@ -58,7 +58,7 @@ namespace Org.OpenAPITools.Model } this.ClassName = className; // use default value if no "color" provided - this.Color = color ?? "red"; + this.Color = color ?? @"red"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs index 86ceaeed1ab..0a48e9411bc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// declawed. /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = @"Cat", string color = @"red") : base(className, color) { this.Declawed = declawed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs index 94dea2b30bb..380112546ce 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs @@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model /// /// id. /// name (required) (default to "default-name"). - public Category(long id = default(long), string name = "default-name") + public Category(long id = default(long), string name = @"default-name") { // to ensure "name" is required (not null) if (name == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs index 786270d1c4d..610859341db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs @@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model /// breed. /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = @"Dog", string color = @"red") : base(className, color) { this.Breed = breed; this.AdditionalProperties = new Dictionary(); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs index e64aac7b631..2c74cfce99f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs @@ -36,10 +36,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// bar (default to "bar"). - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { // use default value if no "bar" provided - this.Bar = bar ?? "bar"; + this.Bar = bar ?? @"bar"; this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..51815067591 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,147 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + [DataContract(Name = "LiteralStringClass")] + public partial class LiteralStringClass : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username"). + /// unescapedLiteralString (default to "C:\Users\username"). + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + // use default value if no "escapedLiteralString" provided + this.EscapedLiteralString = escapedLiteralString ?? @"C:\\Users\\username"; + // use default value if no "unescapedLiteralString" provided + this.UnescapedLiteralString = unescapedLiteralString ?? @"C:\Users\username"; + this.AdditionalProperties = new Dictionary(); + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [DataMember(Name = "escapedLiteralString", EmitDefaultValue = false)] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [DataMember(Name = "unescapedLiteralString", EmitDefaultValue = false)] + public string UnescapedLiteralString { get; set; } + + /// + /// Gets or Sets additional properties + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append(" AdditionalProperties: ").Append(AdditionalProperties).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as LiteralStringClass).AreEqual; + } + + /// + /// Returns true if LiteralStringClass instances are equal + /// + /// Instance of LiteralStringClass to be compared + /// Boolean + public bool Equals(LiteralStringClass input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.EscapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.EscapedLiteralString.GetHashCode(); + } + if (this.UnescapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.UnescapedLiteralString.GetHashCode(); + } + if (this.AdditionalProperties != null) + { + hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs index 49bed679864..7e2a820d32c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// petType (required) (default to "ParentPet"). - public ParentPet(string petType = "ParentPet") : base(petType) + public ParentPet(string petType = @"ParentPet") : base(petType) { this.AdditionalProperties = new Dictionary(); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES index 28e7c49aedb..3f6001fe8dd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES @@ -51,6 +51,7 @@ docs/HasOnlyReadOnly.md docs/HealthCheckResult.md docs/IsoscelesTriangle.md docs/List.md +docs/LiteralStringClass.md docs/Mammal.md docs/MapTest.md docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -166,6 +167,7 @@ src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs src/Org.OpenAPITools/Model/HealthCheckResult.cs src/Org.OpenAPITools/Model/IsoscelesTriangle.cs src/Org.OpenAPITools/Model/List.cs +src/Org.OpenAPITools/Model/LiteralStringClass.cs src/Org.OpenAPITools/Model/Mammal.cs src/Org.OpenAPITools/Model/MapTest.cs src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md index 9a4d19d4718..49208c7379d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md @@ -205,6 +205,7 @@ Class | Method | HTTP request | Description - [Model.HealthCheckResult](docs/HealthCheckResult.md) - [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md) - [Model.List](docs/List.md) + - [Model.LiteralStringClass](docs/LiteralStringClass.md) - [Model.Mammal](docs/Mammal.md) - [Model.MapTest](docs/MapTest.md) - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml index ad369a25587..7942c294dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml @@ -2186,6 +2186,15 @@ components: value: type: string type: object + LiteralStringClass: + properties: + escapedLiteralString: + default: C:\\Users\\username + type: string + unescapedLiteralString: + default: C:\Users\username + type: string + type: object _foo_get_default_response: example: string: diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/LiteralStringClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/LiteralStringClass.md new file mode 100644 index 00000000000..6d3e0d50c1f --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/LiteralStringClass.md @@ -0,0 +1,11 @@ +# Org.OpenAPITools.Model.LiteralStringClass + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**EscapedLiteralString** | **string** | | [optional] [default to "C:\\Users\\username"] +**UnescapedLiteralString** | **string** | | [optional] [default to "C:\Users\username"] + +[[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/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs new file mode 100644 index 00000000000..74dc17b9f4a --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs @@ -0,0 +1,77 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing LiteralStringClass + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class LiteralStringClassTests : IDisposable + { + // TODO uncomment below to declare an instance variable for LiteralStringClass + //private LiteralStringClass instance; + + public LiteralStringClassTests() + { + // TODO uncomment below to create an instance of LiteralStringClass + //instance = new LiteralStringClass(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of LiteralStringClass + /// + [Fact] + public void LiteralStringClassInstanceTest() + { + // TODO uncomment below to test "IsType" LiteralStringClass + //Assert.IsType(instance); + } + + + /// + /// Test the property 'EscapedLiteralString' + /// + [Fact] + public void EscapedLiteralStringTest() + { + // TODO unit test for the property 'EscapedLiteralString' + } + /// + /// Test the property 'UnescapedLiteralString' + /// + [Fact] + public void UnescapedLiteralStringTest() + { + // TODO unit test for the property 'UnescapedLiteralString' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs index 86a7a429b22..478ade5f172 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Model /// /// className (required). /// color (default to "red"). - public Animal(string className = default(string), string color = "red") + public Animal(string className = default(string), string color = @"red") { // to ensure "className" is required (not null) if (className == null) @@ -55,7 +55,7 @@ namespace Org.OpenAPITools.Model } this.ClassName = className; // use default value if no "color" provided - this.Color = color ?? "red"; + this.Color = color ?? @"red"; } /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs index c90dc4940de..f348fbe855d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs @@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model /// declawed. /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = @"Cat", string color = @"red") : base(className, color) { this.Declawed = declawed; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs index 1abee7610c8..dff20c6266c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs @@ -42,7 +42,7 @@ namespace Org.OpenAPITools.Model /// /// id. /// name (required) (default to "default-name"). - public Category(long id = default(long), string name = "default-name") + public Category(long id = default(long), string name = @"default-name") { // to ensure "name" is required (not null) if (name == null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs index 1d1dd51ee30..570047bd2e0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs @@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model /// breed. /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = @"Dog", string color = @"red") : base(className, color) { this.Breed = breed; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs index 3abdc1cb6a0..567bd4f778d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs @@ -36,10 +36,10 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// bar (default to "bar"). - public Foo(string bar = "bar") + public Foo(string bar = @"bar") { // use default value if no "bar" provided - this.Bar = bar ?? "bar"; + this.Bar = bar ?? @"bar"; } /// diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs new file mode 100644 index 00000000000..3523c8d1644 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -0,0 +1,135 @@ +/* + * 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// LiteralStringClass + /// + [DataContract(Name = "LiteralStringClass")] + public partial class LiteralStringClass : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// escapedLiteralString (default to "C:\\Users\\username"). + /// unescapedLiteralString (default to "C:\Users\username"). + public LiteralStringClass(string escapedLiteralString = @"C:\\Users\\username", string unescapedLiteralString = @"C:\Users\username") + { + // use default value if no "escapedLiteralString" provided + this.EscapedLiteralString = escapedLiteralString ?? @"C:\\Users\\username"; + // use default value if no "unescapedLiteralString" provided + this.UnescapedLiteralString = unescapedLiteralString ?? @"C:\Users\username"; + } + + /// + /// Gets or Sets EscapedLiteralString + /// + [DataMember(Name = "escapedLiteralString", EmitDefaultValue = false)] + public string EscapedLiteralString { get; set; } + + /// + /// Gets or Sets UnescapedLiteralString + /// + [DataMember(Name = "unescapedLiteralString", EmitDefaultValue = false)] + public string UnescapedLiteralString { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class LiteralStringClass {\n"); + sb.Append(" EscapedLiteralString: ").Append(EscapedLiteralString).Append("\n"); + sb.Append(" UnescapedLiteralString: ").Append(UnescapedLiteralString).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as LiteralStringClass).AreEqual; + } + + /// + /// Returns true if LiteralStringClass instances are equal + /// + /// Instance of LiteralStringClass to be compared + /// Boolean + public bool Equals(LiteralStringClass input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.EscapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.EscapedLiteralString.GetHashCode(); + } + if (this.UnescapedLiteralString != null) + { + hashCode = (hashCode * 59) + this.UnescapedLiteralString.GetHashCode(); + } + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + public IEnumerable Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs index 06356f5a8f4..87d2eca09ae 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs @@ -44,7 +44,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// petType (required) (default to "ParentPet"). - public ParentPet(string petType = "ParentPet") : base(petType) + public ParentPet(string petType = @"ParentPet") : base(petType) { } From 7417432a54124988efdffad3725a631694e34c85 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 1 Apr 2023 15:03:35 +0800 Subject: [PATCH 101/131] Prepare 6.5.0 release (#15099) * 6.5.0 release * update samples --- modules/openapi-generator-cli/pom.xml | 2 +- modules/openapi-generator-core/pom.xml | 2 +- modules/openapi-generator-gradle-plugin/gradle.properties | 2 +- modules/openapi-generator-gradle-plugin/pom.xml | 2 +- .../samples/local-spec/gradle.properties | 2 +- modules/openapi-generator-maven-plugin/examples/java-client.xml | 2 +- modules/openapi-generator-maven-plugin/examples/kotlin.xml | 2 +- .../examples/multi-module/java-client/pom.xml | 2 +- .../examples/non-java-invalid-spec.xml | 2 +- modules/openapi-generator-maven-plugin/examples/non-java.xml | 2 +- modules/openapi-generator-maven-plugin/examples/spring.xml | 2 +- modules/openapi-generator-maven-plugin/pom.xml | 2 +- modules/openapi-generator-online/pom.xml | 2 +- modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- .../echo_api/java/apache-httpclient/.openapi-generator/VERSION | 2 +- .../client/echo_api/java/feign-gson/.openapi-generator/VERSION | 2 +- samples/client/echo_api/java/native/.openapi-generator/VERSION | 2 +- .../client/echo_api/java/okhttp-gson/.openapi-generator/VERSION | 2 +- .../client/echo_api/python-nextgen/.openapi-generator/VERSION | 2 +- .../csharp-netcore-complex-files/.openapi-generator/VERSION | 2 +- .../java/okhttp-gson-streaming/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../allOf-composition/.openapi-generator/VERSION | 2 +- .../builds/with-unique-items/.openapi-generator/VERSION | 2 +- .../client/petstore/R-httr2-wrapper/.openapi-generator/VERSION | 2 +- samples/client/petstore/R-httr2/.openapi-generator/VERSION | 2 +- samples/client/petstore/R/.openapi-generator/VERSION | 2 +- samples/client/petstore/apex/.openapi-generator/VERSION | 2 +- samples/client/petstore/bash/.openapi-generator/VERSION | 2 +- samples/client/petstore/c/.openapi-generator/VERSION | 2 +- samples/client/petstore/cpp-qt/.openapi-generator/VERSION | 2 +- .../petstore/cpp-restsdk/client/.openapi-generator/VERSION | 2 +- .../client/include/CppRestPetstoreClient/ApiClient.h | 2 +- .../client/include/CppRestPetstoreClient/ApiConfiguration.h | 2 +- .../client/include/CppRestPetstoreClient/ApiException.h | 2 +- .../client/include/CppRestPetstoreClient/HttpContent.h | 2 +- .../client/include/CppRestPetstoreClient/IHttpBody.h | 2 +- .../cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h | 2 +- .../client/include/CppRestPetstoreClient/ModelBase.h | 2 +- .../client/include/CppRestPetstoreClient/MultipartFormData.h | 2 +- .../cpp-restsdk/client/include/CppRestPetstoreClient/Object.h | 2 +- .../client/include/CppRestPetstoreClient/api/PetApi.h | 2 +- .../client/include/CppRestPetstoreClient/api/StoreApi.h | 2 +- .../client/include/CppRestPetstoreClient/api/UserApi.h | 2 +- .../client/include/CppRestPetstoreClient/model/ApiResponse.h | 2 +- .../client/include/CppRestPetstoreClient/model/Category.h | 2 +- .../client/include/CppRestPetstoreClient/model/Order.h | 2 +- .../client/include/CppRestPetstoreClient/model/Pet.h | 2 +- .../client/include/CppRestPetstoreClient/model/Tag.h | 2 +- .../client/include/CppRestPetstoreClient/model/User.h | 2 +- samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp | 2 +- .../client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp | 2 +- .../petstore/cpp-restsdk/client/src/MultipartFormData.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/Object.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp | 2 +- .../petstore/cpp-restsdk/client/src/model/ApiResponse.cpp | 2 +- .../client/petstore/cpp-restsdk/client/src/model/Category.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp | 2 +- samples/client/petstore/cpp-restsdk/client/src/model/User.cpp | 2 +- samples/client/petstore/cpp-tiny/.openapi-generator/VERSION | 2 +- samples/client/petstore/cpp-ue4/.openapi-generator/VERSION | 2 +- samples/client/petstore/crystal/.openapi-generator/VERSION | 2 +- samples/client/petstore/crystal/.travis.yml | 2 +- samples/client/petstore/crystal/spec/spec_helper.cr | 2 +- samples/client/petstore/crystal/src/petstore.cr | 2 +- samples/client/petstore/crystal/src/petstore/api/pet_api.cr | 2 +- samples/client/petstore/crystal/src/petstore/api/store_api.cr | 2 +- samples/client/petstore/crystal/src/petstore/api/user_api.cr | 2 +- samples/client/petstore/crystal/src/petstore/api_client.cr | 2 +- samples/client/petstore/crystal/src/petstore/api_error.cr | 2 +- samples/client/petstore/crystal/src/petstore/configuration.cr | 2 +- .../client/petstore/crystal/src/petstore/models/api_response.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/category.cr | 2 +- .../client/petstore/crystal/src/petstore/models/format_test.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/order.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/pet.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/tag.cr | 2 +- samples/client/petstore/crystal/src/petstore/models/user.cr | 2 +- .../csharp-netcore-functions/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../OpenAPIClient-httpclient/.openapi-generator/VERSION | 2 +- .../OpenAPIClient-net47/.openapi-generator/VERSION | 2 +- .../OpenAPIClient-net48/.openapi-generator/VERSION | 2 +- .../OpenAPIClient-net5.0/.openapi-generator/VERSION | 2 +- .../OpenAPIClient-unityWebRequest/.openapi-generator/VERSION | 2 +- .../csharp-netcore/OpenAPIClient/.openapi-generator/VERSION | 2 +- .../csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION | 2 +- .../OpenAPIClientCoreAndNet47/.openapi-generator/VERSION | 2 +- .../petstore/csharp/OpenAPIClient/.openapi-generator/VERSION | 2 +- samples/client/petstore/elixir/.openapi-generator/VERSION | 2 +- .../petstore/elixir/lib/openapi_petstore/api/another_fake.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/api/default.ex | 2 +- samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex | 2 +- .../elixir/lib/openapi_petstore/api/fake_classname_tags123.ex | 2 +- samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/api/store.ex | 2 +- samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/connection.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/deserializer.ex | 2 +- .../lib/openapi_petstore/model/_foo_get_default_response.ex | 2 +- .../elixir/lib/openapi_petstore/model/_special_model_name_.ex | 2 +- .../lib/openapi_petstore/model/additional_properties_class.ex | 2 +- .../elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/animal.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/api_response.ex | 2 +- .../lib/openapi_petstore/model/array_of_array_of_number_only.ex | 2 +- .../elixir/lib/openapi_petstore/model/array_of_number_only.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/array_test.ex | 2 +- .../elixir/lib/openapi_petstore/model/capitalization.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/cat.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/category.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/class_model.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/client.ex | 2 +- .../elixir/lib/openapi_petstore/model/deprecated_object.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/dog.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/enum_class.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/enum_test.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/file.ex | 2 +- .../elixir/lib/openapi_petstore/model/file_schema_test_class.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/foo.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/format_test.ex | 2 +- .../elixir/lib/openapi_petstore/model/has_only_read_only.ex | 2 +- .../elixir/lib/openapi_petstore/model/health_check_result.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/list.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/map_test.ex | 2 +- .../model/mixed_properties_and_additional_properties_class.ex | 2 +- .../elixir/lib/openapi_petstore/model/model_200_response.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/name.ex | 2 +- .../elixir/lib/openapi_petstore/model/nullable_class.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/number_only.ex | 2 +- .../lib/openapi_petstore/model/object_with_deprecated_fields.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/order.ex | 2 +- .../elixir/lib/openapi_petstore/model/outer_composite.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/model/outer_enum.ex | 2 +- .../lib/openapi_petstore/model/outer_enum_default_value.ex | 2 +- .../elixir/lib/openapi_petstore/model/outer_enum_integer.ex | 2 +- .../openapi_petstore/model/outer_enum_integer_default_value.ex | 2 +- .../openapi_petstore/model/outer_object_with_enum_property.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/pet.ex | 2 +- .../elixir/lib/openapi_petstore/model/read_only_first.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/return.ex | 2 +- .../elixir/lib/openapi_petstore/model/single_ref_type.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/tag.ex | 2 +- .../client/petstore/elixir/lib/openapi_petstore/model/user.ex | 2 +- .../petstore/elixir/lib/openapi_petstore/request_builder.ex | 2 +- .../client/petstore/erlang-client/.openapi-generator/VERSION | 2 +- .../client/petstore/erlang-proper/.openapi-generator/VERSION | 2 +- .../client/petstore/go/go-petstore/.openapi-generator/VERSION | 2 +- samples/client/petstore/groovy/.openapi-generator/VERSION | 2 +- .../petstore/haskell-http-client/.openapi-generator/VERSION | 2 +- .../petstore/java-helidon-client/mp/.openapi-generator/VERSION | 2 +- .../petstore/java-helidon-client/se/.openapi-generator/VERSION | 2 +- .../petstore/java-micronaut-client/.openapi-generator/VERSION | 2 +- .../petstore/java/apache-httpclient/.openapi-generator/VERSION | 2 +- .../petstore/java/feign-no-nullable/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/feign/.openapi-generator/VERSION | 2 +- .../petstore/java/google-api-client/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/jersey1/.openapi-generator/VERSION | 2 +- .../java/jersey2-java8-localdatetime/.openapi-generator/VERSION | 2 +- .../petstore/java/jersey2-java8/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/jersey3/.openapi-generator/VERSION | 2 +- .../microprofile-rest-client-3.0/.openapi-generator/VERSION | 2 +- .../java/microprofile-rest-client/.openapi-generator/VERSION | 2 +- .../petstore/java/native-async/.openapi-generator/VERSION | 2 +- .../petstore/java/native-jakarta/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/native/.openapi-generator/VERSION | 2 +- .../java/okhttp-gson-awsv4signature/.openapi-generator/VERSION | 2 +- .../okhttp-gson-dynamicOperations/.openapi-generator/VERSION | 2 +- .../java/okhttp-gson-group-parameter/.openapi-generator/VERSION | 2 +- .../java/okhttp-gson-parcelableModel/.openapi-generator/VERSION | 2 +- .../java/okhttp-gson-swagger1/.openapi-generator/VERSION | 2 +- .../client/petstore/java/okhttp-gson/.openapi-generator/VERSION | 2 +- .../java/rest-assured-jackson/.openapi-generator/VERSION | 2 +- .../petstore/java/rest-assured/.openapi-generator/VERSION | 2 +- .../client/petstore/java/resteasy/.openapi-generator/VERSION | 2 +- .../java/resttemplate-jakarta/.openapi-generator/VERSION | 2 +- .../java/resttemplate-swagger1/.openapi-generator/VERSION | 2 +- .../java/resttemplate-withXml/.openapi-generator/VERSION | 2 +- .../petstore/java/resttemplate/.openapi-generator/VERSION | 2 +- .../petstore/java/retrofit2-play26/.openapi-generator/VERSION | 2 +- .../client/petstore/java/retrofit2/.openapi-generator/VERSION | 2 +- .../petstore/java/retrofit2rx2/.openapi-generator/VERSION | 2 +- .../petstore/java/retrofit2rx3/.openapi-generator/VERSION | 2 +- .../petstore/java/vertx-no-nullable/.openapi-generator/VERSION | 2 +- samples/client/petstore/java/vertx/.openapi-generator/VERSION | 2 +- .../petstore/java/webclient-jakarta/.openapi-generator/VERSION | 2 +- .../java/webclient-nullable-arrays/.openapi-generator/VERSION | 2 +- .../client/petstore/java/webclient/.openapi-generator/VERSION | 2 +- .../petstore/javascript-apollo/.openapi-generator/VERSION | 2 +- .../client/petstore/javascript-es6/.openapi-generator/VERSION | 2 +- .../petstore/javascript-promise-es6/.openapi-generator/VERSION | 2 +- .../petstore/jetbrains/http/client/.openapi-generator/VERSION | 2 +- samples/client/petstore/julia/.openapi-generator/VERSION | 2 +- samples/client/petstore/k6/.openapi-generator/VERSION | 2 +- samples/client/petstore/k6/script.js | 2 +- .../kotlin-allOff-discriminator/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin-default-values-jvm-volley/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin-enum-default-value/.openapi-generator/VERSION | 2 +- samples/client/petstore/kotlin-gson/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-jackson/.openapi-generator/VERSION | 2 +- .../kotlin-json-request-string/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION | 2 +- .../kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin-jvm-vertx-jackson/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-jvm-volley/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-modelMutable/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-moshi-codegen/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-multiplatform/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-nonpublic/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-nullable/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-okhttp3/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-retrofit2/.openapi-generator/VERSION | 2 +- .../client/petstore/kotlin-string/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-threetenbp/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-uppercase-enum/.openapi-generator/VERSION | 2 +- samples/client/petstore/kotlin/.openapi-generator/VERSION | 2 +- samples/client/petstore/lua/.openapi-generator/VERSION | 2 +- samples/client/petstore/nim/.openapi-generator/VERSION | 2 +- .../client/petstore/objc/core-data/.openapi-generator/VERSION | 2 +- samples/client/petstore/objc/default/.openapi-generator/VERSION | 2 +- samples/client/petstore/perl/.openapi-generator/VERSION | 2 +- .../client/petstore/php-dt-modern/.openapi-generator/VERSION | 2 +- samples/client/petstore/php-dt/.openapi-generator/VERSION | 2 +- .../petstore/php/OpenAPIClient-php/.openapi-generator/VERSION | 2 +- .../petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php | 2 +- .../php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/ApiException.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Configuration.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/HeaderSelector.php | 2 +- .../OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php | 2 +- .../php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php | 2 +- .../OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php | 2 +- .../php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/Category.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Client.php | 2 +- .../php/OpenAPIClient-php/lib/Model/DeprecatedObject.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/File.php | 2 +- .../php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php | 2 +- .../php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php | 2 +- .../php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php | 2 +- .../php/OpenAPIClient-php/lib/Model/HealthCheckResult.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php | 2 +- .../lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Model200Response.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ModelList.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Name.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php | 2 +- .../OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/Order.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php | 2 +- .../php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php | 2 +- .../php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php | 2 +- .../lib/Model/OuterEnumIntegerDefaultValue.php | 2 +- .../OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php | 2 +- .../php/OpenAPIClient-php/lib/Model/SpecialModelName.php | 2 +- samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php | 2 +- .../client/petstore/php/OpenAPIClient-php/lib/Model/User.php | 2 +- .../petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php | 2 +- samples/client/petstore/powershell/.openapi-generator/VERSION | 2 +- .../client/petstore/python-asyncio/.openapi-generator/VERSION | 2 +- .../client/petstore/python-legacy/.openapi-generator/VERSION | 2 +- samples/client/petstore/python-prior/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../client/petstore/python-tornado/.openapi-generator/VERSION | 2 +- .../client/petstore/ruby-autoload/.openapi-generator/VERSION | 2 +- samples/client/petstore/ruby-autoload/lib/petstore.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/api/default_api.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb | 2 +- .../lib/petstore/api/fake_classname_tags123_api.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/api/store_api.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/api/user_api.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/api_client.rb | 2 +- samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/configuration.rb | 2 +- .../lib/petstore/models/additional_properties_class.rb | 2 +- .../ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/animal.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/api_response.rb | 2 +- .../lib/petstore/models/array_of_array_of_number_only.rb | 2 +- .../ruby-autoload/lib/petstore/models/array_of_number_only.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/array_test.rb | 2 +- .../ruby-autoload/lib/petstore/models/capitalization.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/cat.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/category.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/class_model.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/client.rb | 2 +- .../ruby-autoload/lib/petstore/models/deprecated_object.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/dog.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/enum_class.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/enum_test.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/file.rb | 2 +- .../ruby-autoload/lib/petstore/models/file_schema_test_class.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/foo.rb | 2 +- .../lib/petstore/models/foo_get_default_response.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/format_test.rb | 2 +- .../ruby-autoload/lib/petstore/models/has_only_read_only.rb | 2 +- .../ruby-autoload/lib/petstore/models/health_check_result.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/list.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/map_test.rb | 2 +- .../models/mixed_properties_and_additional_properties_class.rb | 2 +- .../ruby-autoload/lib/petstore/models/model200_response.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/model_return.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/name.rb | 2 +- .../ruby-autoload/lib/petstore/models/nullable_class.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/number_only.rb | 2 +- .../lib/petstore/models/object_with_deprecated_fields.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/order.rb | 2 +- .../ruby-autoload/lib/petstore/models/outer_composite.rb | 2 +- .../petstore/ruby-autoload/lib/petstore/models/outer_enum.rb | 2 +- .../lib/petstore/models/outer_enum_default_value.rb | 2 +- .../ruby-autoload/lib/petstore/models/outer_enum_integer.rb | 2 +- .../lib/petstore/models/outer_enum_integer_default_value.rb | 2 +- .../lib/petstore/models/outer_object_with_enum_property.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/pet.rb | 2 +- .../ruby-autoload/lib/petstore/models/read_only_first.rb | 2 +- .../ruby-autoload/lib/petstore/models/single_ref_type.rb | 2 +- .../ruby-autoload/lib/petstore/models/special_model_name.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/tag.rb | 2 +- .../client/petstore/ruby-autoload/lib/petstore/models/user.rb | 2 +- samples/client/petstore/ruby-autoload/lib/petstore/version.rb | 2 +- samples/client/petstore/ruby-autoload/petstore.gemspec | 2 +- samples/client/petstore/ruby-autoload/spec/api_client_spec.rb | 2 +- .../client/petstore/ruby-autoload/spec/configuration_spec.rb | 2 +- samples/client/petstore/ruby-autoload/spec/spec_helper.rb | 2 +- samples/client/petstore/ruby-faraday/.openapi-generator/VERSION | 2 +- samples/client/petstore/ruby-faraday/lib/petstore.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/api/default_api.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb | 2 +- .../ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/api/store_api.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/api/user_api.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/configuration.rb | 2 +- .../lib/petstore/models/additional_properties_class.rb | 2 +- .../ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/animal.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/api_response.rb | 2 +- .../lib/petstore/models/array_of_array_of_number_only.rb | 2 +- .../ruby-faraday/lib/petstore/models/array_of_number_only.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/array_test.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/capitalization.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/category.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/class_model.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/client.rb | 2 +- .../ruby-faraday/lib/petstore/models/deprecated_object.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/enum_class.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/enum_test.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/file.rb | 2 +- .../ruby-faraday/lib/petstore/models/file_schema_test_class.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb | 2 +- .../lib/petstore/models/foo_get_default_response.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/format_test.rb | 2 +- .../ruby-faraday/lib/petstore/models/has_only_read_only.rb | 2 +- .../ruby-faraday/lib/petstore/models/health_check_result.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/list.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/map_test.rb | 2 +- .../models/mixed_properties_and_additional_properties_class.rb | 2 +- .../ruby-faraday/lib/petstore/models/model200_response.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/model_return.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/name.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/nullable_class.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/number_only.rb | 2 +- .../lib/petstore/models/object_with_deprecated_fields.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/order.rb | 2 +- .../ruby-faraday/lib/petstore/models/outer_composite.rb | 2 +- .../petstore/ruby-faraday/lib/petstore/models/outer_enum.rb | 2 +- .../lib/petstore/models/outer_enum_default_value.rb | 2 +- .../ruby-faraday/lib/petstore/models/outer_enum_integer.rb | 2 +- .../lib/petstore/models/outer_enum_integer_default_value.rb | 2 +- .../lib/petstore/models/outer_object_with_enum_property.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb | 2 +- .../ruby-faraday/lib/petstore/models/read_only_first.rb | 2 +- .../ruby-faraday/lib/petstore/models/single_ref_type.rb | 2 +- .../ruby-faraday/lib/petstore/models/special_model_name.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb | 2 +- .../client/petstore/ruby-faraday/lib/petstore/models/user.rb | 2 +- samples/client/petstore/ruby-faraday/lib/petstore/version.rb | 2 +- samples/client/petstore/ruby-faraday/petstore.gemspec | 2 +- samples/client/petstore/ruby-faraday/spec/api_client_spec.rb | 2 +- samples/client/petstore/ruby-faraday/spec/configuration_spec.rb | 2 +- samples/client/petstore/ruby-faraday/spec/spec_helper.rb | 2 +- samples/client/petstore/ruby/.openapi-generator/VERSION | 2 +- samples/client/petstore/ruby/lib/petstore.rb | 2 +- .../client/petstore/ruby/lib/petstore/api/another_fake_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/default_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/fake_api.rb | 2 +- .../ruby/lib/petstore/api/fake_classname_tags123_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/pet_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/store_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/user_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api_client.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api_error.rb | 2 +- samples/client/petstore/ruby/lib/petstore/configuration.rb | 2 +- .../ruby/lib/petstore/models/additional_properties_class.rb | 2 +- .../petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/animal.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/api_response.rb | 2 +- .../ruby/lib/petstore/models/array_of_array_of_number_only.rb | 2 +- .../petstore/ruby/lib/petstore/models/array_of_number_only.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/array_test.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/capitalization.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/cat.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/category.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/class_model.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/client.rb | 2 +- .../petstore/ruby/lib/petstore/models/deprecated_object.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/dog.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/enum_class.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/enum_test.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/file.rb | 2 +- .../petstore/ruby/lib/petstore/models/file_schema_test_class.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/foo.rb | 2 +- .../ruby/lib/petstore/models/foo_get_default_response.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/format_test.rb | 2 +- .../petstore/ruby/lib/petstore/models/has_only_read_only.rb | 2 +- .../petstore/ruby/lib/petstore/models/health_check_result.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/list.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/map_test.rb | 2 +- .../models/mixed_properties_and_additional_properties_class.rb | 2 +- .../petstore/ruby/lib/petstore/models/model200_response.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/model_return.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/name.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/nullable_class.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/number_only.rb | 2 +- .../ruby/lib/petstore/models/object_with_deprecated_fields.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/order.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/outer_composite.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb | 2 +- .../ruby/lib/petstore/models/outer_enum_default_value.rb | 2 +- .../petstore/ruby/lib/petstore/models/outer_enum_integer.rb | 2 +- .../lib/petstore/models/outer_enum_integer_default_value.rb | 2 +- .../ruby/lib/petstore/models/outer_object_with_enum_property.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/pet.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/read_only_first.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/single_ref_type.rb | 2 +- .../petstore/ruby/lib/petstore/models/special_model_name.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/tag.rb | 2 +- samples/client/petstore/ruby/lib/petstore/models/user.rb | 2 +- samples/client/petstore/ruby/lib/petstore/version.rb | 2 +- samples/client/petstore/ruby/petstore.gemspec | 2 +- samples/client/petstore/ruby/spec/api_client_spec.rb | 2 +- samples/client/petstore/ruby/spec/configuration_spec.rb | 2 +- samples/client/petstore/ruby/spec/spec_helper.rb | 2 +- .../petstore/rust/hyper/petstore/.openapi-generator/VERSION | 2 +- .../petstore-async-middleware/.openapi-generator/VERSION | 2 +- .../rust/reqwest/petstore-async/.openapi-generator/VERSION | 2 +- .../reqwest/petstore-awsv4signature/.openapi-generator/VERSION | 2 +- .../petstore/rust/reqwest/petstore/.openapi-generator/VERSION | 2 +- samples/client/petstore/scala-akka/.openapi-generator/VERSION | 2 +- .../scala-httpclient-deprecated/.openapi-generator/VERSION | 2 +- samples/client/petstore/scala-sttp/.openapi-generator/VERSION | 2 +- .../petstore/spring-cloud-date-time/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/DefaultApi.java | 2 +- .../spring-cloud-feign-without-url/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- samples/client/petstore/spring-cloud/.openapi-generator/VERSION | 2 +- .../spring-cloud/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../spring-http-interface-reactive/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTags123Api.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../configuration/HttpInterfacesAbstractConfigurator.java | 2 +- .../petstore/spring-http-interface/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTags123Api.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../configuration/HttpInterfacesAbstractConfigurator.java | 2 +- .../petstore/swift5/alamofireLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/anycodable/.openapi-generator/VERSION | 2 +- .../swift5/asyncAwaitLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/combineLibrary/.openapi-generator/VERSION | 2 +- .../client/petstore/swift5/default/.openapi-generator/VERSION | 2 +- .../petstore/swift5/deprecated/.openapi-generator/VERSION | 2 +- .../petstore/swift5/frozenEnums/.openapi-generator/VERSION | 2 +- .../petstore/swift5/nonPublicApi/.openapi-generator/VERSION | 2 +- .../petstore/swift5/objcCompatible/.openapi-generator/VERSION | 2 +- samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION | 2 +- .../swift5/promisekitLibrary/.openapi-generator/VERSION | 2 +- .../swift5/readonlyProperties/.openapi-generator/VERSION | 2 +- .../petstore/swift5/resultLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION | 2 +- .../swift5/urlsessionLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/validation/.openapi-generator/VERSION | 2 +- .../petstore/swift5/vaporLibrary/.openapi-generator/VERSION | 2 +- .../petstore/swift5/x-swift-hashable/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../typescript-aurelia/default/.openapi-generator/VERSION | 2 +- .../builds/composed-schemas/.openapi-generator/VERSION | 2 +- .../typescript-axios/builds/default/.openapi-generator/VERSION | 2 +- .../builds/es6-target/.openapi-generator/VERSION | 2 +- .../builds/test-petstore/.openapi-generator/VERSION | 2 +- .../builds/with-complex-headers/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/with-interfaces/.openapi-generator/VERSION | 2 +- .../builds/with-node-imports/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../with-single-request-parameters/.openapi-generator/VERSION | 2 +- .../builds/with-string-enums/.openapi-generator/VERSION | 2 +- .../builds/allOf-nullable/.openapi-generator/VERSION | 2 +- .../builds/allOf-readonly/.openapi-generator/VERSION | 2 +- .../builds/default-v3.0/.openapi-generator/VERSION | 2 +- .../typescript-fetch/builds/default/.openapi-generator/VERSION | 2 +- .../typescript-fetch/builds/enum/.openapi-generator/VERSION | 2 +- .../builds/es6-target/.openapi-generator/VERSION | 2 +- .../builds/multiple-parameters/.openapi-generator/VERSION | 2 +- .../prefix-parameter-interfaces/.openapi-generator/VERSION | 2 +- .../builds/sagas-and-records/.openapi-generator/VERSION | 2 +- .../builds/with-interfaces/.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../builds/with-string-enums/.openapi-generator/VERSION | 2 +- .../builds/without-runtime-checks/.openapi-generator/VERSION | 2 +- .../petstore/typescript-inversify/.openapi-generator/VERSION | 2 +- .../typescript-jquery/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript-jquery/npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript-node/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript-node/npm/.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../typescript-rxjs/builds/default/.openapi-generator/VERSION | 2 +- .../builds/es6-target/.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../builds/with-progress-subscriber/.openapi-generator/VERSION | 2 +- .../config/petstore/protobuf-schema/.openapi-generator/VERSION | 2 +- samples/meta-codegen/lib/pom.xml | 2 +- samples/meta-codegen/usage/.openapi-generator/VERSION | 2 +- .../client/3_0_3_unit_test/python/.openapi-generator/VERSION | 2 +- samples/openapi3/client/elm/.openapi-generator/VERSION | 2 +- .../x-auth-id-alias/go-experimental/.openapi-generator/VERSION | 2 +- .../java/jersey2-java8/.openapi-generator/VERSION | 2 +- .../x-auth-id-alias/python-prior/.openapi-generator/VERSION | 2 +- .../x-auth-id-alias/ruby-client/.openapi-generator/VERSION | 2 +- .../x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/api/usage_api.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/api_client.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/api_error.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/configuration.rb | 2 +- .../x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb | 2 +- .../x-auth-id-alias/ruby-client/spec/api_client_spec.rb | 2 +- .../x-auth-id-alias/ruby-client/spec/configuration_spec.rb | 2 +- .../extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb | 2 +- .../x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec | 2 +- .../features/dynamic-servers/python/.openapi-generator/VERSION | 2 +- .../features/dynamic-servers/ruby/.openapi-generator/VERSION | 2 +- .../features/dynamic-servers/ruby/dynamic_servers.gemspec | 2 +- .../client/features/dynamic-servers/ruby/lib/dynamic_servers.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/api_client.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/api_error.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/configuration.rb | 2 +- .../dynamic-servers/ruby/lib/dynamic_servers/version.rb | 2 +- .../features/dynamic-servers/ruby/spec/api_client_spec.rb | 2 +- .../features/dynamic-servers/ruby/spec/configuration_spec.rb | 2 +- .../client/features/dynamic-servers/ruby/spec/spec_helper.rb | 2 +- .../ruby-client/.openapi-generator/VERSION | 2 +- .../generate-alias-as-model/ruby-client/lib/petstore.rb | 2 +- .../ruby-client/lib/petstore/api/usage_api.rb | 2 +- .../ruby-client/lib/petstore/api_client.rb | 2 +- .../ruby-client/lib/petstore/api_error.rb | 2 +- .../ruby-client/lib/petstore/configuration.rb | 2 +- .../ruby-client/lib/petstore/models/array_alias.rb | 2 +- .../ruby-client/lib/petstore/models/map_alias.rb | 2 +- .../generate-alias-as-model/ruby-client/lib/petstore/version.rb | 2 +- .../generate-alias-as-model/ruby-client/petstore.gemspec | 2 +- .../generate-alias-as-model/ruby-client/spec/api_client_spec.rb | 2 +- .../ruby-client/spec/configuration_spec.rb | 2 +- .../generate-alias-as-model/ruby-client/spec/spec_helper.rb | 2 +- .../client/petstore/dart-dio/oneof/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../dart-dio/oneof_primitive/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore_client_lib_fake/.openapi-generator/VERSION | 2 +- .../dart2/petstore_client_lib/.openapi-generator/VERSION | 2 +- .../dart2/petstore_client_lib_fake/.openapi-generator/VERSION | 2 +- .../client/petstore/go/go-petstore/.openapi-generator/VERSION | 2 +- .../jersey2-java8-special-characters/.openapi-generator/VERSION | 2 +- .../java/jersey2-java8-swagger1/.openapi-generator/VERSION | 2 +- .../petstore/java/jersey2-java8/.openapi-generator/VERSION | 2 +- .../client/petstore/python-legacy/.openapi-generator/VERSION | 2 +- .../petstore/python-nextgen-aiohttp/.openapi-generator/VERSION | 2 +- .../client/petstore/python-nextgen/.openapi-generator/VERSION | 2 +- .../client/petstore/python-prior/.openapi-generator/VERSION | 2 +- .../openapi3/client/petstore/python/.openapi-generator/VERSION | 2 +- .../client/petstore/spring-cloud-3/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/spring-cloud-async/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/spring-cloud-date-time/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/DefaultApi.java | 2 +- .../spring-cloud-oas3-fakeapi/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTags123Api.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../spring-cloud-spring-pageable/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../client/petstore/spring-cloud/.openapi-generator/VERSION | 2 +- .../spring-cloud/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../client/petstore/spring-stubs/.openapi-generator/VERSION | 2 +- .../spring-stubs/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../typescript/builds/browser/.openapi-generator/VERSION | 2 +- .../builds/composed-schemas/.openapi-generator/VERSION | 2 +- .../typescript/builds/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript/builds/deno/.openapi-generator/VERSION | 2 +- .../typescript/builds/inversify/.openapi-generator/VERSION | 2 +- .../typescript/builds/jquery/.openapi-generator/VERSION | 2 +- .../typescript/builds/object_params/.openapi-generator/VERSION | 2 +- .../schema/petstore/avro-schema/.openapi-generator/VERSION | 2 +- .../petstore/spring-boot-oneof/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/BarApi.java | 2 +- .../src/main/java/org/openapitools/api/FooApi.java | 2 +- .../petstore/spring-boot-springdoc/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../server/petstore/springboot-3/.openapi-generator/VERSION | 2 +- .../springboot-3/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-delegate/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../springboot-implicitHeaders/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-source/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../server/petstore/springboot/.openapi-generator/VERSION | 2 +- .../springboot/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/ktorm-modelMutable/.openapi-generator/VERSION | 2 +- samples/schema/petstore/ktorm/.openapi-generator/VERSION | 2 +- samples/schema/petstore/mysql/.openapi-generator/VERSION | 2 +- samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION | 2 +- .../server/petstore/aspnetcore-3.0/.openapi-generator/VERSION | 2 +- .../server/petstore/aspnetcore-3.1/.openapi-generator/VERSION | 2 +- .../server/petstore/aspnetcore-5.0/.openapi-generator/VERSION | 2 +- .../aspnetcore-6.0-pocoModels/.openapi-generator/VERSION | 2 +- .../aspnetcore-6.0-project4Models/.openapi-generator/VERSION | 2 +- .../server/petstore/aspnetcore-6.0/.openapi-generator/VERSION | 2 +- samples/server/petstore/aspnetcore/.openapi-generator/VERSION | 2 +- samples/server/petstore/cpp-pistache/.openapi-generator/VERSION | 2 +- .../cpp-qt-qhttpengine-server/.openapi-generator/VERSION | 2 +- .../cpp-restbed/generated/3_0/.openapi-generator/VERSION | 2 +- .../petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h | 2 +- .../petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h | 2 +- .../cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp | 2 +- .../cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h | 2 +- .../generated/3_0/model/AdditionalPropertiesClass.cpp | 2 +- .../cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h | 2 +- .../cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp | 2 +- .../cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Animal.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/ApiResponse.h | 2 +- .../generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp | 2 +- .../cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h | 2 +- .../cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp | 2 +- .../cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/Capitalization.h | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/Category.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Category.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/ClassModel.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Client.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Client.h | 2 +- .../cpp-restbed/generated/3_0/model/DeprecatedObject.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/EnumArrays.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/File.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/File.h | 2 +- .../cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp | 2 +- .../cpp-restbed/generated/3_0/model/FileSchemaTestClass.h | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/Format_test.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/Format_test.h | 2 +- .../cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h | 2 +- .../cpp-restbed/generated/3_0/model/HealthCheckResult.cpp | 2 +- .../cpp-restbed/generated/3_0/model/HealthCheckResult.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/List.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/List.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/MapTest.h | 2 +- .../3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp | 2 +- .../3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Name.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/NullableClass.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/NumberOnly.h | 2 +- .../generated/3_0/model/ObjectWithDeprecatedFields.cpp | 2 +- .../generated/3_0/model/ObjectWithDeprecatedFields.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Order.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/OuterComposite.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h | 2 +- .../cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp | 2 +- .../cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h | 2 +- .../cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h | 2 +- .../generated/3_0/model/OuterEnumIntegerDefaultValue.cpp | 2 +- .../generated/3_0/model/OuterEnumIntegerDefaultValue.h | 2 +- .../generated/3_0/model/OuterObjectWithEnumProperty.cpp | 2 +- .../generated/3_0/model/OuterObjectWithEnumProperty.h | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Return.cpp | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/Return.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/SingleRefType.h | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/User.cpp | 2 +- samples/server/petstore/cpp-restbed/generated/3_0/model/User.h | 2 +- .../generated/3_0/model/_foo_get_default_response.cpp | 2 +- .../cpp-restbed/generated/3_0/model/_foo_get_default_response.h | 2 +- .../cpp-restbed/generated/3_0/model/_special_model_name_.cpp | 2 +- .../cpp-restbed/generated/3_0/model/_special_model_name_.h | 2 +- .../server/petstore/cpp-restbed/generated/3_0/model/helpers.h | 2 +- .../petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp | 2 +- .../petstore/cpp-restbed/generated/3_0/model/r_200_response.h | 2 +- .../server/petstore/erlang-server/.openapi-generator/VERSION | 2 +- .../server/petstore/go-api-server/.openapi-generator/VERSION | 2 +- .../server/petstore/go-chi-server/.openapi-generator/VERSION | 2 +- .../server/petstore/go-echo-server/.openapi-generator/VERSION | 2 +- .../petstore/go-gin-api-server/.openapi-generator/VERSION | 2 +- .../petstore/go-server-required/.openapi-generator/VERSION | 2 +- .../server/petstore/haskell-servant/.openapi-generator/VERSION | 2 +- .../server/petstore/haskell-yesod/.openapi-generator/VERSION | 2 +- samples/server/petstore/java-camel/.openapi-generator/VERSION | 2 +- samples/server/petstore/java-camel/pom.xml | 2 +- .../src/main/java/org/openapitools/RestConfiguration.java | 2 +- .../main/java/org/openapitools/ValidationErrorProcessor.java | 2 +- .../java-camel/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApiRoutesImpl.java | 2 +- .../src/main/java/org/openapitools/api/PetApiValidator.java | 2 +- .../java-camel/src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApiRoutesImpl.java | 2 +- .../src/main/java/org/openapitools/api/StoreApiValidator.java | 2 +- .../java-camel/src/main/java/org/openapitools/api/UserApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApiRoutesImpl.java | 2 +- .../src/main/java/org/openapitools/api/UserApiValidator.java | 2 +- .../java-camel/src/main/resources/application.properties | 2 +- .../petstore/java-helidon-server/mp/.openapi-generator/VERSION | 2 +- .../petstore/java-helidon-server/se/.openapi-generator/VERSION | 2 +- .../petstore/java-micronaut-server/.openapi-generator/VERSION | 2 +- samples/server/petstore/java-msf4j/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java-play-framework-async/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java-play-framework-no-interface/.openapi-generator/VERSION | 2 +- .../java-play-framework-no-nullable/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore/java-play-framework/.openapi-generator/VERSION | 2 +- .../server/petstore/java-undertow/.openapi-generator/VERSION | 2 +- .../server/petstore/java-vertx-web/.openapi-generator/VERSION | 2 +- .../jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION | 2 +- .../server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION | 2 +- .../jaxrs-cxf-non-spring-app/.openapi-generator/VERSION | 2 +- samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION | 2 +- .../server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION | 2 +- samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/default/.openapi-generator/VERSION | 2 +- .../jaxrs-resteasy/eap-java8/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-spec-interface/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION | 2 +- .../server/petstore/jaxrs/jersey1/.openapi-generator/VERSION | 2 +- .../petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION | 2 +- .../server/petstore/jaxrs/jersey2/.openapi-generator/VERSION | 2 +- samples/server/petstore/julia/.openapi-generator/VERSION | 2 +- .../kotlin-server-modelMutable/.openapi-generator/VERSION | 2 +- samples/server/petstore/kotlin-server-modelMutable/README.md | 2 +- .../kotlin-server/jaxrs-spec/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-server/ktor/.openapi-generator/VERSION | 2 +- samples/server/petstore/kotlin-server/ktor/README.md | 2 +- .../petstore/kotlin-springboot-3/.openapi-generator/VERSION | 2 +- .../kotlin-springboot-delegate/.openapi-generator/VERSION | 2 +- .../src/main/kotlin/org/openapitools/api/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApi.kt | 2 +- .../kotlin-springboot-modelMutable/.openapi-generator/VERSION | 2 +- .../kotlin-springboot-reactive/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin-springboot-springfox/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-springboot/.openapi-generator/VERSION | 2 +- .../kotlin-vertx-modelMutable/.openapi-generator/VERSION | 2 +- samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION | 2 +- samples/server/petstore/php-laravel/.openapi-generator/VERSION | 2 +- samples/server/petstore/php-lumen/.openapi-generator/VERSION | 2 +- .../petstore/php-mezzio-ph-modern/.openapi-generator/VERSION | 2 +- .../server/petstore/php-mezzio-ph/.openapi-generator/VERSION | 2 +- samples/server/petstore/php-slim4/.openapi-generator/VERSION | 2 +- .../php-symfony/SymfonyBundle-php/.openapi-generator/VERSION | 2 +- .../python-aiohttp-srclayout/.openapi-generator/VERSION | 2 +- .../server/petstore/python-aiohttp/.openapi-generator/VERSION | 2 +- .../petstore/python-blueplanet/.openapi-generator/VERSION | 2 +- .../server/petstore/python-fastapi/.openapi-generator/VERSION | 2 +- samples/server/petstore/python-flask/.openapi-generator/VERSION | 2 +- .../rust-server/output/multipart-v3/.openapi-generator/VERSION | 2 +- .../rust-server/output/no-example-v3/.openapi-generator/VERSION | 2 +- .../rust-server/output/openapi-v3/.openapi-generator/VERSION | 2 +- .../rust-server/output/ops-v3/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../output/ping-bearer-auth/.openapi-generator/VERSION | 2 +- .../output/rust-server-test/.openapi-generator/VERSION | 2 +- .../petstore/scala-akka-http-server/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../spring-boot-nullable-set/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/NullableApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../springboot-beanvalidation/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-delegate-j8/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-delegate/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../springboot-implicitHeaders/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-reactive/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../src/main/java/org/openapitools/api/VersioningApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../src/main/java/org/openapitools/api/VersioningApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../src/main/java/org/openapitools/api/VersioningApi.java | 2 +- .../springboot-spring-pageable/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../src/main/java/org/openapitools/api/VersioningApi.java | 2 +- .../petstore/springboot-useoptional/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/UserApi.java | 2 +- .../petstore/springboot-virtualan/.openapi-generator/VERSION | 2 +- .../java/org/openapitools/virtualan/api/AnotherFakeApi.java | 2 +- .../src/main/java/org/openapitools/virtualan/api/FakeApi.java | 2 +- .../org/openapitools/virtualan/api/FakeClassnameTestApi.java | 2 +- .../src/main/java/org/openapitools/virtualan/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/virtualan/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/virtualan/api/UserApi.java | 2 +- samples/server/petstore/springboot/.openapi-generator/VERSION | 2 +- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/FakeApi.java | 2 +- .../main/java/org/openapitools/api/FakeClassnameTestApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/PetApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../springboot/src/main/java/org/openapitools/api/UserApi.java | 2 +- 1089 files changed, 1089 insertions(+), 1089 deletions(-) diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index e2c8879ee68..abf36d67438 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 6.5.0-SNAPSHOT + 6.5.0 ../.. diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index 1e394545e11..4ca3831e4b7 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -6,7 +6,7 @@ openapi-generator-project org.openapitools - 6.5.0-SNAPSHOT + 6.5.0 ../.. diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index f0f0e851557..3f3ca321b0b 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=6.5.0-SNAPSHOT +openApiGeneratorVersion=6.5.0 # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index b3efdf9706a..1fe1fccfb83 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 6.5.0-SNAPSHOT + 6.5.0 ../.. diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties index 267435b1a4f..048c0017ea6 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties @@ -1,3 +1,3 @@ # RELEASE_VERSION -openApiGeneratorVersion=6.5.0-SNAPSHOT +openApiGeneratorVersion=6.5.0 # /RELEASE_VERSION diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml index c08e9f54908..dea230f2dd2 100644 --- a/modules/openapi-generator-maven-plugin/examples/java-client.xml +++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0-SNAPSHOT + 6.5.0 diff --git a/modules/openapi-generator-maven-plugin/examples/kotlin.xml b/modules/openapi-generator-maven-plugin/examples/kotlin.xml index e084401a9ec..c587caf0099 100644 --- a/modules/openapi-generator-maven-plugin/examples/kotlin.xml +++ b/modules/openapi-generator-maven-plugin/examples/kotlin.xml @@ -15,7 +15,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0-SNAPSHOT + 6.5.0 diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml index 646168963fb..679e5be1f90 100644 --- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml +++ b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml @@ -19,7 +19,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0-SNAPSHOT + 6.5.0 diff --git a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml index 40556495616..85c7bdc7ba0 100644 --- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml +++ b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0-SNAPSHOT + 6.5.0 diff --git a/modules/openapi-generator-maven-plugin/examples/non-java.xml b/modules/openapi-generator-maven-plugin/examples/non-java.xml index cdf9dbdd458..f7d34409339 100644 --- a/modules/openapi-generator-maven-plugin/examples/non-java.xml +++ b/modules/openapi-generator-maven-plugin/examples/non-java.xml @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0-SNAPSHOT + 6.5.0 diff --git a/modules/openapi-generator-maven-plugin/examples/spring.xml b/modules/openapi-generator-maven-plugin/examples/spring.xml index dd8c7ca42b0..e7d7e880e78 100644 --- a/modules/openapi-generator-maven-plugin/examples/spring.xml +++ b/modules/openapi-generator-maven-plugin/examples/spring.xml @@ -20,7 +20,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0-SNAPSHOT + 6.5.0 diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index 8cfba980ade..a7d97a06f9d 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ org.openapitools openapi-generator-project - 6.5.0-SNAPSHOT + 6.5.0 ../.. diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index f192cf1f40d..6c60abd40e7 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 6.5.0-SNAPSHOT + 6.5.0 ../.. diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 7645217c8b3..d5829662d96 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 6.5.0-SNAPSHOT + 6.5.0 ../.. diff --git a/pom.xml b/pom.xml index 5bd7b38f536..f2995aed249 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ pom openapi-generator-project - 6.5.0-SNAPSHOT + 6.5.0 https://github.com/openapitools/openapi-generator diff --git a/samples/client/echo_api/java/apache-httpclient/.openapi-generator/VERSION b/samples/client/echo_api/java/apache-httpclient/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/echo_api/java/apache-httpclient/.openapi-generator/VERSION +++ b/samples/client/echo_api/java/apache-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/echo_api/java/feign-gson/.openapi-generator/VERSION b/samples/client/echo_api/java/feign-gson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/echo_api/java/feign-gson/.openapi-generator/VERSION +++ b/samples/client/echo_api/java/feign-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/echo_api/java/native/.openapi-generator/VERSION b/samples/client/echo_api/java/native/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/echo_api/java/native/.openapi-generator/VERSION +++ b/samples/client/echo_api/java/native/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/echo_api/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/echo_api/java/okhttp-gson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/echo_api/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/echo_api/java/okhttp-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/echo_api/python-nextgen/.openapi-generator/VERSION b/samples/client/echo_api/python-nextgen/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/echo_api/python-nextgen/.openapi-generator/VERSION +++ b/samples/client/echo_api/python-nextgen/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION b/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION +++ b/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/others/java/okhttp-gson-streaming/.openapi-generator/VERSION b/samples/client/others/java/okhttp-gson-streaming/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/others/java/okhttp-gson-streaming/.openapi-generator/VERSION +++ b/samples/client/others/java/okhttp-gson-streaming/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION +++ b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/others/typescript-rxjs/allOf-composition/.openapi-generator/VERSION b/samples/client/others/typescript-rxjs/allOf-composition/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/others/typescript-rxjs/allOf-composition/.openapi-generator/VERSION +++ b/samples/client/others/typescript-rxjs/allOf-composition/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/others/typescript/builds/with-unique-items/.openapi-generator/VERSION b/samples/client/others/typescript/builds/with-unique-items/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/others/typescript/builds/with-unique-items/.openapi-generator/VERSION +++ b/samples/client/others/typescript/builds/with-unique-items/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/R-httr2-wrapper/.openapi-generator/VERSION b/samples/client/petstore/R-httr2-wrapper/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/R-httr2-wrapper/.openapi-generator/VERSION +++ b/samples/client/petstore/R-httr2-wrapper/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/R-httr2/.openapi-generator/VERSION b/samples/client/petstore/R-httr2/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/R-httr2/.openapi-generator/VERSION +++ b/samples/client/petstore/R-httr2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/R/.openapi-generator/VERSION b/samples/client/petstore/R/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/R/.openapi-generator/VERSION +++ b/samples/client/petstore/R/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/apex/.openapi-generator/VERSION b/samples/client/petstore/apex/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/apex/.openapi-generator/VERSION +++ b/samples/client/petstore/apex/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/bash/.openapi-generator/VERSION b/samples/client/petstore/bash/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/bash/.openapi-generator/VERSION +++ b/samples/client/petstore/bash/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/c/.openapi-generator/VERSION b/samples/client/petstore/c/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/c/.openapi-generator/VERSION +++ b/samples/client/petstore/c/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/cpp-qt/.openapi-generator/VERSION b/samples/client/petstore/cpp-qt/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/cpp-qt/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-qt/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h index a5cc8f99011..cec56f9c460 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h index feaa0b73c9e..2282fa6d5fe 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h index cdabdedbb3a..3559ae0116e 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h index 0bc05e34dde..837a2ef3f7b 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/IHttpBody.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/IHttpBody.h index ef41d850941..5bd8270a5af 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/IHttpBody.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/IHttpBody.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h index 9de3ca1b864..449cdaf4452 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h index f97b2443403..907bbfbd748 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h index 002cf2b1da4..f99a88282c6 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h index 6bd21223807..b7a5bf05dbb 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h index 44512e59047..e73554b17be 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h index 111aab59de2..1e3e2a72f0a 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h index 57681cb279c..f3359418c23 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h index 3099837720c..bca114a7596 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h index 0766d498e28..3cc9f8868a0 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h index 97143df90c4..5afe6e4a831 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h index 8b33da8a9f0..44b435638de 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h index fb20ea251fd..95715810da5 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h index 72aa81f5c00..a16e36eba7a 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp index b39880d980a..ebfde091edf 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp index a16af5fa8d6..664911f7f63 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp b/samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp index cce5a9c6104..aa2ba2010c3 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp index f4b1988586f..f00a712f735 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp index 85fe9ff54f2..8506ad18c9b 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp index fb4a8c838f3..1f171a21481 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp index bedb1937fb3..7ac9e2e826d 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/Object.cpp b/samples/client/petstore/cpp-restsdk/client/src/Object.cpp index 2d13f9f0651..a8d2e67ca8d 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/Object.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/Object.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp index 7b1026959e0..f9b747d856f 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp index fd9515c98da..22019700f66 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp index fc98e65195e..eb20ccc64f9 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp index 079f05f8d97..eaeec321fda 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp index 8fd6ff51c84..5473fdc92c0 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp index 4553b3a7c9e..aeff2a406d8 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp index ff3a4c83af1..ef9ae2fef9d 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp index 8a014b2ff74..b9101a0bf2c 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/User.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/User.cpp index af8cf5d8bb4..1b9b59508d0 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/User.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/User.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION b/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION b/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/crystal/.openapi-generator/VERSION b/samples/client/petstore/crystal/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/crystal/.openapi-generator/VERSION +++ b/samples/client/petstore/crystal/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/crystal/.travis.yml b/samples/client/petstore/crystal/.travis.yml index ddd2c70eae5..686d6e796b0 100644 --- a/samples/client/petstore/crystal/.travis.yml +++ b/samples/client/petstore/crystal/.travis.yml @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # language: crystal diff --git a/samples/client/petstore/crystal/spec/spec_helper.cr b/samples/client/petstore/crystal/spec/spec_helper.cr index 3380c2e8889..1c1a0031d4d 100644 --- a/samples/client/petstore/crystal/spec/spec_helper.cr +++ b/samples/client/petstore/crystal/spec/spec_helper.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # # load modules diff --git a/samples/client/petstore/crystal/src/petstore.cr b/samples/client/petstore/crystal/src/petstore.cr index e9caae3f19d..c8cb5d0bb24 100644 --- a/samples/client/petstore/crystal/src/petstore.cr +++ b/samples/client/petstore/crystal/src/petstore.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # # Dependencies diff --git a/samples/client/petstore/crystal/src/petstore/api/pet_api.cr b/samples/client/petstore/crystal/src/petstore/api/pet_api.cr index 9d2109cdb38..4c46e9c40a6 100644 --- a/samples/client/petstore/crystal/src/petstore/api/pet_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/pet_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api/store_api.cr b/samples/client/petstore/crystal/src/petstore/api/store_api.cr index 75043790b4a..3e780fd6b4c 100644 --- a/samples/client/petstore/crystal/src/petstore/api/store_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/store_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api/user_api.cr b/samples/client/petstore/crystal/src/petstore/api/user_api.cr index d9b999a8776..68d15313d81 100644 --- a/samples/client/petstore/crystal/src/petstore/api/user_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/user_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api_client.cr b/samples/client/petstore/crystal/src/petstore/api_client.cr index 84bbe8cbe79..6e5ae7837c4 100644 --- a/samples/client/petstore/crystal/src/petstore/api_client.cr +++ b/samples/client/petstore/crystal/src/petstore/api_client.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/api_error.cr b/samples/client/petstore/crystal/src/petstore/api_error.cr index 7cc396147a1..b78f513ef71 100644 --- a/samples/client/petstore/crystal/src/petstore/api_error.cr +++ b/samples/client/petstore/crystal/src/petstore/api_error.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # module Petstore diff --git a/samples/client/petstore/crystal/src/petstore/configuration.cr b/samples/client/petstore/crystal/src/petstore/configuration.cr index f1fa230021b..4c501335f53 100644 --- a/samples/client/petstore/crystal/src/petstore/configuration.cr +++ b/samples/client/petstore/crystal/src/petstore/configuration.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "log" diff --git a/samples/client/petstore/crystal/src/petstore/models/api_response.cr b/samples/client/petstore/crystal/src/petstore/models/api_response.cr index 04012ce7905..fd5ea0be3a3 100644 --- a/samples/client/petstore/crystal/src/petstore/models/api_response.cr +++ b/samples/client/petstore/crystal/src/petstore/models/api_response.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/category.cr b/samples/client/petstore/crystal/src/petstore/models/category.cr index 04eb9a945bc..428ef301379 100644 --- a/samples/client/petstore/crystal/src/petstore/models/category.cr +++ b/samples/client/petstore/crystal/src/petstore/models/category.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/format_test.cr b/samples/client/petstore/crystal/src/petstore/models/format_test.cr index 0c8ce87c384..8df4ac4ff1a 100644 --- a/samples/client/petstore/crystal/src/petstore/models/format_test.cr +++ b/samples/client/petstore/crystal/src/petstore/models/format_test.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/order.cr b/samples/client/petstore/crystal/src/petstore/models/order.cr index e291c0740ea..6cef8c5b452 100644 --- a/samples/client/petstore/crystal/src/petstore/models/order.cr +++ b/samples/client/petstore/crystal/src/petstore/models/order.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/pet.cr b/samples/client/petstore/crystal/src/petstore/models/pet.cr index db68a1259b3..5172c2173fa 100644 --- a/samples/client/petstore/crystal/src/petstore/models/pet.cr +++ b/samples/client/petstore/crystal/src/petstore/models/pet.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/tag.cr b/samples/client/petstore/crystal/src/petstore/models/tag.cr index 3618bfed524..4c574a4270d 100644 --- a/samples/client/petstore/crystal/src/petstore/models/tag.cr +++ b/samples/client/petstore/crystal/src/petstore/models/tag.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/user.cr b/samples/client/petstore/crystal/src/petstore/models/user.cr index cf4d4cae93e..9930b2e6469 100644 --- a/samples/client/petstore/crystal/src/petstore/models/user.cr +++ b/samples/client/petstore/crystal/src/petstore/models/user.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0-SNAPSHOT +#OpenAPI Generator version: 6.5.0 # require "big" diff --git a/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/elixir/.openapi-generator/VERSION b/samples/client/petstore/elixir/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/elixir/.openapi-generator/VERSION +++ b/samples/client/petstore/elixir/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex index 45ed2cc0b70..7c8b744a7dc 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.AnotherFake do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex index ef8402b8af4..fe4bafec435 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.Default do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex index a470a4e1175..687094a7951 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.Fake do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex index 441e97608a1..28ae1468039 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.FakeClassnameTags123 do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex index d804618acf1..13bb1951f3b 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.Pet do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex index 245f11a06f4..b74063a0476 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.Store do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex index 56f14161730..87386e74892 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.User do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex b/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex index ed34d5718f9..4d6d692e618 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Connection do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex b/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex index 23ea8a89355..841f87aa33b 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Deserializer do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex index ec138b61f83..317c9ff45f7 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.FooGetDefaultResponse do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex index 8dfb7357eb7..181009267c1 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.SpecialModelName do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex index 75fffecbb51..8fd3ba6490d 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.AdditionalPropertiesClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex index cb9ace8ec80..3b74878d5b4 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.AllOfWithSingleRef do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex index 27a44330f37..f79cc858d91 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Animal do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex index c241603808a..45df5690a9c 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ApiResponse do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex index 16d6fc5bba9..ec16d149f63 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ArrayOfArrayOfNumberOnly do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex index e196704be99..d7e36cbd75c 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ArrayOfNumberOnly do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex index 29d3f87e0f9..60570660d9d 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ArrayTest do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex index f832778f557..b31f22c2e6b 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Capitalization do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex index d5b23f56611..690b76ab988 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Cat do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex index 4e8e998fca3..3e394a4bfe5 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.CatAllOf do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex index 3472576494e..82bb4a048b5 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Category do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex index e53247ab139..c53fd16e88a 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ClassModel do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex index 846568eba89..6648b0b0124 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Client do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex index bdd97a1acc2..ada9fddabe3 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.DeprecatedObject do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex index a940b190434..c6b50eba960 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Dog do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex index bea9b8fbdc5..0abe20d740d 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.DogAllOf do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex index c4441e1987a..309b5b8a381 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.EnumArrays do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex index f0080899895..6d20d6fc8c5 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.EnumClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex index 3ed56e17fc0..e91672a800c 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.EnumTest do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex index 402c105047d..9ac21d856ca 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.File do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex index 8a537b30f32..ba042adf37f 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.FileSchemaTestClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex index da7d7658778..d4b71553ddb 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Foo do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex index af1350996fd..eb17ed59b08 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.FormatTest do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex index 576f22e9c5c..43c83648a1b 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.HasOnlyReadOnly do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex index 1370fe6fd23..3cabaaa4144 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.HealthCheckResult do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex index d3900166fe4..a757a6145f8 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.List do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex index ff6159792f5..574f00099ca 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.MapTest do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex index ce45ec233c3..1a08c775ee3 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.MixedPropertiesAndAdditionalPropertiesClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex index ac92f06840e..173270ddf64 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Model200Response do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex index 1f8f5a592bb..7b53035c1ca 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Name do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex index 79795e863fe..9c47e9f1dce 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.NullableClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex index 00b3930754d..f709a1daf18 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.NumberOnly do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex index 5b48df74864..ac4784fab94 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ObjectWithDeprecatedFields do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex index b32a738e3b6..561f7b98731 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Order do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex index a032ef02249..7ec4d03184e 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterComposite do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex index 9b62fdd6f70..6d77bbd1d22 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterEnum do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex index 279020015f2..1ddc9dc0d18 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterEnumDefaultValue do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex index c86345362c6..d7b06f49969 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterEnumInteger do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex index be2b3ee63e9..4b891178501 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterEnumIntegerDefaultValue do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex index ea39d0dda56..1664fc67c0d 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterObjectWithEnumProperty do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex index df34c3e2512..dbd11a920cd 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Pet do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex index e955b30f3b1..a8e63f7aade 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ReadOnlyFirst do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex index a69a0033ff4..9a932f7b1d9 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Return do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex index 3e955aa479c..36b11b11183 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.SingleRefType do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex index aa147b4da2e..402f06b30d7 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Tag do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex index 12311f595d5..cce1ccab518 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.User do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex b/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex index ef1ab1f4cba..30a1063edc7 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0-SNAPSHOT (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.RequestBuilder do diff --git a/samples/client/petstore/erlang-client/.openapi-generator/VERSION b/samples/client/petstore/erlang-client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/erlang-client/.openapi-generator/VERSION +++ b/samples/client/petstore/erlang-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/erlang-proper/.openapi-generator/VERSION b/samples/client/petstore/erlang-proper/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/erlang-proper/.openapi-generator/VERSION +++ b/samples/client/petstore/erlang-proper/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/groovy/.openapi-generator/VERSION b/samples/client/petstore/groovy/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/groovy/.openapi-generator/VERSION +++ b/samples/client/petstore/groovy/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION +++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java-helidon-client/mp/.openapi-generator/VERSION b/samples/client/petstore/java-helidon-client/mp/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java-helidon-client/mp/.openapi-generator/VERSION +++ b/samples/client/petstore/java-helidon-client/mp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java-helidon-client/se/.openapi-generator/VERSION b/samples/client/petstore/java-helidon-client/se/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java-helidon-client/se/.openapi-generator/VERSION +++ b/samples/client/petstore/java-helidon-client/se/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/apache-httpclient/.openapi-generator/VERSION b/samples/client/petstore/java/apache-httpclient/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/apache-httpclient/.openapi-generator/VERSION +++ b/samples/client/petstore/java/apache-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/feign/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/jersey3/.openapi-generator/VERSION b/samples/client/petstore/java/jersey3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/jersey3/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/VERSION b/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/VERSION +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/native-async/.openapi-generator/VERSION b/samples/client/petstore/java/native-async/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/native-async/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/native-jakarta/.openapi-generator/VERSION b/samples/client/petstore/java/native-jakarta/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/native-jakarta/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native-jakarta/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/native/.openapi-generator/VERSION b/samples/client/petstore/java/native/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/native/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-awsv4signature/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-group-parameter/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-swagger1/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-swagger1/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-swagger1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-jakarta/.openapi-generator/VERSION b/samples/client/petstore/java/webclient-jakarta/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/webclient-jakarta/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient-jakarta/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION b/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION b/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/jetbrains/http/client/.openapi-generator/VERSION b/samples/client/petstore/jetbrains/http/client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/jetbrains/http/client/.openapi-generator/VERSION +++ b/samples/client/petstore/jetbrains/http/client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/julia/.openapi-generator/VERSION b/samples/client/petstore/julia/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/julia/.openapi-generator/VERSION +++ b/samples/client/petstore/julia/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/k6/.openapi-generator/VERSION b/samples/client/petstore/k6/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/k6/.openapi-generator/VERSION +++ b/samples/client/petstore/k6/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/k6/script.js b/samples/client/petstore/k6/script.js index 9cd5b0561e6..f1c558a68b7 100644 --- a/samples/client/petstore/k6/script.js +++ b/samples/client/petstore/k6/script.js @@ -7,7 +7,7 @@ * NOTE: This class is auto generated by OpenAPI Generator. * https://github.com/OpenAPITools/openapi-generator * - * OpenAPI generator version: 6.5.0-SNAPSHOT + * OpenAPI generator version: 6.5.0 */ diff --git a/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION b/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION b/samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/.openapi-generator/VERSION b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-jvm-okhttp3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-jvm-retrofit2/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-jvm-retrofit2/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-jvm-retrofit2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-jvm-volley/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-jvm-volley/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-volley/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-jvm-volley/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-enum-default-value/.openapi-generator/VERSION b/samples/client/petstore/kotlin-enum-default-value/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-enum-default-value/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-enum-default-value/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-vertx-jackson/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-volley/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-volley/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-jvm-volley/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-volley/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-modelMutable/.openapi-generator/VERSION b/samples/client/petstore/kotlin-modelMutable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-modelMutable/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/kotlin/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/lua/.openapi-generator/VERSION b/samples/client/petstore/lua/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/lua/.openapi-generator/VERSION +++ b/samples/client/petstore/lua/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/nim/.openapi-generator/VERSION b/samples/client/petstore/nim/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/nim/.openapi-generator/VERSION +++ b/samples/client/petstore/nim/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION +++ b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/objc/default/.openapi-generator/VERSION b/samples/client/petstore/objc/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/objc/default/.openapi-generator/VERSION +++ b/samples/client/petstore/objc/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/perl/.openapi-generator/VERSION b/samples/client/petstore/perl/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/perl/.openapi-generator/VERSION +++ b/samples/client/petstore/perl/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION b/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION +++ b/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/php-dt/.openapi-generator/VERSION b/samples/client/petstore/php-dt/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/php-dt/.openapi-generator/VERSION +++ b/samples/client/petstore/php-dt/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION +++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php index ad97cd88a7c..2569193543e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php index bc3ace47498..37c18d2bedf 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index f052aaa5195..dcd446e2774 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php index 336322741e6..3325499f99b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php index a49e42c51d5..740fbf89cf5 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php index 675a5571614..317c3b79409 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php index f541a051b12..4e3726dc820 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php index 33188589418..944d54d1070 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php index 2cb5c08c563..56a044a281c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php index 6eb0c741aa3..9953992f071 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php index 9e8e529e94e..b53b577661a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php index 1615517c110..c02b98981f5 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php index 2f5e1dec609..b17cb135324 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php index 62f0c70efed..c48b6127909 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php index 982028da8ae..37e14879fdc 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php index 5d0c2afb33d..204fb95dea5 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php index 28ca8ffaaa2..f6d1e265174 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php index 2865edd7003..799867aa4fa 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php index beebd7b1e94..8a2089031a0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php index f47aa807b77..cbbd1e29792 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php index 0ac9664d7fb..cb218b98fa3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php index 1c699a1d017..0d6000d3cfd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php index b15cba72d5f..f5deab209f4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php index ef48e64e2c2..d321b7bb37d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php index 8e1397d53b8..06d0d675e32 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php index 45c9f6424ee..509c7bef7e3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php index b146847dcfe..a15152db66c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php index 4f01c224e8d..dfd1c65682a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php index d0be4460421..95f8bdac661 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php index c25e413ddd0..2e8fc19b86f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php index 904c9be9272..d8c459b4ad4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php index 385d675437f..bdf535bd10a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php index b78d18dafe0..c1abb13c9bc 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php index 2db94b600cb..0827ece7791 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php index 9583f4d37e3..9b4d6dfca5c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php index a3dfc210fb9..d310ef2f9cd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php index 6e909d00215..6d4a86ecbf4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php index 3c0a7467be9..a6bec10dfb1 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php index 141891dd5a9..af02d8ef948 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php index a934af4c0db..82eec61f43e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php index c59002a0ecb..9ef12d4b12a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php index bfcc44b693b..65a8069c452 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php index 385cb9c6406..ed43ef29823 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php index b622836a012..f46c0062d93 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php index 8f2da513b6f..94be19ef033 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php index c6ac8a242a1..7207fc98360 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php index ec772ad6401..e090fa5da83 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php index 2eff27f8b19..d9ebf2648df 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php index 77b1ce233b5..a583e6581e2 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php index 8eaa103105c..d7516db2d86 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php index c5b54996548..c47cfd4a7cc 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php index e71c40ee61f..c8762b0ecb9 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php index 9e87a8e3bc1..b2e44d8d5e8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php index f74b8dfc2d4..8b150675356 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php index c4d5ff47640..ee6fdc68f7d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php index 9b481c67b30..69903972344 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php index e841a6967f6..19416facec4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php index c38f610deea..c73f7f173b3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php index f7e4b2c5de4..5b1cdd68cc5 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index ec969dd389c..f83b0f02b7c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0-SNAPSHOT + * OpenAPI Generator version: 6.5.0 */ /** diff --git a/samples/client/petstore/powershell/.openapi-generator/VERSION b/samples/client/petstore/powershell/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/powershell/.openapi-generator/VERSION +++ b/samples/client/petstore/powershell/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION +++ b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/python-legacy/.openapi-generator/VERSION b/samples/client/petstore/python-legacy/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/python-legacy/.openapi-generator/VERSION +++ b/samples/client/petstore/python-legacy/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/python-prior/.openapi-generator/VERSION b/samples/client/petstore/python-prior/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/python-prior/.openapi-generator/VERSION +++ b/samples/client/petstore/python-prior/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION +++ b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/python-tornado/.openapi-generator/VERSION b/samples/client/petstore/python-tornado/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/python-tornado/.openapi-generator/VERSION +++ b/samples/client/petstore/python-tornado/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/ruby-autoload/.openapi-generator/VERSION b/samples/client/petstore/ruby-autoload/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/ruby-autoload/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby-autoload/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/ruby-autoload/lib/petstore.rb b/samples/client/petstore/ruby-autoload/lib/petstore.rb index c23884f2ae0..c03b9d5dce5 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb index 465bd665ff6..52401ebc792 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/default_api.rb index a619f51f262..bf57abb8f20 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/default_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb index f7c3a54422a..92fc3b49922 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_classname_tags123_api.rb index 7de26084bad..7163d22acdb 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb index 0de718c3e9f..9784263d466 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb index c6a4c5316ba..2faf3e96fac 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/user_api.rb index 6cda3f7d73f..e9374098fab 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api_client.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api_client.rb index 4203afd9f85..e62df74d628 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb index 8d57b1226f9..54f766c835d 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/configuration.rb b/samples/client/petstore/ruby-autoload/lib/petstore/configuration.rb index bdc43fd25f6..8b3798b8d36 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/additional_properties_class.rb index 296b4c4dfb5..85f934fbe83 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb index 4ee2a0ec205..d9c9c557bc7 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/animal.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/animal.rb index 020ef2e8fe6..c88e2808b38 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/api_response.rb index 97b5ab1c29c..c33bb7ae960 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_array_of_number_only.rb index dc3303d1f2f..9607532b5e9 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_number_only.rb index a051b141126..caccc4b3a86 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_test.rb index a6a162ae97b..3684ea373c5 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/capitalization.rb index 8c0dae94bae..b3cd8886e18 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/cat.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/cat.rb index 1b503c17b74..b15c6431046 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb index 26ecccaaf9d..0c493378e45 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/category.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/category.rb index 0e019040ae8..525eb69facd 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/class_model.rb index f04615a6b37..fadc9ff2c59 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/client.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/client.rb index ce077464cc8..da9d5583e25 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/deprecated_object.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/deprecated_object.rb index 72e2ab5b39c..8d782757eae 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/deprecated_object.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/deprecated_object.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/dog.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/dog.rb index ab0159b8d94..fb0b890b66c 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb index c1e0b6d8988..0e28eec69c3 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb index aea79083e3f..48807017b08 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_class.rb index 0d70c1ae4e5..63f015c5035 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_test.rb index 60532675607..42675d322bd 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/file.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/file.rb index 17b838df670..ad942c95415 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/file_schema_test_class.rb index 89da4200536..3877578a7d2 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/foo.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/foo.rb index 545dea9c8cf..7db19d53a13 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/foo.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/foo_get_default_response.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/foo_get_default_response.rb index ad2f007d636..ec890622158 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/foo_get_default_response.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/foo_get_default_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/format_test.rb index 8ce95005376..98674d89cab 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/has_only_read_only.rb index caf6ceb95b9..7b8c7b66528 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/health_check_result.rb index e86b40fa260..eca6e1bf89f 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/health_check_result.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/list.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/list.rb index 0918be69798..8809bbeb996 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/map_test.rb index f85e19eda6e..34b38ccd45e 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 535c583a411..6804bfcb801 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/model200_response.rb index acca5954507..b23616c0dbe 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/model200_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/model_return.rb index bce5a80775c..293e707a32c 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/name.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/name.rb index 3c0a4ba909d..93e0dcd0b18 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/nullable_class.rb index da4f8daa4df..1ae0c066461 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/nullable_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/number_only.rb index b7dc7c959ba..55247c29ff7 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/object_with_deprecated_fields.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/object_with_deprecated_fields.rb index 399c5312434..685b9c9ea71 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/object_with_deprecated_fields.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/object_with_deprecated_fields.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb index af0721934d2..e5d717f276b 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_composite.rb index c3b436ac5e6..31fa4f38538 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum.rb index d103e0d49a8..9f0814868fa 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_default_value.rb index ed5607db378..bd3a3a01a2d 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer.rb index 3561d9b13c4..33124dad26e 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer_default_value.rb index 9ae4eb6b39e..4d80c951ea7 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_object_with_enum_property.rb index 218cb63514d..ac665b80bb9 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/pet.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/pet.rb index aeb822553f9..96e709723ef 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/read_only_first.rb index e7166875711..887f4c2ef6d 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/single_ref_type.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/single_ref_type.rb index 179ee633b4f..ae1263e2104 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/single_ref_type.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/single_ref_type.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/special_model_name.rb index 5739466432d..84494665abb 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/tag.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/tag.rb index ef8448bfdf8..38fc2289a4c 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/user.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/user.rb index 01cb8a26d92..0e9145c0cf1 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/version.rb b/samples/client/petstore/ruby-autoload/lib/petstore/version.rb index 87670564714..f5413995f48 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/version.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/petstore.gemspec b/samples/client/petstore/ruby-autoload/petstore.gemspec index 0d33221f199..50dbc74b26c 100644 --- a/samples/client/petstore/ruby-autoload/petstore.gemspec +++ b/samples/client/petstore/ruby-autoload/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb b/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb index f2b5570db3e..32ca71c6507 100644 --- a/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb b/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb index 4e57bfeebd0..2fa4efb69dc 100644 --- a/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-autoload/spec/spec_helper.rb b/samples/client/petstore/ruby-autoload/spec/spec_helper.rb index ecae9faf98a..268f9c61093 100644 --- a/samples/client/petstore/ruby-autoload/spec/spec_helper.rb +++ b/samples/client/petstore/ruby-autoload/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb index 7f20a8db2f6..a603aafe683 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb index 465bd665ff6..52401ebc792 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb index a619f51f262..bf57abb8f20 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb index f7c3a54422a..92fc3b49922 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb index 7de26084bad..7163d22acdb 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb index daf0baf1652..046e4f9f23d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb index c2891a53246..c6b26867f2f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb index f5ef77f12e9..134a85a769b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb index 76055de3723..bf11677cd60 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb index 8d57b1226f9..54f766c835d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb index 39dd8797caf..8b5395d29e2 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb index 296b4c4dfb5..85f934fbe83 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb index 4ee2a0ec205..d9c9c557bc7 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb index 020ef2e8fe6..c88e2808b38 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb index 97b5ab1c29c..c33bb7ae960 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb index dc3303d1f2f..9607532b5e9 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb index a051b141126..caccc4b3a86 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb index a6a162ae97b..3684ea373c5 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb index 8c0dae94bae..b3cd8886e18 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb index 1b503c17b74..b15c6431046 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb index 26ecccaaf9d..0c493378e45 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb index 0e019040ae8..525eb69facd 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb index f04615a6b37..fadc9ff2c59 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb index ce077464cc8..da9d5583e25 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb index 72e2ab5b39c..8d782757eae 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb index ab0159b8d94..fb0b890b66c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb index c1e0b6d8988..0e28eec69c3 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb index aea79083e3f..48807017b08 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb index 0d70c1ae4e5..63f015c5035 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb index 60532675607..42675d322bd 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb index 17b838df670..ad942c95415 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb index 89da4200536..3877578a7d2 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb index 545dea9c8cf..7db19d53a13 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo_get_default_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo_get_default_response.rb index ad2f007d636..ec890622158 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo_get_default_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo_get_default_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb index 8ce95005376..98674d89cab 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb index caf6ceb95b9..7b8c7b66528 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb index e86b40fa260..eca6e1bf89f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb index 0918be69798..8809bbeb996 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb index f85e19eda6e..34b38ccd45e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 535c583a411..6804bfcb801 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb index acca5954507..b23616c0dbe 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb index bce5a80775c..293e707a32c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb index 3c0a4ba909d..93e0dcd0b18 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb index da4f8daa4df..1ae0c066461 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb index b7dc7c959ba..55247c29ff7 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb index 399c5312434..685b9c9ea71 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb index af0721934d2..e5d717f276b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb index c3b436ac5e6..31fa4f38538 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb index d103e0d49a8..9f0814868fa 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb index ed5607db378..bd3a3a01a2d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb index 3561d9b13c4..33124dad26e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb index 9ae4eb6b39e..4d80c951ea7 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb index 218cb63514d..ac665b80bb9 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb index aeb822553f9..96e709723ef 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb index e7166875711..887f4c2ef6d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/single_ref_type.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/single_ref_type.rb index 179ee633b4f..ae1263e2104 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/single_ref_type.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/single_ref_type.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb index 5739466432d..84494665abb 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb index ef8448bfdf8..38fc2289a4c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb index 01cb8a26d92..0e9145c0cf1 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb index 87670564714..f5413995f48 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/petstore.gemspec b/samples/client/petstore/ruby-faraday/petstore.gemspec index b8150c60004..5c43b82416b 100644 --- a/samples/client/petstore/ruby-faraday/petstore.gemspec +++ b/samples/client/petstore/ruby-faraday/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb index b8600d9a05f..dec22b4709c 100644 --- a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb index a13c6fccb35..d587103f666 100644 --- a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb index ecae9faf98a..268f9c61093 100644 --- a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb +++ b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/ruby/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index 7f20a8db2f6..a603aafe683 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb index 465bd665ff6..52401ebc792 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb index a619f51f262..bf57abb8f20 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index f7c3a54422a..92fc3b49922 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb index 7de26084bad..7163d22acdb 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb index 0de718c3e9f..9784263d466 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb index c6a4c5316ba..2faf3e96fac 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb index 6cda3f7d73f..e9374098fab 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index 4203afd9f85..e62df74d628 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb index 8d57b1226f9..54f766c835d 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index bdc43fd25f6..8b3798b8d36 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb index 296b4c4dfb5..85f934fbe83 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb index 4ee2a0ec205..d9c9c557bc7 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb index 020ef2e8fe6..c88e2808b38 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb index 97b5ab1c29c..c33bb7ae960 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index dc3303d1f2f..9607532b5e9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index a051b141126..caccc4b3a86 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb index a6a162ae97b..3684ea373c5 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb index 8c0dae94bae..b3cd8886e18 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb index 1b503c17b74..b15c6431046 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb index 26ecccaaf9d..0c493378e45 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb index 0e019040ae8..525eb69facd 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb index f04615a6b37..fadc9ff2c59 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb index ce077464cc8..da9d5583e25 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb b/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb index 72e2ab5b39c..8d782757eae 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb index ab0159b8d94..fb0b890b66c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb index c1e0b6d8988..0e28eec69c3 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb index aea79083e3f..48807017b08 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb index 0d70c1ae4e5..63f015c5035 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb index 60532675607..42675d322bd 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb index 17b838df670..ad942c95415 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb index 89da4200536..3877578a7d2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/foo.rb b/samples/client/petstore/ruby/lib/petstore/models/foo.rb index 545dea9c8cf..7db19d53a13 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/foo.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/foo_get_default_response.rb b/samples/client/petstore/ruby/lib/petstore/models/foo_get_default_response.rb index ad2f007d636..ec890622158 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/foo_get_default_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/foo_get_default_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb index 8ce95005376..98674d89cab 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb index caf6ceb95b9..7b8c7b66528 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb index e86b40fa260..eca6e1bf89f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb index 0918be69798..8809bbeb996 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb index f85e19eda6e..34b38ccd45e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 535c583a411..6804bfcb801 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb index acca5954507..b23616c0dbe 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb index bce5a80775c..293e707a32c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb index 3c0a4ba909d..93e0dcd0b18 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb index da4f8daa4df..1ae0c066461 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb index b7dc7c959ba..55247c29ff7 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb b/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb index 399c5312434..685b9c9ea71 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb index af0721934d2..e5d717f276b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb index c3b436ac5e6..31fa4f38538 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb index d103e0d49a8..9f0814868fa 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb index ed5607db378..bd3a3a01a2d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb index 3561d9b13c4..33124dad26e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb index 9ae4eb6b39e..4d80c951ea7 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb index 218cb63514d..ac665b80bb9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb index aeb822553f9..96e709723ef 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb index e7166875711..887f4c2ef6d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/single_ref_type.rb b/samples/client/petstore/ruby/lib/petstore/models/single_ref_type.rb index 179ee633b4f..ae1263e2104 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/single_ref_type.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/single_ref_type.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb index 5739466432d..84494665abb 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb index ef8448bfdf8..38fc2289a4c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb index 01cb8a26d92..0e9145c0cf1 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb index 87670564714..f5413995f48 100644 --- a/samples/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/client/petstore/ruby/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec index 0d33221f199..50dbc74b26c 100644 --- a/samples/client/petstore/ruby/petstore.gemspec +++ b/samples/client/petstore/ruby/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb index f2b5570db3e..32ca71c6507 100644 --- a/samples/client/petstore/ruby/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/spec/configuration_spec.rb b/samples/client/petstore/ruby/spec/configuration_spec.rb index 4e57bfeebd0..2fa4efb69dc 100644 --- a/samples/client/petstore/ruby/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb index ecae9faf98a..268f9c61093 100644 --- a/samples/client/petstore/ruby/spec/spec_helper.rb +++ b/samples/client/petstore/ruby/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore-async-middleware/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/scala-akka/.openapi-generator/VERSION b/samples/client/petstore/scala-akka/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/scala-akka/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-akka/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION b/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/scala-sttp/.openapi-generator/VERSION b/samples/client/petstore/scala-sttp/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/scala-sttp/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-sttp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 43e8966e609..257bc70c30a 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java index 41f79d15a71..a89c21f1987 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java index bb206bbe89d..14c0d4186dd 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java index 85f5ec3ce9d..df14a5ba602 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index 41f79d15a71..a89c21f1987 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index bb206bbe89d..14c0d4186dd 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 85f5ec3ce9d..df14a5ba602 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/VERSION b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 468c8d88bff..88f2f093e13 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java index 4589c980658..e713c590113 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index eba62384f1f..91c30bed2e4 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java index 86811e2f6b0..04e81921acf 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java index 7c390c674f6..3c489a604ca 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java index d895641b2e6..029a3011103 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java index ada12109a2c..620004c2783 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/.openapi-generator/VERSION b/samples/client/petstore/spring-http-interface/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/spring-http-interface/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-http-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java index 89b413cf6df..3121df168c2 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java index a6e1f4d89ab..9383a3ef51e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 9c7b1c807b6..3961aae63c1 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java index a685526d90a..7d6ff5a2ede 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java index c68eda93b70..59fcbe72539 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java index 8e230a58c04..47e3e83061e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java index ada12109a2c..620004c2783 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION b/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/asyncAwaitLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/default/.openapi-generator/VERSION b/samples/client/petstore/swift5/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/default/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION b/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/frozenEnums/.openapi-generator/VERSION b/samples/client/petstore/swift5/frozenEnums/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/frozenEnums/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/frozenEnums/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION b/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION b/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION b/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION b/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/validation/.openapi-generator/VERSION b/samples/client/petstore/swift5/validation/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/validation/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/validation/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION b/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v14-query-param-object-format/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v14-query-param-object-format/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v14-query-param-object-format/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v14-query-param-object-format/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/test-petstore/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-node-imports/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-string-enums/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION b/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION +++ b/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml index ea413782cbe..f0ec700c5eb 100644 --- a/samples/meta-codegen/lib/pom.xml +++ b/samples/meta-codegen/lib/pom.xml @@ -121,7 +121,7 @@ UTF-8 - 6.5.0-SNAPSHOT + 6.5.0 1.0.0 4.13.2 diff --git a/samples/meta-codegen/usage/.openapi-generator/VERSION b/samples/meta-codegen/usage/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/meta-codegen/usage/.openapi-generator/VERSION +++ b/samples/meta-codegen/usage/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/3_0_3_unit_test/python/.openapi-generator/VERSION b/samples/openapi3/client/3_0_3_unit_test/python/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/3_0_3_unit_test/python/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/elm/.openapi-generator/VERSION b/samples/openapi3/client/elm/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/elm/.openapi-generator/VERSION +++ b/samples/openapi3/client/elm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb index 3974069b166..87349ab219d 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb index 363c3daf723..d7215032f4b 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb index b1c405c5b22..93832e01b34 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb index bfd33373b96..2fedb6a24a7 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb index 4611fd357e6..1e77b9740fd 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb index b6f944df646..7f071951cbd 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb index feba1aa3d3c..bd6680c5861 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb index 257068a8281..d16d4620539 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb index 27f44ed455d..bb696b47832 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec index b7e29184b03..d6d4ccebbd5 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec b/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec index 400184b1e3d..0c9fcca629c 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec +++ b/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb index c6bdf52ee6f..ad7a7003e1f 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb index a2b0d769d42..ca7ac26767f 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb index 7c171007b61..0ee7167c236 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb index 0f1616245ca..ed742972b55 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb index ffe7c121f3c..3a671c36b18 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb index 068584904ea..25acb2f7e6f 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb index 95bfaf0e668..bbdc12e23f8 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb index 81f9020bf9c..52f81ccee8c 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb index 93cc1288788..e37c9a87599 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb index 24d593b0734..3404676d23a 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb index 87d168c29b7..edfef16b640 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb index 4e4cd10051f..ce5c009babd 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb index aacf299d5cd..15cfed1446c 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb index d3cc0e514d1..adca20c1e89 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb index e4862980177..febbef19d7d 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb index 5352bb1b6f6..78d9c7b7e26 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb index dbe2de419fc..ed18a27b388 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec index 7f0925b9a2d..85bd6017097 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb index 3d4260b4a1c..b9de8bfa8b0 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb index a048e7b34ff..51ede7a1545 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb index 0ebd65790e4..86a0d644009 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0-SNAPSHOT +OpenAPI Generator version: 6.5.0 =end diff --git a/samples/openapi3/client/petstore/dart-dio/oneof/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/oneof/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/dart-dio/oneof/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/oneof/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100755 --- a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100755 --- a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-prior/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-prior/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/python-prior/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-prior/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java index 78bddf656d5..92e69ee3c3c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java index a7c8643ceb1..2b53c83e0fd 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java index 6799269c992..84fcd9439d5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index a119abe880e..fd60e1c5043 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 9e5d1ad6955..b22a2702fdf 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index b435398acd3..368403674be 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 2826bd3406e..74126bc7aad 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index cc888cde0fc..ec48a4f2635 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index 0d3020ab885..e157df0cced 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index a26836600fe..8cb7b4b06c9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java index d093b19bbcb..6e27df2ead7 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index 818c087c562..f47398e2bac 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index 24f42ea5dde..a00ee406501 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index c4e25adcbcd..afeb420c208 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 97b27bdd189..525e71955db 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index b16bd999f54..00a92009dd2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index 1a18252688b..fe89bca1a46 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 294a4067e7d..1d9dbc01f7e 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 9790fdaac82..c98b6af25ab 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java index e47e06fe14c..36912fd6cd2 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index 3b17078a953..7b234b346c7 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index 401408be66a..c8b576f506c 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index c64c29ae3f8..c49cfca894b 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index f6ec18a8e76..87519f01e03 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index 9776ebf7a4b..9d9a89f454f 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/browser/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/browser/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/schema/petstore/avro-schema/.openapi-generator/VERSION b/samples/openapi3/schema/petstore/avro-schema/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/schema/petstore/avro-schema/.openapi-generator/VERSION +++ b/samples/openapi3/schema/petstore/avro-schema/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java index ff378d71e4c..96437c5ff6d 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java index 537262d5c2e..31bff59705a 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java index 0983430c827..41c15579d77 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java index 4ff5b1f4a1e..af04f8a7995 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java index bffbee4473a..f2374cd3a0c 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java index f3619c15d64..ca42ce705e7 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java index d191be486a1..5c9e29d6cb5 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java index a216a86864a..4b0a3d06f23 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 0346e04b53c..0bb8f6fb93e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 9f2e5b2da3e..f4c98b5fecb 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 2a2b2f9e5f9..aae1fd2669e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index 03132cf15f4..d77dd779583 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 23a896b1266..009e01ee750 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 60d713ae895..3901ee7d9ee 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 065df164962..457c742c8e9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 47c0b05280f..b7c2f866c8d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6ff08f7a872..e5b380af62d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 880f6f7d409..37ff153aa0c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 1a630a2a489..305bd7cf8b7 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 140f63bd838..e8cb6fe6986 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java index f7726b35a0d..13b00d2f3a4 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java index d65cd4d3841..ed9199348c4 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java index 972b9d975d5..543cf6d3b4e 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index a3b52fcb453..a9ffc82e7ce 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index 35c9e66be76..d68d13d00f6 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 188365fab09..14423f9e940 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/schema/petstore/ktorm-modelMutable/.openapi-generator/VERSION b/samples/schema/petstore/ktorm-modelMutable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/schema/petstore/ktorm-modelMutable/.openapi-generator/VERSION +++ b/samples/schema/petstore/ktorm-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/schema/petstore/ktorm/.openapi-generator/VERSION b/samples/schema/petstore/ktorm/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/schema/petstore/ktorm/.openapi-generator/VERSION +++ b/samples/schema/petstore/ktorm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/schema/petstore/mysql/.openapi-generator/VERSION b/samples/schema/petstore/mysql/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/schema/petstore/mysql/.openapi-generator/VERSION +++ b/samples/schema/petstore/mysql/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION b/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION +++ b/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-6.0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/aspnetcore-6.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-6.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION b/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION b/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp index ee46ec1dd75..9b34c42a1c1 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h index 5d265b71658..381f4f47b10 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp index c6d069695ce..cfde779ea8d 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h index 3605b65cabf..e1801018139 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp index 465c070e655..f55ef594ba6 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h index 325094418f5..98d8b0260e1 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp index 902b4689a73..23a09a13d5e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h index baa90bc316f..2a42920ac77 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp index 5c07882d45f..511900c1096 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h index d4f417c876b..1497f994cd0 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp index efaf8b7435f..98737e88124 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h index 80b42e3de55..bfb14d51e47 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp index 33898819158..bb00af89a4c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h index 25da0250372..dfeb2ac2748 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp index b955aed728a..0eef8a03771 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h index 7d8124e091b..f0a1b2a476a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp index 1fec59230a3..9819d605143 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h index 9d0052abb41..1acfd382b75 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp index 520108efb2f..d5d461a046c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h index 3f4f7c78821..08c5246edd2 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp index fb16b2c74f2..122742e788f 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h index 6544d2be3e1..289dc96a5d7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp index e2bdd7e9382..161381468cf 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h index 0ea61d40acb..88fd938870e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp index 0e920e3549e..ebf110c6f33 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h index 048b75adb55..9de0c021ef4 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp index f0ef85695b1..a8cfdc210c5 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h index 4cf698cfc5c..95a6ff46d45 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp index f9b5f8fc464..5834ff6434c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h index 9a4608dc623..f7aed72f8ae 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp index b200197cab4..10fefc3c9c0 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h index c6462e56e12..f5f045c25ae 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp index 7968e086503..d5f887d4067 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h index 3914a6d59e6..8170a35f82d 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp index ab48715da31..a5aa1800987 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h index 3ed8e241084..e5092d86157 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp index 93b6f9c3e33..4cad1a7559a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h index 9671298ee64..3af3975edcf 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp index 69bea764404..8511e2d7207 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h index 91bdf97ad41..f54e0995622 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp index 9552d889bf0..0356695024e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h index 09af1133c49..e1ea3b8c36a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp index d4e4261846e..80312d24d7b 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h index b83e8601c7a..90a441fdfc5 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp index 38d01a3f028..e0ca3059622 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h index 97b2e9caab0..20ef908fefc 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp index 922fd166e64..e00708e0ec3 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h index ce00a71d75e..781725635a8 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp index 61a555a6f94..a13b2e5bec4 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h index 26393f547c9..e8ec3392449 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp index ac63bc039e6..2fa91420d42 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h index 0a107de0c14..26ab37d8900 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp index 9d534611920..f65524c3572 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h index dec45da7d9f..ebd17277cec 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp index 370a64741f5..f69afe8fc0c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h index f7ad36f2927..c01478c33a6 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp index 2403b38911f..1b857bc9cd1 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h index b737a054a39..48dde763fa7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp index 8128b40cb70..063d91de9cf 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h index 93d6911cf25..a04f263e846 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp index e9ef095529c..918d347efe7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h index 6fb3dc895bd..ac7ae7c111c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp index fe0f2acd01b..40e54e1cd9b 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h index ddad7635209..a4fb9bfa1c9 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp index 84b988e431f..a1decc8e62d 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h index 6fd8fb9dd6f..0bd83e49e3d 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp index 77c25ded623..240f242bf8b 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h index 90c9c0bad22..127ff11df59 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp index cb0f493b313..7ae918e9481 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h index 6c02a97169d..9652ba3ade2 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp index ae3f3310070..ee062180b3f 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h index e5c95e623fa..fbd27114a21 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp index 26d18210ded..36d5d709b53 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h index 8471c8a5138..e851deed2b7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp index 25659453026..8baa8c4bd24 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h index 66537f54d10..1725da4ae21 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp index 10eabf71740..fd86a647a7e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h index 1ff30db4df1..5a7c28d9199 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp index 5c42215e129..3ba2d387f66 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h index 8a0c655ebec..331ac5ea299 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp index c08a9b6f04b..d115457b449 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h index 5b5648425b5..eba1a79b3e4 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp index 11c5ace54b5..8ba07c12fc0 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h index 251e9664268..c59cd099554 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp index de8cb227b26..41d6524e5da 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h index ac9f0c1ac44..1d00a0af891 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp index 8ed8557166c..b871b949224 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h index c8cd87b3091..6bd4c6eaab2 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp index 45830828ff6..76234fbfa01 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h index f40412b0dec..108554839cf 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp index cecbf811889..e2129f2a061 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h index c90be75c3d5..f0008a813cb 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp index 0a14b981835..93a4c40a8f5 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h index 948585202d9..2f8de7c4e23 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp index e02689694bf..185394f95fa 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h index dff414cfa26..26b37cf6c6f 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp index 6d1d0b74667..6cb256384c2 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h index 6b318678ec4..ffe82b40b02 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp index a94e65a086f..6bb9d9224f1 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h index 0a044d52189..b0da954252e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp index 0fbb78738ea..7f61cdb5ad1 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h index 0495a1dc869..cabced96400 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp index 7180badcfba..45306f69e4e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h index cdb21e23543..8868ba11d2d 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp index f03947e6727..7554087323a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h index e9c5e6ca23b..3fffc76f687 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp index 0fefa1648fd..c3452e44511 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h index 6d1129b9ec0..829ee6dbc3b 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h index 41c4937e72b..5f97d712809 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp index 15dd2227794..d73ecf32ed2 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h index 34d8b66b89a..45c8501d400 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/erlang-server/.openapi-generator/VERSION b/samples/server/petstore/erlang-server/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/erlang-server/.openapi-generator/VERSION +++ b/samples/server/petstore/erlang-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/go-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-api-server/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/go-api-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-api-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/go-chi-server/.openapi-generator/VERSION b/samples/server/petstore/go-chi-server/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/go-chi-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-chi-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/go-echo-server/.openapi-generator/VERSION b/samples/server/petstore/go-echo-server/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/go-echo-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-echo-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/go-server-required/.openapi-generator/VERSION b/samples/server/petstore/go-server-required/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/go-server-required/.openapi-generator/VERSION +++ b/samples/server/petstore/go-server-required/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/haskell-servant/.openapi-generator/VERSION b/samples/server/petstore/haskell-servant/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/haskell-servant/.openapi-generator/VERSION +++ b/samples/server/petstore/haskell-servant/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/haskell-yesod/.openapi-generator/VERSION b/samples/server/petstore/haskell-yesod/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/haskell-yesod/.openapi-generator/VERSION +++ b/samples/server/petstore/haskell-yesod/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-camel/.openapi-generator/VERSION b/samples/server/petstore/java-camel/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-camel/.openapi-generator/VERSION +++ b/samples/server/petstore/java-camel/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-camel/pom.xml b/samples/server/petstore/java-camel/pom.xml index a259d5f37d6..46c37a72714 100644 --- a/samples/server/petstore/java-camel/pom.xml +++ b/samples/server/petstore/java-camel/pom.xml @@ -1,6 +1,6 @@ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java index 640de3aab2f..bc3b8f6c66e 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/ValidationErrorProcessor.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/ValidationErrorProcessor.java index 383053118ce..37d9b15aefd 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/ValidationErrorProcessor.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/ValidationErrorProcessor.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java index ce120cb244f..fd2532cd671 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java index cf74fb73c91..79c466503fc 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiValidator.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiValidator.java index d3c3e25b7f8..626b81b7c0d 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiValidator.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiValidator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApi.java index b2fc4259113..da898c4e057 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java index 371968920ab..8108b0228f1 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiValidator.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiValidator.java index 6d870c97014..db069d523cf 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiValidator.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiValidator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApi.java index c021168be81..82aba7d23c8 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java index 78349b305e3..221e587b9d8 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiValidator.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiValidator.java index 3409d6fbfdc..b848d9be926 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiValidator.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiValidator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/resources/application.properties b/samples/server/petstore/java-camel/src/main/resources/application.properties index 5018833980e..7a7b71c29fe 100644 --- a/samples/server/petstore/java-camel/src/main/resources/application.properties +++ b/samples/server/petstore/java-camel/src/main/resources/application.properties @@ -1,4 +1,4 @@ -# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). +# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). # https://openapi-generator.tech # Do not edit the class manually. diff --git a/samples/server/petstore/java-helidon-server/mp/.openapi-generator/VERSION b/samples/server/petstore/java-helidon-server/mp/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-helidon-server/mp/.openapi-generator/VERSION +++ b/samples/server/petstore/java-helidon-server/mp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-helidon-server/se/.openapi-generator/VERSION b/samples/server/petstore/java-helidon-server/se/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-helidon-server/se/.openapi-generator/VERSION +++ b/samples/server/petstore/java-helidon-server/se/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-micronaut-server/.openapi-generator/VERSION b/samples/server/petstore/java-micronaut-server/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-micronaut-server/.openapi-generator/VERSION +++ b/samples/server/petstore/java-micronaut-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION +++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-undertow/.openapi-generator/VERSION b/samples/server/petstore/java-undertow/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-undertow/.openapi-generator/VERSION +++ b/samples/server/petstore/java-undertow/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION b/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION +++ b/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/julia/.openapi-generator/VERSION b/samples/server/petstore/julia/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/julia/.openapi-generator/VERSION +++ b/samples/server/petstore/julia/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server-modelMutable/README.md b/samples/server/petstore/kotlin-server-modelMutable/README.md index cafe38b12fe..98a15d5f9c4 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/README.md +++ b/samples/server/petstore/kotlin-server-modelMutable/README.md @@ -2,7 +2,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -Generated by OpenAPI Generator 6.5.0-SNAPSHOT. +Generated by OpenAPI Generator 6.5.0. ## Requires diff --git a/samples/server/petstore/kotlin-server/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/jaxrs-spec/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-server/jaxrs-spec/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server/jaxrs-spec/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md index cafe38b12fe..98a15d5f9c4 100644 --- a/samples/server/petstore/kotlin-server/ktor/README.md +++ b/samples/server/petstore/kotlin-server/ktor/README.md @@ -2,7 +2,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -Generated by OpenAPI Generator 6.5.0-SNAPSHOT. +Generated by OpenAPI Generator 6.5.0. ## Requires diff --git a/samples/server/petstore/kotlin-springboot-3/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-springboot-3/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 1abef969d7f..f450ef18741 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 5cc5d146f14..4bc64fcf4d4 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index a589346b0a0..e88b20e7782 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-source-swagger1/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-source-swagger2/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-springfox/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-springfox/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-springfox/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin-vertx-modelMutable/.openapi-generator/VERSION b/samples/server/petstore/kotlin-vertx-modelMutable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin-vertx-modelMutable/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-vertx-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION b/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/php-laravel/.openapi-generator/VERSION b/samples/server/petstore/php-laravel/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/php-laravel/.openapi-generator/VERSION +++ b/samples/server/petstore/php-laravel/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION +++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION b/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION +++ b/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION b/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION +++ b/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/php-slim4/.openapi-generator/VERSION b/samples/server/petstore/php-slim4/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/php-slim4/.openapi-generator/VERSION +++ b/samples/server/petstore/php-slim4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION +++ b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/python-fastapi/.openapi-generator/VERSION b/samples/server/petstore/python-fastapi/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/python-fastapi/.openapi-generator/VERSION +++ b/samples/server/petstore/python-fastapi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/python-flask/.openapi-generator/VERSION b/samples/server/petstore/python-flask/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/python-flask/.openapi-generator/VERSION +++ b/samples/server/petstore/python-flask/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION b/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION +++ b/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java index 0b3158a75f8..7aecebb678a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index d974ae15f0e..c5e1b39dfbf 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index a2fcaf0975c..e0873f04fb0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java index b7eda04884f..b279949bfe7 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java index 765bb98a312..d07e70a2db5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java index ba2922d98e2..1f863ec0529 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java index aab22aadd32..9a09d977a29 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3fc76144032..e71d03ee2b5 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 046ebd0a351..c5d4d66f8ef 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8d0ca9689bb..b941108210d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 1d418d2aced..2ec860ed35c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 4268160d16e..7ea34ac37fb 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 1626c669d49..52fcd675071 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3fc76144032..e71d03ee2b5 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 046ebd0a351..c5d4d66f8ef 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8d0ca9689bb..b941108210d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index 1d418d2aced..2ec860ed35c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 4268160d16e..7ea34ac37fb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index 1626c669d49..52fcd675071 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index edc87a622fb..95380ccf953 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index 19557bc37d0..c205ddc6ebd 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 12d5e65cbe7..17a855f68bc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index 9b93a0fc3be..a25dc15f2a3 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 4fcc6fb311c..255dedfdb89 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index 033fdc52474..1f8f7c26552 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java index 5838f12363a..47403f5f86e 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java index a33be555972..ec7c6ee038e 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java index fae06a7612c..8fe6b47682b 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index edc87a622fb..95380ccf953 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 19557bc37d0..c205ddc6ebd 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 12d5e65cbe7..17a855f68bc 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index 9b93a0fc3be..a25dc15f2a3 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 4fcc6fb311c..255dedfdb89 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 033fdc52474..1f8f7c26552 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java index 6324146f769..20309677d06 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java index d65cd4d3841..ed9199348c4 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java index 972b9d975d5..543cf6d3b4e 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3fc76144032..e71d03ee2b5 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index de404285b49..6055c7bc26e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8d0ca9689bb..b941108210d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 226781e819f..48af6a63cda 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 4268160d16e..7ea34ac37fb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 1626c669d49..52fcd675071 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index ec172a80737..e8acb813d7f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index 2dcd1304cba..d51f8492e55 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 2df97014b93..e71c6272da0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 1107e62491b..5924b3afe4b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index a4feea3e7e5..4bd283c236c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index 47ef0c6c6d5..eb0ad964e4f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index e287793b31b..2175936d56d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 2683920fcc1..e7523faef39 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e37344594de..af1c1a59374 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index 0b6c9d48148..b36166005b3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index d80873ebcc9..f697d5f96db 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index 315ff7928d1..487c1534430 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index e6d1aa0c08b..a69e6fd80ef 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index e287793b31b..2175936d56d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index 2683920fcc1..e7523faef39 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e37344594de..af1c1a59374 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index 0b6c9d48148..b36166005b3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index d80873ebcc9..f697d5f96db 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index 315ff7928d1..487c1534430 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java index 9dce485a5a4..d27b2ef9cfa 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index b7316fe0b69..f31080cb2c7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 9457b0c35f7..c651d03c372 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e2bb9e2400c..355dade6fef 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index bfbd6774dd7..e0df01a0ceb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 5e285e97c0d..21ce887e05e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index fb1f0b0410e..67e79c3f967 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index 1dd8a26faed..f424fccea0a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index b7316fe0b69..f31080cb2c7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 9457b0c35f7..c651d03c372 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e2bb9e2400c..355dade6fef 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index bfbd6774dd7..e0df01a0ceb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 5e285e97c0d..21ce887e05e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index fb1f0b0410e..67e79c3f967 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java index 840df69fd17..dd997c03cbf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3fc76144032..e71d03ee2b5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index a00b75c4c9e..41dd2a0f0a4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8d0ca9689bb..b941108210d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 36427dddb99..9c426b53678 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 4268160d16e..7ea34ac37fb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index 1626c669d49..52fcd675071 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index e274fef5fa8..a5c17af94d3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index 6ec4a6867ac..a5e8e1c451c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index 45606efb970..df97133a7a3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index fc43b7f986f..b777029e331 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index fd6f373cde0..6398066a708 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index eecd4ff12a3..d72d2b287b7 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION index 7f4d792ec2c..4be2c727ad9 100644 --- a/samples/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index 6fc3202d404..dcd923e097d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index 49c9d624f08..6e8e551a82e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 35ca94fe7d8..445e5f04644 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index d45f1f96dba..5054eee9e2b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index d1e8cad1c07..92f9fad031f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 85dfc6505aa..de77203cb7a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0-SNAPSHOT). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). * https://openapi-generator.tech * Do not edit the class manually. */ From 5d1e18306a0253d588f60ebe44cd4e52adb6b2a7 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 1 Apr 2023 18:48:01 +0800 Subject: [PATCH 102/131] Prepare 6.6.0-SNAPSHOT (#15100) * set 6.6.0 snapshot version * update samples * update readme --- README.md | 18 +++++++++--------- modules/openapi-generator-cli/pom.xml | 2 +- modules/openapi-generator-core/pom.xml | 2 +- .../gradle.properties | 2 +- .../openapi-generator-gradle-plugin/pom.xml | 2 +- .../samples/local-spec/gradle.properties | 2 +- .../examples/java-client.xml | 2 +- .../examples/kotlin.xml | 2 +- .../examples/multi-module/java-client/pom.xml | 2 +- .../examples/non-java-invalid-spec.xml | 2 +- .../examples/non-java.xml | 2 +- .../examples/spring.xml | 2 +- modules/openapi-generator-maven-plugin/pom.xml | 2 +- modules/openapi-generator-online/pom.xml | 2 +- modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/feign-gson/.openapi-generator/VERSION | 2 +- .../java/native/.openapi-generator/VERSION | 2 +- .../okhttp-gson/.openapi-generator/VERSION | 2 +- .../python-nextgen/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../R-httr2-wrapper/.openapi-generator/VERSION | 2 +- .../R-httr2/.openapi-generator/VERSION | 2 +- .../petstore/R/.openapi-generator/VERSION | 2 +- .../petstore/apex/.openapi-generator/VERSION | 2 +- .../petstore/bash/.openapi-generator/VERSION | 2 +- .../petstore/c/.openapi-generator/VERSION | 2 +- .../petstore/cpp-qt/.openapi-generator/VERSION | 2 +- .../client/.openapi-generator/VERSION | 2 +- .../include/CppRestPetstoreClient/ApiClient.h | 2 +- .../CppRestPetstoreClient/ApiConfiguration.h | 2 +- .../CppRestPetstoreClient/ApiException.h | 2 +- .../CppRestPetstoreClient/HttpContent.h | 2 +- .../include/CppRestPetstoreClient/IHttpBody.h | 2 +- .../include/CppRestPetstoreClient/JsonBody.h | 2 +- .../include/CppRestPetstoreClient/ModelBase.h | 2 +- .../CppRestPetstoreClient/MultipartFormData.h | 2 +- .../include/CppRestPetstoreClient/Object.h | 2 +- .../include/CppRestPetstoreClient/api/PetApi.h | 2 +- .../CppRestPetstoreClient/api/StoreApi.h | 2 +- .../CppRestPetstoreClient/api/UserApi.h | 2 +- .../CppRestPetstoreClient/model/ApiResponse.h | 2 +- .../CppRestPetstoreClient/model/Category.h | 2 +- .../CppRestPetstoreClient/model/Order.h | 2 +- .../include/CppRestPetstoreClient/model/Pet.h | 2 +- .../include/CppRestPetstoreClient/model/Tag.h | 2 +- .../include/CppRestPetstoreClient/model/User.h | 2 +- .../cpp-restsdk/client/src/ApiClient.cpp | 2 +- .../client/src/ApiConfiguration.cpp | 2 +- .../cpp-restsdk/client/src/ApiException.cpp | 2 +- .../cpp-restsdk/client/src/HttpContent.cpp | 2 +- .../cpp-restsdk/client/src/JsonBody.cpp | 2 +- .../cpp-restsdk/client/src/ModelBase.cpp | 2 +- .../client/src/MultipartFormData.cpp | 2 +- .../petstore/cpp-restsdk/client/src/Object.cpp | 2 +- .../cpp-restsdk/client/src/api/PetApi.cpp | 2 +- .../cpp-restsdk/client/src/api/StoreApi.cpp | 2 +- .../cpp-restsdk/client/src/api/UserApi.cpp | 2 +- .../client/src/model/ApiResponse.cpp | 2 +- .../cpp-restsdk/client/src/model/Category.cpp | 2 +- .../cpp-restsdk/client/src/model/Order.cpp | 2 +- .../cpp-restsdk/client/src/model/Pet.cpp | 2 +- .../cpp-restsdk/client/src/model/Tag.cpp | 2 +- .../cpp-restsdk/client/src/model/User.cpp | 2 +- .../cpp-tiny/.openapi-generator/VERSION | 2 +- .../cpp-ue4/.openapi-generator/VERSION | 2 +- .../crystal/.openapi-generator/VERSION | 2 +- samples/client/petstore/crystal/.travis.yml | 2 +- .../petstore/crystal/spec/spec_helper.cr | 2 +- .../client/petstore/crystal/src/petstore.cr | 2 +- .../crystal/src/petstore/api/pet_api.cr | 2 +- .../crystal/src/petstore/api/store_api.cr | 2 +- .../crystal/src/petstore/api/user_api.cr | 2 +- .../crystal/src/petstore/api_client.cr | 2 +- .../petstore/crystal/src/petstore/api_error.cr | 2 +- .../crystal/src/petstore/configuration.cr | 2 +- .../src/petstore/models/api_response.cr | 2 +- .../crystal/src/petstore/models/category.cr | 2 +- .../crystal/src/petstore/models/format_test.cr | 2 +- .../crystal/src/petstore/models/order.cr | 2 +- .../crystal/src/petstore/models/pet.cr | 2 +- .../crystal/src/petstore/models/tag.cr | 2 +- .../crystal/src/petstore/models/user.cr | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../OpenAPIClient/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../OpenAPIClient/.openapi-generator/VERSION | 2 +- .../petstore/elixir/.openapi-generator/VERSION | 2 +- .../lib/openapi_petstore/api/another_fake.ex | 2 +- .../elixir/lib/openapi_petstore/api/default.ex | 2 +- .../elixir/lib/openapi_petstore/api/fake.ex | 2 +- .../api/fake_classname_tags123.ex | 2 +- .../elixir/lib/openapi_petstore/api/pet.ex | 2 +- .../elixir/lib/openapi_petstore/api/store.ex | 2 +- .../elixir/lib/openapi_petstore/api/user.ex | 2 +- .../elixir/lib/openapi_petstore/connection.ex | 2 +- .../lib/openapi_petstore/deserializer.ex | 2 +- .../model/_foo_get_default_response.ex | 2 +- .../model/_special_model_name_.ex | 2 +- .../model/additional_properties_class.ex | 2 +- .../model/all_of_with_single_ref.ex | 2 +- .../lib/openapi_petstore/model/animal.ex | 2 +- .../lib/openapi_petstore/model/api_response.ex | 2 +- .../model/array_of_array_of_number_only.ex | 2 +- .../model/array_of_number_only.ex | 2 +- .../lib/openapi_petstore/model/array_test.ex | 2 +- .../openapi_petstore/model/capitalization.ex | 2 +- .../elixir/lib/openapi_petstore/model/cat.ex | 2 +- .../lib/openapi_petstore/model/cat_all_of.ex | 2 +- .../lib/openapi_petstore/model/category.ex | 2 +- .../lib/openapi_petstore/model/class_model.ex | 2 +- .../lib/openapi_petstore/model/client.ex | 2 +- .../model/deprecated_object.ex | 2 +- .../elixir/lib/openapi_petstore/model/dog.ex | 2 +- .../lib/openapi_petstore/model/dog_all_of.ex | 2 +- .../lib/openapi_petstore/model/enum_arrays.ex | 2 +- .../lib/openapi_petstore/model/enum_class.ex | 2 +- .../lib/openapi_petstore/model/enum_test.ex | 2 +- .../elixir/lib/openapi_petstore/model/file.ex | 2 +- .../model/file_schema_test_class.ex | 2 +- .../elixir/lib/openapi_petstore/model/foo.ex | 2 +- .../lib/openapi_petstore/model/format_test.ex | 2 +- .../model/has_only_read_only.ex | 2 +- .../model/health_check_result.ex | 2 +- .../elixir/lib/openapi_petstore/model/list.ex | 2 +- .../lib/openapi_petstore/model/map_test.ex | 2 +- ...operties_and_additional_properties_class.ex | 2 +- .../model/model_200_response.ex | 2 +- .../elixir/lib/openapi_petstore/model/name.ex | 2 +- .../openapi_petstore/model/nullable_class.ex | 2 +- .../lib/openapi_petstore/model/number_only.ex | 2 +- .../model/object_with_deprecated_fields.ex | 2 +- .../elixir/lib/openapi_petstore/model/order.ex | 2 +- .../openapi_petstore/model/outer_composite.ex | 2 +- .../lib/openapi_petstore/model/outer_enum.ex | 2 +- .../model/outer_enum_default_value.ex | 2 +- .../model/outer_enum_integer.ex | 2 +- .../model/outer_enum_integer_default_value.ex | 2 +- .../model/outer_object_with_enum_property.ex | 2 +- .../elixir/lib/openapi_petstore/model/pet.ex | 2 +- .../openapi_petstore/model/read_only_first.ex | 2 +- .../lib/openapi_petstore/model/return.ex | 2 +- .../openapi_petstore/model/single_ref_type.ex | 2 +- .../elixir/lib/openapi_petstore/model/tag.ex | 2 +- .../elixir/lib/openapi_petstore/model/user.ex | 2 +- .../lib/openapi_petstore/request_builder.ex | 2 +- .../erlang-client/.openapi-generator/VERSION | 2 +- .../erlang-proper/.openapi-generator/VERSION | 2 +- .../go/go-petstore/.openapi-generator/VERSION | 2 +- .../petstore/groovy/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../mp/.openapi-generator/VERSION | 2 +- .../se/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/feign/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/jersey1/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../jersey2-java8/.openapi-generator/VERSION | 2 +- .../java/jersey3/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../native-async/.openapi-generator/VERSION | 2 +- .../native-jakarta/.openapi-generator/VERSION | 2 +- .../java/native/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../okhttp-gson/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../rest-assured/.openapi-generator/VERSION | 2 +- .../java/resteasy/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../resttemplate/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/retrofit2/.openapi-generator/VERSION | 2 +- .../retrofit2rx2/.openapi-generator/VERSION | 2 +- .../retrofit2rx3/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/vertx/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/webclient/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../javascript-es6/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../http/client/.openapi-generator/VERSION | 2 +- .../petstore/julia/.openapi-generator/VERSION | 2 +- .../petstore/k6/.openapi-generator/VERSION | 2 +- samples/client/petstore/k6/script.js | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin-gson/.openapi-generator/VERSION | 2 +- .../kotlin-jackson/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin-nullable/.openapi-generator/VERSION | 2 +- .../kotlin-okhttp3/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin-string/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore/kotlin/.openapi-generator/VERSION | 2 +- .../petstore/lua/.openapi-generator/VERSION | 2 +- .../petstore/nim/.openapi-generator/VERSION | 2 +- .../objc/core-data/.openapi-generator/VERSION | 2 +- .../objc/default/.openapi-generator/VERSION | 2 +- .../petstore/perl/.openapi-generator/VERSION | 2 +- .../php-dt-modern/.openapi-generator/VERSION | 2 +- .../petstore/php-dt/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../lib/Api/AnotherFakeApi.php | 2 +- .../OpenAPIClient-php/lib/Api/DefaultApi.php | 2 +- .../php/OpenAPIClient-php/lib/Api/FakeApi.php | 2 +- .../lib/Api/FakeClassnameTags123Api.php | 2 +- .../php/OpenAPIClient-php/lib/Api/PetApi.php | 2 +- .../php/OpenAPIClient-php/lib/Api/StoreApi.php | 2 +- .../php/OpenAPIClient-php/lib/Api/UserApi.php | 2 +- .../php/OpenAPIClient-php/lib/ApiException.php | 2 +- .../OpenAPIClient-php/lib/Configuration.php | 2 +- .../OpenAPIClient-php/lib/HeaderSelector.php | 2 +- .../lib/Model/AdditionalPropertiesClass.php | 2 +- .../lib/Model/AllOfWithSingleRef.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Animal.php | 2 +- .../lib/Model/ApiResponse.php | 2 +- .../lib/Model/ArrayOfArrayOfNumberOnly.php | 2 +- .../lib/Model/ArrayOfNumberOnly.php | 2 +- .../OpenAPIClient-php/lib/Model/ArrayTest.php | 2 +- .../lib/Model/Capitalization.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Cat.php | 2 +- .../OpenAPIClient-php/lib/Model/CatAllOf.php | 2 +- .../OpenAPIClient-php/lib/Model/Category.php | 2 +- .../OpenAPIClient-php/lib/Model/ClassModel.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Client.php | 2 +- .../lib/Model/DeprecatedObject.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Dog.php | 2 +- .../OpenAPIClient-php/lib/Model/DogAllOf.php | 2 +- .../OpenAPIClient-php/lib/Model/EnumArrays.php | 2 +- .../OpenAPIClient-php/lib/Model/EnumClass.php | 2 +- .../OpenAPIClient-php/lib/Model/EnumTest.php | 2 +- .../php/OpenAPIClient-php/lib/Model/File.php | 2 +- .../lib/Model/FileSchemaTestClass.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Foo.php | 2 +- .../lib/Model/FooGetDefaultResponse.php | 2 +- .../OpenAPIClient-php/lib/Model/FormatTest.php | 2 +- .../lib/Model/HasOnlyReadOnly.php | 2 +- .../lib/Model/HealthCheckResult.php | 2 +- .../OpenAPIClient-php/lib/Model/MapTest.php | 2 +- ...dPropertiesAndAdditionalPropertiesClass.php | 2 +- .../lib/Model/Model200Response.php | 2 +- .../lib/Model/ModelInterface.php | 2 +- .../OpenAPIClient-php/lib/Model/ModelList.php | 2 +- .../lib/Model/ModelReturn.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Name.php | 2 +- .../lib/Model/NullableClass.php | 2 +- .../OpenAPIClient-php/lib/Model/NumberOnly.php | 2 +- .../lib/Model/ObjectWithDeprecatedFields.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Order.php | 2 +- .../lib/Model/OuterComposite.php | 2 +- .../OpenAPIClient-php/lib/Model/OuterEnum.php | 2 +- .../lib/Model/OuterEnumDefaultValue.php | 2 +- .../lib/Model/OuterEnumInteger.php | 2 +- .../lib/Model/OuterEnumIntegerDefaultValue.php | 2 +- .../lib/Model/OuterObjectWithEnumProperty.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Pet.php | 2 +- .../lib/Model/ReadOnlyFirst.php | 2 +- .../lib/Model/SingleRefType.php | 2 +- .../lib/Model/SpecialModelName.php | 2 +- .../php/OpenAPIClient-php/lib/Model/Tag.php | 2 +- .../php/OpenAPIClient-php/lib/Model/User.php | 2 +- .../OpenAPIClient-php/lib/ObjectSerializer.php | 2 +- .../powershell/.openapi-generator/VERSION | 2 +- .../python-asyncio/.openapi-generator/VERSION | 2 +- .../python-legacy/.openapi-generator/VERSION | 2 +- .../python-prior/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../python-tornado/.openapi-generator/VERSION | 2 +- .../ruby-autoload/.openapi-generator/VERSION | 2 +- .../petstore/ruby-autoload/lib/petstore.rb | 2 +- .../lib/petstore/api/another_fake_api.rb | 2 +- .../lib/petstore/api/default_api.rb | 2 +- .../ruby-autoload/lib/petstore/api/fake_api.rb | 2 +- .../petstore/api/fake_classname_tags123_api.rb | 2 +- .../ruby-autoload/lib/petstore/api/pet_api.rb | 2 +- .../lib/petstore/api/store_api.rb | 2 +- .../ruby-autoload/lib/petstore/api/user_api.rb | 2 +- .../ruby-autoload/lib/petstore/api_client.rb | 2 +- .../ruby-autoload/lib/petstore/api_error.rb | 2 +- .../lib/petstore/configuration.rb | 2 +- .../models/additional_properties_class.rb | 2 +- .../petstore/models/all_of_with_single_ref.rb | 2 +- .../lib/petstore/models/animal.rb | 2 +- .../lib/petstore/models/api_response.rb | 2 +- .../models/array_of_array_of_number_only.rb | 2 +- .../petstore/models/array_of_number_only.rb | 2 +- .../lib/petstore/models/array_test.rb | 2 +- .../lib/petstore/models/capitalization.rb | 2 +- .../ruby-autoload/lib/petstore/models/cat.rb | 2 +- .../lib/petstore/models/cat_all_of.rb | 2 +- .../lib/petstore/models/category.rb | 2 +- .../lib/petstore/models/class_model.rb | 2 +- .../lib/petstore/models/client.rb | 2 +- .../lib/petstore/models/deprecated_object.rb | 2 +- .../ruby-autoload/lib/petstore/models/dog.rb | 2 +- .../lib/petstore/models/dog_all_of.rb | 2 +- .../lib/petstore/models/enum_arrays.rb | 2 +- .../lib/petstore/models/enum_class.rb | 2 +- .../lib/petstore/models/enum_test.rb | 2 +- .../ruby-autoload/lib/petstore/models/file.rb | 2 +- .../petstore/models/file_schema_test_class.rb | 2 +- .../ruby-autoload/lib/petstore/models/foo.rb | 2 +- .../models/foo_get_default_response.rb | 2 +- .../lib/petstore/models/format_test.rb | 2 +- .../lib/petstore/models/has_only_read_only.rb | 2 +- .../lib/petstore/models/health_check_result.rb | 2 +- .../ruby-autoload/lib/petstore/models/list.rb | 2 +- .../lib/petstore/models/map_test.rb | 2 +- ...operties_and_additional_properties_class.rb | 2 +- .../lib/petstore/models/model200_response.rb | 2 +- .../lib/petstore/models/model_return.rb | 2 +- .../ruby-autoload/lib/petstore/models/name.rb | 2 +- .../lib/petstore/models/nullable_class.rb | 2 +- .../lib/petstore/models/number_only.rb | 2 +- .../models/object_with_deprecated_fields.rb | 2 +- .../ruby-autoload/lib/petstore/models/order.rb | 2 +- .../lib/petstore/models/outer_composite.rb | 2 +- .../lib/petstore/models/outer_enum.rb | 2 +- .../models/outer_enum_default_value.rb | 2 +- .../lib/petstore/models/outer_enum_integer.rb | 2 +- .../models/outer_enum_integer_default_value.rb | 2 +- .../models/outer_object_with_enum_property.rb | 2 +- .../ruby-autoload/lib/petstore/models/pet.rb | 2 +- .../lib/petstore/models/read_only_first.rb | 2 +- .../lib/petstore/models/single_ref_type.rb | 2 +- .../lib/petstore/models/special_model_name.rb | 2 +- .../ruby-autoload/lib/petstore/models/tag.rb | 2 +- .../ruby-autoload/lib/petstore/models/user.rb | 2 +- .../ruby-autoload/lib/petstore/version.rb | 2 +- .../petstore/ruby-autoload/petstore.gemspec | 2 +- .../ruby-autoload/spec/api_client_spec.rb | 2 +- .../ruby-autoload/spec/configuration_spec.rb | 2 +- .../petstore/ruby-autoload/spec/spec_helper.rb | 2 +- .../ruby-faraday/.openapi-generator/VERSION | 2 +- .../petstore/ruby-faraday/lib/petstore.rb | 2 +- .../lib/petstore/api/another_fake_api.rb | 2 +- .../lib/petstore/api/default_api.rb | 2 +- .../ruby-faraday/lib/petstore/api/fake_api.rb | 2 +- .../petstore/api/fake_classname_tags123_api.rb | 2 +- .../ruby-faraday/lib/petstore/api/pet_api.rb | 2 +- .../ruby-faraday/lib/petstore/api/store_api.rb | 2 +- .../ruby-faraday/lib/petstore/api/user_api.rb | 2 +- .../ruby-faraday/lib/petstore/api_client.rb | 2 +- .../ruby-faraday/lib/petstore/api_error.rb | 2 +- .../ruby-faraday/lib/petstore/configuration.rb | 2 +- .../models/additional_properties_class.rb | 2 +- .../petstore/models/all_of_with_single_ref.rb | 2 +- .../ruby-faraday/lib/petstore/models/animal.rb | 2 +- .../lib/petstore/models/api_response.rb | 2 +- .../models/array_of_array_of_number_only.rb | 2 +- .../petstore/models/array_of_number_only.rb | 2 +- .../lib/petstore/models/array_test.rb | 2 +- .../lib/petstore/models/capitalization.rb | 2 +- .../ruby-faraday/lib/petstore/models/cat.rb | 2 +- .../lib/petstore/models/cat_all_of.rb | 2 +- .../lib/petstore/models/category.rb | 2 +- .../lib/petstore/models/class_model.rb | 2 +- .../ruby-faraday/lib/petstore/models/client.rb | 2 +- .../lib/petstore/models/deprecated_object.rb | 2 +- .../ruby-faraday/lib/petstore/models/dog.rb | 2 +- .../lib/petstore/models/dog_all_of.rb | 2 +- .../lib/petstore/models/enum_arrays.rb | 2 +- .../lib/petstore/models/enum_class.rb | 2 +- .../lib/petstore/models/enum_test.rb | 2 +- .../ruby-faraday/lib/petstore/models/file.rb | 2 +- .../petstore/models/file_schema_test_class.rb | 2 +- .../ruby-faraday/lib/petstore/models/foo.rb | 2 +- .../models/foo_get_default_response.rb | 2 +- .../lib/petstore/models/format_test.rb | 2 +- .../lib/petstore/models/has_only_read_only.rb | 2 +- .../lib/petstore/models/health_check_result.rb | 2 +- .../ruby-faraday/lib/petstore/models/list.rb | 2 +- .../lib/petstore/models/map_test.rb | 2 +- ...operties_and_additional_properties_class.rb | 2 +- .../lib/petstore/models/model200_response.rb | 2 +- .../lib/petstore/models/model_return.rb | 2 +- .../ruby-faraday/lib/petstore/models/name.rb | 2 +- .../lib/petstore/models/nullable_class.rb | 2 +- .../lib/petstore/models/number_only.rb | 2 +- .../models/object_with_deprecated_fields.rb | 2 +- .../ruby-faraday/lib/petstore/models/order.rb | 2 +- .../lib/petstore/models/outer_composite.rb | 2 +- .../lib/petstore/models/outer_enum.rb | 2 +- .../models/outer_enum_default_value.rb | 2 +- .../lib/petstore/models/outer_enum_integer.rb | 2 +- .../models/outer_enum_integer_default_value.rb | 2 +- .../models/outer_object_with_enum_property.rb | 2 +- .../ruby-faraday/lib/petstore/models/pet.rb | 2 +- .../lib/petstore/models/read_only_first.rb | 2 +- .../lib/petstore/models/single_ref_type.rb | 2 +- .../lib/petstore/models/special_model_name.rb | 2 +- .../ruby-faraday/lib/petstore/models/tag.rb | 2 +- .../ruby-faraday/lib/petstore/models/user.rb | 2 +- .../ruby-faraday/lib/petstore/version.rb | 2 +- .../petstore/ruby-faraday/petstore.gemspec | 2 +- .../ruby-faraday/spec/api_client_spec.rb | 2 +- .../ruby-faraday/spec/configuration_spec.rb | 2 +- .../petstore/ruby-faraday/spec/spec_helper.rb | 2 +- .../petstore/ruby/.openapi-generator/VERSION | 2 +- samples/client/petstore/ruby/lib/petstore.rb | 2 +- .../ruby/lib/petstore/api/another_fake_api.rb | 2 +- .../ruby/lib/petstore/api/default_api.rb | 2 +- .../petstore/ruby/lib/petstore/api/fake_api.rb | 2 +- .../petstore/api/fake_classname_tags123_api.rb | 2 +- .../petstore/ruby/lib/petstore/api/pet_api.rb | 2 +- .../ruby/lib/petstore/api/store_api.rb | 2 +- .../petstore/ruby/lib/petstore/api/user_api.rb | 2 +- .../petstore/ruby/lib/petstore/api_client.rb | 2 +- .../petstore/ruby/lib/petstore/api_error.rb | 2 +- .../ruby/lib/petstore/configuration.rb | 2 +- .../models/additional_properties_class.rb | 2 +- .../petstore/models/all_of_with_single_ref.rb | 2 +- .../ruby/lib/petstore/models/animal.rb | 2 +- .../ruby/lib/petstore/models/api_response.rb | 2 +- .../models/array_of_array_of_number_only.rb | 2 +- .../petstore/models/array_of_number_only.rb | 2 +- .../ruby/lib/petstore/models/array_test.rb | 2 +- .../ruby/lib/petstore/models/capitalization.rb | 2 +- .../petstore/ruby/lib/petstore/models/cat.rb | 2 +- .../ruby/lib/petstore/models/cat_all_of.rb | 2 +- .../ruby/lib/petstore/models/category.rb | 2 +- .../ruby/lib/petstore/models/class_model.rb | 2 +- .../ruby/lib/petstore/models/client.rb | 2 +- .../lib/petstore/models/deprecated_object.rb | 2 +- .../petstore/ruby/lib/petstore/models/dog.rb | 2 +- .../ruby/lib/petstore/models/dog_all_of.rb | 2 +- .../ruby/lib/petstore/models/enum_arrays.rb | 2 +- .../ruby/lib/petstore/models/enum_class.rb | 2 +- .../ruby/lib/petstore/models/enum_test.rb | 2 +- .../petstore/ruby/lib/petstore/models/file.rb | 2 +- .../petstore/models/file_schema_test_class.rb | 2 +- .../petstore/ruby/lib/petstore/models/foo.rb | 2 +- .../models/foo_get_default_response.rb | 2 +- .../ruby/lib/petstore/models/format_test.rb | 2 +- .../lib/petstore/models/has_only_read_only.rb | 2 +- .../lib/petstore/models/health_check_result.rb | 2 +- .../petstore/ruby/lib/petstore/models/list.rb | 2 +- .../ruby/lib/petstore/models/map_test.rb | 2 +- ...operties_and_additional_properties_class.rb | 2 +- .../lib/petstore/models/model200_response.rb | 2 +- .../ruby/lib/petstore/models/model_return.rb | 2 +- .../petstore/ruby/lib/petstore/models/name.rb | 2 +- .../ruby/lib/petstore/models/nullable_class.rb | 2 +- .../ruby/lib/petstore/models/number_only.rb | 2 +- .../models/object_with_deprecated_fields.rb | 2 +- .../petstore/ruby/lib/petstore/models/order.rb | 2 +- .../lib/petstore/models/outer_composite.rb | 2 +- .../ruby/lib/petstore/models/outer_enum.rb | 2 +- .../models/outer_enum_default_value.rb | 2 +- .../lib/petstore/models/outer_enum_integer.rb | 2 +- .../models/outer_enum_integer_default_value.rb | 2 +- .../models/outer_object_with_enum_property.rb | 2 +- .../petstore/ruby/lib/petstore/models/pet.rb | 2 +- .../lib/petstore/models/read_only_first.rb | 2 +- .../lib/petstore/models/single_ref_type.rb | 2 +- .../lib/petstore/models/special_model_name.rb | 2 +- .../petstore/ruby/lib/petstore/models/tag.rb | 2 +- .../petstore/ruby/lib/petstore/models/user.rb | 2 +- .../petstore/ruby/lib/petstore/version.rb | 2 +- samples/client/petstore/ruby/petstore.gemspec | 2 +- .../petstore/ruby/spec/api_client_spec.rb | 2 +- .../petstore/ruby/spec/configuration_spec.rb | 2 +- .../client/petstore/ruby/spec/spec_helper.rb | 2 +- .../hyper/petstore/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore-async/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore/.openapi-generator/VERSION | 2 +- .../scala-akka/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../scala-sttp/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/DefaultApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../spring-cloud/.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../api/FakeClassnameTags123Api.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../HttpInterfacesAbstractConfigurator.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../api/FakeClassnameTags123Api.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../HttpInterfacesAbstractConfigurator.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../anycodable/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../combineLibrary/.openapi-generator/VERSION | 2 +- .../swift5/default/.openapi-generator/VERSION | 2 +- .../deprecated/.openapi-generator/VERSION | 2 +- .../frozenEnums/.openapi-generator/VERSION | 2 +- .../nonPublicApi/.openapi-generator/VERSION | 2 +- .../objcCompatible/.openapi-generator/VERSION | 2 +- .../swift5/oneOf/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../resultLibrary/.openapi-generator/VERSION | 2 +- .../rxswiftLibrary/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../validation/.openapi-generator/VERSION | 2 +- .../vaporLibrary/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/with-npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../default/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../es6-target/.openapi-generator/VERSION | 2 +- .../test-petstore/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../with-interfaces/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../allOf-nullable/.openapi-generator/VERSION | 2 +- .../allOf-readonly/.openapi-generator/VERSION | 2 +- .../default-v3.0/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/enum/.openapi-generator/VERSION | 2 +- .../es6-target/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../with-interfaces/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../default/.openapi-generator/VERSION | 2 +- .../npm/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../default/.openapi-generator/VERSION | 2 +- .../npm/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../es6-target/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../protobuf-schema/.openapi-generator/VERSION | 2 +- samples/meta-codegen/lib/pom.xml | 2 +- .../usage/.openapi-generator/VERSION | 2 +- .../python/.openapi-generator/VERSION | 2 +- .../client/elm/.openapi-generator/VERSION | 2 +- .../go-experimental/.openapi-generator/VERSION | 2 +- .../jersey2-java8/.openapi-generator/VERSION | 2 +- .../python-prior/.openapi-generator/VERSION | 2 +- .../ruby-client/.openapi-generator/VERSION | 2 +- .../ruby-client/lib/x_auth_id_alias.rb | 2 +- .../lib/x_auth_id_alias/api/usage_api.rb | 2 +- .../lib/x_auth_id_alias/api_client.rb | 2 +- .../lib/x_auth_id_alias/api_error.rb | 2 +- .../lib/x_auth_id_alias/configuration.rb | 2 +- .../ruby-client/lib/x_auth_id_alias/version.rb | 2 +- .../ruby-client/spec/api_client_spec.rb | 2 +- .../ruby-client/spec/configuration_spec.rb | 2 +- .../ruby-client/spec/spec_helper.rb | 2 +- .../ruby-client/x_auth_id_alias.gemspec | 2 +- .../python/.openapi-generator/VERSION | 2 +- .../ruby/.openapi-generator/VERSION | 2 +- .../ruby/dynamic_servers.gemspec | 2 +- .../ruby/lib/dynamic_servers.rb | 2 +- .../ruby/lib/dynamic_servers/api/usage_api.rb | 2 +- .../ruby/lib/dynamic_servers/api_client.rb | 2 +- .../ruby/lib/dynamic_servers/api_error.rb | 2 +- .../ruby/lib/dynamic_servers/configuration.rb | 2 +- .../ruby/lib/dynamic_servers/version.rb | 2 +- .../ruby/spec/api_client_spec.rb | 2 +- .../ruby/spec/configuration_spec.rb | 2 +- .../dynamic-servers/ruby/spec/spec_helper.rb | 2 +- .../ruby-client/.openapi-generator/VERSION | 2 +- .../ruby-client/lib/petstore.rb | 2 +- .../ruby-client/lib/petstore/api/usage_api.rb | 2 +- .../ruby-client/lib/petstore/api_client.rb | 2 +- .../ruby-client/lib/petstore/api_error.rb | 2 +- .../ruby-client/lib/petstore/configuration.rb | 2 +- .../lib/petstore/models/array_alias.rb | 2 +- .../lib/petstore/models/map_alias.rb | 2 +- .../ruby-client/lib/petstore/version.rb | 2 +- .../ruby-client/petstore.gemspec | 2 +- .../ruby-client/spec/api_client_spec.rb | 2 +- .../ruby-client/spec/configuration_spec.rb | 2 +- .../ruby-client/spec/spec_helper.rb | 2 +- .../dart-dio/oneof/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../oneof_primitive/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../go/go-petstore/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../jersey2-java8/.openapi-generator/VERSION | 2 +- .../python-legacy/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../python-nextgen/.openapi-generator/VERSION | 2 +- .../python-prior/.openapi-generator/VERSION | 2 +- .../petstore/python/.openapi-generator/VERSION | 2 +- .../spring-cloud-3/.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/DefaultApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../api/FakeClassnameTags123Api.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../spring-cloud/.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../spring-stubs/.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../builds/browser/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/deno/.openapi-generator/VERSION | 2 +- .../inversify/.openapi-generator/VERSION | 2 +- .../builds/jquery/.openapi-generator/VERSION | 2 +- .../object_params/.openapi-generator/VERSION | 2 +- .../avro-schema/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/BarApi.java | 2 +- .../main/java/org/openapitools/api/FooApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../springboot-3/.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../springboot/.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../petstore/ktorm/.openapi-generator/VERSION | 2 +- .../petstore/mysql/.openapi-generator/VERSION | 2 +- .../wsdl-schema/.openapi-generator/VERSION | 2 +- .../aspnetcore-3.0/.openapi-generator/VERSION | 2 +- .../aspnetcore-3.1/.openapi-generator/VERSION | 2 +- .../aspnetcore-5.0/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../aspnetcore-6.0/.openapi-generator/VERSION | 2 +- .../aspnetcore/.openapi-generator/VERSION | 2 +- .../cpp-pistache/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../generated/3_0/.openapi-generator/VERSION | 2 +- .../generated/3_0/api/AnotherFakeApi.cpp | 2 +- .../generated/3_0/api/AnotherFakeApi.h | 2 +- .../generated/3_0/api/DefaultApi.cpp | 2 +- .../cpp-restbed/generated/3_0/api/DefaultApi.h | 2 +- .../cpp-restbed/generated/3_0/api/FakeApi.cpp | 2 +- .../cpp-restbed/generated/3_0/api/FakeApi.h | 2 +- .../3_0/api/FakeClassnameTags123Api.cpp | 2 +- .../3_0/api/FakeClassnameTags123Api.h | 2 +- .../cpp-restbed/generated/3_0/api/PetApi.cpp | 2 +- .../cpp-restbed/generated/3_0/api/PetApi.h | 2 +- .../cpp-restbed/generated/3_0/api/StoreApi.cpp | 2 +- .../cpp-restbed/generated/3_0/api/StoreApi.h | 2 +- .../cpp-restbed/generated/3_0/api/UserApi.cpp | 2 +- .../cpp-restbed/generated/3_0/api/UserApi.h | 2 +- .../3_0/model/AdditionalPropertiesClass.cpp | 2 +- .../3_0/model/AdditionalPropertiesClass.h | 2 +- .../generated/3_0/model/AllOfWithSingleRef.cpp | 2 +- .../generated/3_0/model/AllOfWithSingleRef.h | 2 +- .../cpp-restbed/generated/3_0/model/Animal.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Animal.h | 2 +- .../generated/3_0/model/ApiResponse.cpp | 2 +- .../generated/3_0/model/ApiResponse.h | 2 +- .../3_0/model/ArrayOfArrayOfNumberOnly.cpp | 2 +- .../3_0/model/ArrayOfArrayOfNumberOnly.h | 2 +- .../generated/3_0/model/ArrayOfNumberOnly.cpp | 2 +- .../generated/3_0/model/ArrayOfNumberOnly.h | 2 +- .../generated/3_0/model/ArrayTest.cpp | 2 +- .../generated/3_0/model/ArrayTest.h | 2 +- .../generated/3_0/model/Capitalization.cpp | 2 +- .../generated/3_0/model/Capitalization.h | 2 +- .../cpp-restbed/generated/3_0/model/Cat.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Cat.h | 2 +- .../generated/3_0/model/Cat_allOf.cpp | 2 +- .../generated/3_0/model/Cat_allOf.h | 2 +- .../generated/3_0/model/Category.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Category.h | 2 +- .../generated/3_0/model/ClassModel.cpp | 2 +- .../generated/3_0/model/ClassModel.h | 2 +- .../cpp-restbed/generated/3_0/model/Client.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Client.h | 2 +- .../generated/3_0/model/DeprecatedObject.cpp | 2 +- .../generated/3_0/model/DeprecatedObject.h | 2 +- .../cpp-restbed/generated/3_0/model/Dog.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Dog.h | 2 +- .../generated/3_0/model/Dog_allOf.cpp | 2 +- .../generated/3_0/model/Dog_allOf.h | 2 +- .../generated/3_0/model/EnumArrays.cpp | 2 +- .../generated/3_0/model/EnumArrays.h | 2 +- .../generated/3_0/model/EnumClass.cpp | 2 +- .../generated/3_0/model/EnumClass.h | 2 +- .../generated/3_0/model/Enum_Test.cpp | 2 +- .../generated/3_0/model/Enum_Test.h | 2 +- .../cpp-restbed/generated/3_0/model/File.cpp | 2 +- .../cpp-restbed/generated/3_0/model/File.h | 2 +- .../3_0/model/FileSchemaTestClass.cpp | 2 +- .../generated/3_0/model/FileSchemaTestClass.h | 2 +- .../cpp-restbed/generated/3_0/model/Foo.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Foo.h | 2 +- .../generated/3_0/model/Format_test.cpp | 2 +- .../generated/3_0/model/Format_test.h | 2 +- .../generated/3_0/model/HasOnlyReadOnly.cpp | 2 +- .../generated/3_0/model/HasOnlyReadOnly.h | 2 +- .../generated/3_0/model/HealthCheckResult.cpp | 2 +- .../generated/3_0/model/HealthCheckResult.h | 2 +- .../cpp-restbed/generated/3_0/model/List.cpp | 2 +- .../cpp-restbed/generated/3_0/model/List.h | 2 +- .../generated/3_0/model/MapTest.cpp | 2 +- .../cpp-restbed/generated/3_0/model/MapTest.h | 2 +- ...dPropertiesAndAdditionalPropertiesClass.cpp | 2 +- ...xedPropertiesAndAdditionalPropertiesClass.h | 2 +- .../cpp-restbed/generated/3_0/model/Name.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Name.h | 2 +- .../generated/3_0/model/NullableClass.cpp | 2 +- .../generated/3_0/model/NullableClass.h | 2 +- .../generated/3_0/model/NumberOnly.cpp | 2 +- .../generated/3_0/model/NumberOnly.h | 2 +- .../3_0/model/ObjectWithDeprecatedFields.cpp | 2 +- .../3_0/model/ObjectWithDeprecatedFields.h | 2 +- .../cpp-restbed/generated/3_0/model/Order.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Order.h | 2 +- .../generated/3_0/model/OuterComposite.cpp | 2 +- .../generated/3_0/model/OuterComposite.h | 2 +- .../generated/3_0/model/OuterEnum.cpp | 2 +- .../generated/3_0/model/OuterEnum.h | 2 +- .../3_0/model/OuterEnumDefaultValue.cpp | 2 +- .../3_0/model/OuterEnumDefaultValue.h | 2 +- .../generated/3_0/model/OuterEnumInteger.cpp | 2 +- .../generated/3_0/model/OuterEnumInteger.h | 2 +- .../3_0/model/OuterEnumIntegerDefaultValue.cpp | 2 +- .../3_0/model/OuterEnumIntegerDefaultValue.h | 2 +- .../3_0/model/OuterObjectWithEnumProperty.cpp | 2 +- .../3_0/model/OuterObjectWithEnumProperty.h | 2 +- .../cpp-restbed/generated/3_0/model/Pet.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Pet.h | 2 +- .../generated/3_0/model/ReadOnlyFirst.cpp | 2 +- .../generated/3_0/model/ReadOnlyFirst.h | 2 +- .../cpp-restbed/generated/3_0/model/Return.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Return.h | 2 +- .../generated/3_0/model/SingleRefType.cpp | 2 +- .../generated/3_0/model/SingleRefType.h | 2 +- .../cpp-restbed/generated/3_0/model/Tag.cpp | 2 +- .../cpp-restbed/generated/3_0/model/Tag.h | 2 +- .../cpp-restbed/generated/3_0/model/User.cpp | 2 +- .../cpp-restbed/generated/3_0/model/User.h | 2 +- .../3_0/model/_foo_get_default_response.cpp | 2 +- .../3_0/model/_foo_get_default_response.h | 2 +- .../3_0/model/_special_model_name_.cpp | 2 +- .../generated/3_0/model/_special_model_name_.h | 2 +- .../cpp-restbed/generated/3_0/model/helpers.h | 2 +- .../generated/3_0/model/r_200_response.cpp | 2 +- .../generated/3_0/model/r_200_response.h | 2 +- .../erlang-server/.openapi-generator/VERSION | 2 +- .../go-api-server/.openapi-generator/VERSION | 2 +- .../go-chi-server/.openapi-generator/VERSION | 2 +- .../go-echo-server/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../haskell-servant/.openapi-generator/VERSION | 2 +- .../haskell-yesod/.openapi-generator/VERSION | 2 +- .../java-camel/.openapi-generator/VERSION | 2 +- samples/server/petstore/java-camel/pom.xml | 2 +- .../org/openapitools/RestConfiguration.java | 2 +- .../openapitools/ValidationErrorProcessor.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../org/openapitools/api/PetApiRoutesImpl.java | 2 +- .../org/openapitools/api/PetApiValidator.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiRoutesImpl.java | 2 +- .../openapitools/api/StoreApiValidator.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../openapitools/api/UserApiRoutesImpl.java | 2 +- .../org/openapitools/api/UserApiValidator.java | 2 +- .../src/main/resources/application.properties | 2 +- .../mp/.openapi-generator/VERSION | 2 +- .../se/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java-msf4j/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../java-undertow/.openapi-generator/VERSION | 2 +- .../java-vertx-web/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../jaxrs-cxf-cdi/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../jaxrs-cxf/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../jaxrs-jersey/.openapi-generator/VERSION | 2 +- .../default/.openapi-generator/VERSION | 2 +- .../eap-java8/.openapi-generator/VERSION | 2 +- .../eap-joda/.openapi-generator/VERSION | 2 +- .../eap/.openapi-generator/VERSION | 2 +- .../java8/.openapi-generator/VERSION | 2 +- .../joda/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../jaxrs-spec/.openapi-generator/VERSION | 2 +- .../jersey1-useTags/.openapi-generator/VERSION | 2 +- .../jaxrs/jersey1/.openapi-generator/VERSION | 2 +- .../jersey2-useTags/.openapi-generator/VERSION | 2 +- .../jaxrs/jersey2/.openapi-generator/VERSION | 2 +- .../petstore/julia/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin-server-modelMutable/README.md | 2 +- .../jaxrs-spec/.openapi-generator/VERSION | 2 +- .../ktor/.openapi-generator/VERSION | 2 +- .../petstore/kotlin-server/ktor/README.md | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/kotlin/org/openapitools/api/PetApi.kt | 2 +- .../kotlin/org/openapitools/api/StoreApi.kt | 2 +- .../kotlin/org/openapitools/api/UserApi.kt | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../kotlin/vertx/.openapi-generator/VERSION | 2 +- .../php-laravel/.openapi-generator/VERSION | 2 +- .../php-lumen/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../php-mezzio-ph/.openapi-generator/VERSION | 2 +- .../php-slim4/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../python-aiohttp/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../python-fastapi/.openapi-generator/VERSION | 2 +- .../python-flask/.openapi-generator/VERSION | 2 +- .../multipart-v3/.openapi-generator/VERSION | 2 +- .../no-example-v3/.openapi-generator/VERSION | 2 +- .../openapi-v3/.openapi-generator/VERSION | 2 +- .../output/ops-v3/.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../java/org/openapitools/api/NullableApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../org/openapitools/api/VersioningApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../org/openapitools/api/VersioningApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../org/openapitools/api/VersioningApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../org/openapitools/api/VersioningApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- .../.openapi-generator/VERSION | 2 +- .../virtualan/api/AnotherFakeApi.java | 2 +- .../openapitools/virtualan/api/FakeApi.java | 2 +- .../virtualan/api/FakeClassnameTestApi.java | 2 +- .../org/openapitools/virtualan/api/PetApi.java | 2 +- .../openapitools/virtualan/api/StoreApi.java | 2 +- .../openapitools/virtualan/api/UserApi.java | 2 +- .../springboot/.openapi-generator/VERSION | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeClassnameTestApi.java | 2 +- .../main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 2 +- 1090 files changed, 1098 insertions(+), 1098 deletions(-) diff --git a/README.md b/README.md index 91d0c5a4f2d..fe07b5d13c2 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@
          -[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`6.4.0`): +[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`6.6.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator) @@ -120,9 +120,9 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20 | OpenAPI Generator Version | Release Date | Notes | | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- | -| 7.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.0-SNAPSHOT/) | Feb/Mar 2023 | Major release with breaking changes (no fallback) | -| 6.4.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.4.0-SNAPSHOT/) | 05.12.2022 | Minor release with breaking changes (with fallback) | -| [6.3.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.3.0) (latest stable release) | 01.02.2023 | Minor release with breaking changes (with fallback) | +| 7.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.0-SNAPSHOT/) | May/Jun 2023 | Major release with breaking changes (no fallback) | +| 6.6.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.5.0-SNAPSHOT/) | 28.04.2023 | Minor release with breaking changes (with fallback) | +| [6.5.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.5.0) (latest stable release) | 01.04.2023 | Minor release with breaking changes (with fallback) | | [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0) | 31.01.2022 | Minor release with breaking changes (with fallback) | | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1) | 06.05.2020 | Patch release (enhancements, bug fixes, etc) | @@ -182,16 +182,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum): -JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar` +JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.5.0/openapi-generator-cli-6.5.0.jar` For **Mac/Linux** users: ```sh -wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar -O openapi-generator-cli.jar +wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.5.0/openapi-generator-cli-6.5.0.jar -O openapi-generator-cli.jar ``` For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g. ``` -Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar +Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.5.0/openapi-generator-cli-6.5.0.jar ``` After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage. @@ -430,7 +430,7 @@ openapi-generator-cli version To use a specific version of "openapi-generator-cli" ```sh -openapi-generator-cli version-manager set 6.3.0 +openapi-generator-cli version-manager set 6.5.0 ``` Or install it as dev-dependency: @@ -454,7 +454,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`) -You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar) +You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.5.0/openapi-generator-cli-6.5.0.jar) To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate` diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index abf36d67438..89811c06bf7 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 6.5.0 + 6.6.0-SNAPSHOT ../.. diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index 4ca3831e4b7..c2abed50a65 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -6,7 +6,7 @@ openapi-generator-project org.openapitools - 6.5.0 + 6.6.0-SNAPSHOT ../.. diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index 3f3ca321b0b..89bd76e0efa 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,5 +1,5 @@ # RELEASE_VERSION -openApiGeneratorVersion=6.5.0 +openApiGeneratorVersion=6.6.0-SNAPSHOT # /RELEASE_VERSION # BEGIN placeholders diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 1fe1fccfb83..8468ef126be 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 6.5.0 + 6.6.0-SNAPSHOT ../.. diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties index 048c0017ea6..632552f7f7a 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties @@ -1,3 +1,3 @@ # RELEASE_VERSION -openApiGeneratorVersion=6.5.0 +openApiGeneratorVersion=6.6.0-SNAPSHOT # /RELEASE_VERSION diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml index dea230f2dd2..e68345b2e4d 100644 --- a/modules/openapi-generator-maven-plugin/examples/java-client.xml +++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0 + 6.6.0-SNAPSHOT diff --git a/modules/openapi-generator-maven-plugin/examples/kotlin.xml b/modules/openapi-generator-maven-plugin/examples/kotlin.xml index c587caf0099..8cd232b32fa 100644 --- a/modules/openapi-generator-maven-plugin/examples/kotlin.xml +++ b/modules/openapi-generator-maven-plugin/examples/kotlin.xml @@ -15,7 +15,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0 + 6.6.0-SNAPSHOT diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml index 679e5be1f90..5fba85bf7dc 100644 --- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml +++ b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml @@ -19,7 +19,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0 + 6.6.0-SNAPSHOT diff --git a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml index 85c7bdc7ba0..a7e6df0ae4a 100644 --- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml +++ b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0 + 6.6.0-SNAPSHOT diff --git a/modules/openapi-generator-maven-plugin/examples/non-java.xml b/modules/openapi-generator-maven-plugin/examples/non-java.xml index f7d34409339..aa687b9ba03 100644 --- a/modules/openapi-generator-maven-plugin/examples/non-java.xml +++ b/modules/openapi-generator-maven-plugin/examples/non-java.xml @@ -13,7 +13,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0 + 6.6.0-SNAPSHOT diff --git a/modules/openapi-generator-maven-plugin/examples/spring.xml b/modules/openapi-generator-maven-plugin/examples/spring.xml index e7d7e880e78..9b0be46e652 100644 --- a/modules/openapi-generator-maven-plugin/examples/spring.xml +++ b/modules/openapi-generator-maven-plugin/examples/spring.xml @@ -20,7 +20,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0 + 6.6.0-SNAPSHOT diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index a7d97a06f9d..2763d9d3e86 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ org.openapitools openapi-generator-project - 6.5.0 + 6.6.0-SNAPSHOT ../.. diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 6c60abd40e7..ce53029d4c4 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 6.5.0 + 6.6.0-SNAPSHOT ../.. diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index d5829662d96..e55514d78de 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -4,7 +4,7 @@ org.openapitools openapi-generator-project - 6.5.0 + 6.6.0-SNAPSHOT ../.. diff --git a/pom.xml b/pom.xml index f2995aed249..41b5719eaf5 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ pom openapi-generator-project - 6.5.0 + 6.6.0-SNAPSHOT https://github.com/openapitools/openapi-generator diff --git a/samples/client/echo_api/java/apache-httpclient/.openapi-generator/VERSION b/samples/client/echo_api/java/apache-httpclient/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/echo_api/java/apache-httpclient/.openapi-generator/VERSION +++ b/samples/client/echo_api/java/apache-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/echo_api/java/feign-gson/.openapi-generator/VERSION b/samples/client/echo_api/java/feign-gson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/echo_api/java/feign-gson/.openapi-generator/VERSION +++ b/samples/client/echo_api/java/feign-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/echo_api/java/native/.openapi-generator/VERSION b/samples/client/echo_api/java/native/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/echo_api/java/native/.openapi-generator/VERSION +++ b/samples/client/echo_api/java/native/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/echo_api/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/echo_api/java/okhttp-gson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/echo_api/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/echo_api/java/okhttp-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/echo_api/python-nextgen/.openapi-generator/VERSION b/samples/client/echo_api/python-nextgen/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/echo_api/python-nextgen/.openapi-generator/VERSION +++ b/samples/client/echo_api/python-nextgen/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION b/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION +++ b/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/others/java/okhttp-gson-streaming/.openapi-generator/VERSION b/samples/client/others/java/okhttp-gson-streaming/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/others/java/okhttp-gson-streaming/.openapi-generator/VERSION +++ b/samples/client/others/java/okhttp-gson-streaming/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION +++ b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/others/typescript-rxjs/allOf-composition/.openapi-generator/VERSION b/samples/client/others/typescript-rxjs/allOf-composition/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/others/typescript-rxjs/allOf-composition/.openapi-generator/VERSION +++ b/samples/client/others/typescript-rxjs/allOf-composition/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/others/typescript/builds/with-unique-items/.openapi-generator/VERSION b/samples/client/others/typescript/builds/with-unique-items/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/others/typescript/builds/with-unique-items/.openapi-generator/VERSION +++ b/samples/client/others/typescript/builds/with-unique-items/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/R-httr2-wrapper/.openapi-generator/VERSION b/samples/client/petstore/R-httr2-wrapper/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/R-httr2-wrapper/.openapi-generator/VERSION +++ b/samples/client/petstore/R-httr2-wrapper/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/R-httr2/.openapi-generator/VERSION b/samples/client/petstore/R-httr2/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/R-httr2/.openapi-generator/VERSION +++ b/samples/client/petstore/R-httr2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/R/.openapi-generator/VERSION b/samples/client/petstore/R/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/R/.openapi-generator/VERSION +++ b/samples/client/petstore/R/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/apex/.openapi-generator/VERSION b/samples/client/petstore/apex/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/apex/.openapi-generator/VERSION +++ b/samples/client/petstore/apex/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/bash/.openapi-generator/VERSION b/samples/client/petstore/bash/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/bash/.openapi-generator/VERSION +++ b/samples/client/petstore/bash/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/c/.openapi-generator/VERSION b/samples/client/petstore/c/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/c/.openapi-generator/VERSION +++ b/samples/client/petstore/c/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-qt/.openapi-generator/VERSION b/samples/client/petstore/cpp-qt/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/cpp-qt/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-qt/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h index cec56f9c460..04bd8b199f2 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h index 2282fa6d5fe..ffd7b3d2e82 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h index 3559ae0116e..3c092b5f250 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h index 837a2ef3f7b..b40a46d8025 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/IHttpBody.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/IHttpBody.h index 5bd8270a5af..c3594e0f2a5 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/IHttpBody.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/IHttpBody.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h index 449cdaf4452..f97777d7f15 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h index 907bbfbd748..39de917d14a 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h index f99a88282c6..aa4ba3e5c91 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h index b7a5bf05dbb..61eb21f1231 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h index e73554b17be..af53c8f55db 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h index 1e3e2a72f0a..9bb0f0d160a 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h index f3359418c23..1491fac6f95 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h index bca114a7596..f5c3b2d80f7 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h index 3cc9f8868a0..5139f1b2e88 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h index 5afe6e4a831..5338b9c250e 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h index 44b435638de..ae27eb9fea9 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h index 95715810da5..d32b9b64779 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h index a16e36eba7a..6d470bdd9e8 100644 --- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h +++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp index ebfde091edf..64ae9b458ca 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp index 664911f7f63..71a6930bcf5 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp b/samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp index aa2ba2010c3..4e195f341c0 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp index f00a712f735..66ca63a5bd6 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp index 8506ad18c9b..7c3db1bf4cf 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp index 1f171a21481..ae39e8d079d 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp index 7ac9e2e826d..08923bc52de 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/Object.cpp b/samples/client/petstore/cpp-restsdk/client/src/Object.cpp index a8d2e67ca8d..80195a7f384 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/Object.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/Object.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp index f9b747d856f..2d649d0db12 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp index 22019700f66..992de2a7eda 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp index eb20ccc64f9..693a43ff029 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp index eaeec321fda..42ecdaeb2e4 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp index 5473fdc92c0..0280198b69f 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp index aeff2a406d8..8eac9ea292f 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp index ef9ae2fef9d..df84e0f3760 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp index b9101a0bf2c..3c2d3c6e72d 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/src/model/User.cpp b/samples/client/petstore/cpp-restsdk/client/src/model/User.cpp index 1b9b59508d0..03f79a6be12 100644 --- a/samples/client/petstore/cpp-restsdk/client/src/model/User.cpp +++ b/samples/client/petstore/cpp-restsdk/client/src/model/User.cpp @@ -4,7 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION b/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION b/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/crystal/.openapi-generator/VERSION b/samples/client/petstore/crystal/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/crystal/.openapi-generator/VERSION +++ b/samples/client/petstore/crystal/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/crystal/.travis.yml b/samples/client/petstore/crystal/.travis.yml index 686d6e796b0..26aff62639e 100644 --- a/samples/client/petstore/crystal/.travis.yml +++ b/samples/client/petstore/crystal/.travis.yml @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # language: crystal diff --git a/samples/client/petstore/crystal/spec/spec_helper.cr b/samples/client/petstore/crystal/spec/spec_helper.cr index 1c1a0031d4d..69ccfa14af2 100644 --- a/samples/client/petstore/crystal/spec/spec_helper.cr +++ b/samples/client/petstore/crystal/spec/spec_helper.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # # load modules diff --git a/samples/client/petstore/crystal/src/petstore.cr b/samples/client/petstore/crystal/src/petstore.cr index c8cb5d0bb24..6dc305c33b8 100644 --- a/samples/client/petstore/crystal/src/petstore.cr +++ b/samples/client/petstore/crystal/src/petstore.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # # Dependencies diff --git a/samples/client/petstore/crystal/src/petstore/api/pet_api.cr b/samples/client/petstore/crystal/src/petstore/api/pet_api.cr index 4c46e9c40a6..8896bc47276 100644 --- a/samples/client/petstore/crystal/src/petstore/api/pet_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/pet_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api/store_api.cr b/samples/client/petstore/crystal/src/petstore/api/store_api.cr index 3e780fd6b4c..49cdee37bb8 100644 --- a/samples/client/petstore/crystal/src/petstore/api/store_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/store_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api/user_api.cr b/samples/client/petstore/crystal/src/petstore/api/user_api.cr index 68d15313d81..6f497fd40b6 100644 --- a/samples/client/petstore/crystal/src/petstore/api/user_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/user_api.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api_client.cr b/samples/client/petstore/crystal/src/petstore/api_client.cr index 6e5ae7837c4..3bab52b8bc7 100644 --- a/samples/client/petstore/crystal/src/petstore/api_client.cr +++ b/samples/client/petstore/crystal/src/petstore/api_client.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/api_error.cr b/samples/client/petstore/crystal/src/petstore/api_error.cr index b78f513ef71..1b470bc4b64 100644 --- a/samples/client/petstore/crystal/src/petstore/api_error.cr +++ b/samples/client/petstore/crystal/src/petstore/api_error.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # module Petstore diff --git a/samples/client/petstore/crystal/src/petstore/configuration.cr b/samples/client/petstore/crystal/src/petstore/configuration.cr index 4c501335f53..92770ad0c6e 100644 --- a/samples/client/petstore/crystal/src/petstore/configuration.cr +++ b/samples/client/petstore/crystal/src/petstore/configuration.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "log" diff --git a/samples/client/petstore/crystal/src/petstore/models/api_response.cr b/samples/client/petstore/crystal/src/petstore/models/api_response.cr index fd5ea0be3a3..9214bcd6cb5 100644 --- a/samples/client/petstore/crystal/src/petstore/models/api_response.cr +++ b/samples/client/petstore/crystal/src/petstore/models/api_response.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/category.cr b/samples/client/petstore/crystal/src/petstore/models/category.cr index 428ef301379..621feb0d95d 100644 --- a/samples/client/petstore/crystal/src/petstore/models/category.cr +++ b/samples/client/petstore/crystal/src/petstore/models/category.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/format_test.cr b/samples/client/petstore/crystal/src/petstore/models/format_test.cr index 8df4ac4ff1a..3ec69c0def8 100644 --- a/samples/client/petstore/crystal/src/petstore/models/format_test.cr +++ b/samples/client/petstore/crystal/src/petstore/models/format_test.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/order.cr b/samples/client/petstore/crystal/src/petstore/models/order.cr index 6cef8c5b452..a2bef44b1ea 100644 --- a/samples/client/petstore/crystal/src/petstore/models/order.cr +++ b/samples/client/petstore/crystal/src/petstore/models/order.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/pet.cr b/samples/client/petstore/crystal/src/petstore/models/pet.cr index 5172c2173fa..7a856d1e5ba 100644 --- a/samples/client/petstore/crystal/src/petstore/models/pet.cr +++ b/samples/client/petstore/crystal/src/petstore/models/pet.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/tag.cr b/samples/client/petstore/crystal/src/petstore/models/tag.cr index 4c574a4270d..3a3388b0310 100644 --- a/samples/client/petstore/crystal/src/petstore/models/tag.cr +++ b/samples/client/petstore/crystal/src/petstore/models/tag.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "big" diff --git a/samples/client/petstore/crystal/src/petstore/models/user.cr b/samples/client/petstore/crystal/src/petstore/models/user.cr index 9930b2e6469..aab8995c8a6 100644 --- a/samples/client/petstore/crystal/src/petstore/models/user.cr +++ b/samples/client/petstore/crystal/src/petstore/models/user.cr @@ -5,7 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -#OpenAPI Generator version: 6.5.0 +#OpenAPI Generator version: 6.6.0-SNAPSHOT # require "big" diff --git a/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/elixir/.openapi-generator/VERSION b/samples/client/petstore/elixir/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/elixir/.openapi-generator/VERSION +++ b/samples/client/petstore/elixir/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex index 7c8b744a7dc..530a8243535 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/another_fake.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.AnotherFake do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex index fe4bafec435..f2c970fc0b0 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/default.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.Default do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex index 687094a7951..2a29632ce9b 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.Fake do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex index 28ae1468039..92bb2c02fc7 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake_classname_tags123.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.FakeClassnameTags123 do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex index 13bb1951f3b..6fc0449a398 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.Pet do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex index b74063a0476..73a64fa3179 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.Store do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex index 87386e74892..7447f55806e 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/user.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Api.User do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex b/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex index 4d6d692e618..ceb8a476602 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/connection.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Connection do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex b/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex index 841f87aa33b..6e3e19a8c82 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/deserializer.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Deserializer do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex index 317c9ff45f7..9caa841845f 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/_foo_get_default_response.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.FooGetDefaultResponse do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex index 181009267c1..592aece259b 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/_special_model_name_.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.SpecialModelName do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex index 8fd3ba6490d..0ba55e164a4 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.AdditionalPropertiesClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex index 3b74878d5b4..0e101b1a175 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/all_of_with_single_ref.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.AllOfWithSingleRef do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex index f79cc858d91..28c4f3555b6 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/animal.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Animal do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex index 45df5690a9c..2b41e169f40 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/api_response.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ApiResponse do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex index ec16d149f63..23bf313dd33 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ArrayOfArrayOfNumberOnly do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex index d7e36cbd75c..281fbefd676 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ArrayOfNumberOnly do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex index 60570660d9d..ff58df1da6e 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ArrayTest do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex index b31f22c2e6b..de34b6b7eee 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/capitalization.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Capitalization do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex index 690b76ab988..34ee9ae5ff6 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Cat do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex index 3e394a4bfe5..c1a267b06d7 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.CatAllOf do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex index 82bb4a048b5..0a4be782fbd 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/category.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Category do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex index c53fd16e88a..bbb0ae74b40 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/class_model.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ClassModel do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex index 6648b0b0124..b56f537a7b0 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/client.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Client do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex index ada9fddabe3..a5b3c8bdafa 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/deprecated_object.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.DeprecatedObject do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex index c6b50eba960..d46c5b3919b 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Dog do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex index 0abe20d740d..3fc0f480f20 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.DogAllOf do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex index 309b5b8a381..53df8940a4c 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.EnumArrays do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex index 6d20d6fc8c5..3c90890c58d 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.EnumClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex index e91672a800c..cabce6f0929 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/enum_test.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.EnumTest do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex index 9ac21d856ca..e9bce665f21 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/file.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.File do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex index ba042adf37f..3fc54de1565 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/file_schema_test_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.FileSchemaTestClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex index d4b71553ddb..10c6830c0c8 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/foo.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Foo do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex index eb17ed59b08..9eb379379bf 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.FormatTest do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex index 43c83648a1b..c347f4b906c 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/has_only_read_only.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.HasOnlyReadOnly do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex index 3cabaaa4144..1cde2717c28 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/health_check_result.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.HealthCheckResult do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex index a757a6145f8..39db2f1e9fd 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/list.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.List do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex index 574f00099ca..9bf450e72f2 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/map_test.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.MapTest do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex index 1a08c775ee3..a69d1c6f932 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.MixedPropertiesAndAdditionalPropertiesClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex index 173270ddf64..03adc6c5135 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/model_200_response.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Model200Response do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex index 7b53035c1ca..143a0e7467a 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/name.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Name do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex index 9c47e9f1dce..ba82851861e 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.NullableClass do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex index f709a1daf18..1a242655629 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/number_only.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.NumberOnly do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex index ac4784fab94..649e94fdba6 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ObjectWithDeprecatedFields do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex index 561f7b98731..27e5b801b75 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/order.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Order do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex index 7ec4d03184e..85bf2b77a84 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_composite.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterComposite do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex index 6d77bbd1d22..eaefffa22b9 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterEnum do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex index 1ddc9dc0d18..77b4fa8ddb7 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_default_value.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterEnumDefaultValue do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex index d7b06f49969..6a370caf0c6 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterEnumInteger do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex index 4b891178501..90f0e6db156 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_enum_integer_default_value.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterEnumIntegerDefaultValue do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex index 1664fc67c0d..71c4ea76351 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.OuterObjectWithEnumProperty do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex index dbd11a920cd..6292c2670e5 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Pet do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex index a8e63f7aade..6bbc62eb52e 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/read_only_first.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.ReadOnlyFirst do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex index 9a932f7b1d9..c24e13d37f8 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/return.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Return do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex index 36b11b11183..2d35dbe1ef0 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/single_ref_type.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.SingleRefType do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex index 402f06b30d7..220711620f7 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/tag.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.Tag do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex index cce1ccab518..a85d301466c 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/user.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.Model.User do diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex b/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex index 30a1063edc7..da18e336d55 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/request_builder.ex @@ -1,4 +1,4 @@ -# NOTE: This file is auto generated by OpenAPI Generator 6.5.0 (https://openapi-generator.tech). +# NOTE: This file is auto generated by OpenAPI Generator 6.6.0-SNAPSHOT (https://openapi-generator.tech). # Do not edit this file manually. defmodule OpenapiPetstore.RequestBuilder do diff --git a/samples/client/petstore/erlang-client/.openapi-generator/VERSION b/samples/client/petstore/erlang-client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/erlang-client/.openapi-generator/VERSION +++ b/samples/client/petstore/erlang-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/erlang-proper/.openapi-generator/VERSION b/samples/client/petstore/erlang-proper/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/erlang-proper/.openapi-generator/VERSION +++ b/samples/client/petstore/erlang-proper/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/groovy/.openapi-generator/VERSION b/samples/client/petstore/groovy/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/groovy/.openapi-generator/VERSION +++ b/samples/client/petstore/groovy/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION +++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java-helidon-client/mp/.openapi-generator/VERSION b/samples/client/petstore/java-helidon-client/mp/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java-helidon-client/mp/.openapi-generator/VERSION +++ b/samples/client/petstore/java-helidon-client/mp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java-helidon-client/se/.openapi-generator/VERSION b/samples/client/petstore/java-helidon-client/se/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java-helidon-client/se/.openapi-generator/VERSION +++ b/samples/client/petstore/java-helidon-client/se/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java-micronaut-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/apache-httpclient/.openapi-generator/VERSION b/samples/client/petstore/java/apache-httpclient/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/apache-httpclient/.openapi-generator/VERSION +++ b/samples/client/petstore/java/apache-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/feign/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey3/.openapi-generator/VERSION b/samples/client/petstore/java/jersey3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/jersey3/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/VERSION b/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/VERSION +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/native-async/.openapi-generator/VERSION b/samples/client/petstore/java/native-async/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/native-async/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/native-jakarta/.openapi-generator/VERSION b/samples/client/petstore/java/native-jakarta/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/native-jakarta/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native-jakarta/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/native/.openapi-generator/VERSION b/samples/client/petstore/java/native/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/native/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-awsv4signature/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-group-parameter/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-swagger1/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-swagger1/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-swagger1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-jakarta/.openapi-generator/VERSION b/samples/client/petstore/java/webclient-jakarta/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/webclient-jakarta/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient-jakarta/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION b/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION b/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/jetbrains/http/client/.openapi-generator/VERSION b/samples/client/petstore/jetbrains/http/client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/jetbrains/http/client/.openapi-generator/VERSION +++ b/samples/client/petstore/jetbrains/http/client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/julia/.openapi-generator/VERSION b/samples/client/petstore/julia/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/julia/.openapi-generator/VERSION +++ b/samples/client/petstore/julia/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/k6/.openapi-generator/VERSION b/samples/client/petstore/k6/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/k6/.openapi-generator/VERSION +++ b/samples/client/petstore/k6/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/k6/script.js b/samples/client/petstore/k6/script.js index f1c558a68b7..19651cf0897 100644 --- a/samples/client/petstore/k6/script.js +++ b/samples/client/petstore/k6/script.js @@ -7,7 +7,7 @@ * NOTE: This class is auto generated by OpenAPI Generator. * https://github.com/OpenAPITools/openapi-generator * - * OpenAPI generator version: 6.5.0 + * OpenAPI generator version: 6.6.0-SNAPSHOT */ diff --git a/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION b/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION b/samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/.openapi-generator/VERSION b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-jvm-okhttp3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-jvm-retrofit2/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-jvm-retrofit2/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-jvm-retrofit2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-jvm-volley/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-jvm-volley/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-volley/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-jvm-volley/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-default-values-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-enum-default-value/.openapi-generator/VERSION b/samples/client/petstore/kotlin-enum-default-value/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-enum-default-value/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-enum-default-value/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-ktor-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-vertx-gson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-vertx-jackson/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-vertx-moshi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-volley/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-volley/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-jvm-volley/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-volley/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-modelMutable/.openapi-generator/VERSION b/samples/client/petstore/kotlin-modelMutable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-modelMutable/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/kotlin/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/lua/.openapi-generator/VERSION b/samples/client/petstore/lua/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/lua/.openapi-generator/VERSION +++ b/samples/client/petstore/lua/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/nim/.openapi-generator/VERSION b/samples/client/petstore/nim/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/nim/.openapi-generator/VERSION +++ b/samples/client/petstore/nim/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION +++ b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/objc/default/.openapi-generator/VERSION b/samples/client/petstore/objc/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/objc/default/.openapi-generator/VERSION +++ b/samples/client/petstore/objc/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/perl/.openapi-generator/VERSION b/samples/client/petstore/perl/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/perl/.openapi-generator/VERSION +++ b/samples/client/petstore/perl/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION b/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION +++ b/samples/client/petstore/php-dt-modern/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/php-dt/.openapi-generator/VERSION b/samples/client/petstore/php-dt/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/php-dt/.openapi-generator/VERSION +++ b/samples/client/petstore/php-dt/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION +++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php index 2569193543e..09e22117b04 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php index 37c18d2bedf..4724bde547f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index dcd446e2774..da6a7ba1261 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php index 3325499f99b..44b2c4eb518 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php index 740fbf89cf5..ce8fd47ae5d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php index 317c3b79409..3f05eabde34 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php index 4e3726dc820..01026b4746c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php index 944d54d1070..5a0c8d30236 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php index 56a044a281c..79695654c4e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php index 9953992f071..ed82662a03b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php index b53b577661a..23861ef4261 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php index c02b98981f5..7925329795f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php index b17cb135324..a183dda5ade 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php index c48b6127909..04c8d510801 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php index 37e14879fdc..8069a4cbaac 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php index 204fb95dea5..2da444a74f6 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php index f6d1e265174..dd6c91bd796 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php index 799867aa4fa..2dc05f7cba4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php index 8a2089031a0..e3ca05de413 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php index cbbd1e29792..16b93bef2c4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php index cb218b98fa3..6d71cdd611c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php index 0d6000d3cfd..a9a8f237f3d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php index f5deab209f4..4a9ffa98779 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php index d321b7bb37d..91ccc40cc31 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DeprecatedObject.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php index 06d0d675e32..c7b7da51414 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php index 509c7bef7e3..74d1b77d717 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php index a15152db66c..a535ea032b0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php index dfd1c65682a..0b46ad5ea62 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php index 95f8bdac661..843a609bd6d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php index 2e8fc19b86f..14b10bd730e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php index d8c459b4ad4..b040ac26e96 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php index bdf535bd10a..e8c2416744a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php index c1abb13c9bc..d5551495c8d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FooGetDefaultResponse.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php index 0827ece7791..1e2a92be9e1 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php index 9b4d6dfca5c..517974073a3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php index d310ef2f9cd..2a30c28e226 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php index 6d4a86ecbf4..d8bd70615be 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php index a6bec10dfb1..3283eadea66 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php index af02d8ef948..3c6f7d21d55 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php index 82eec61f43e..07d9a732edd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php index 9ef12d4b12a..7a565af9cd0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php index 65a8069c452..f99bcf7d9a4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php index ed43ef29823..c9fa3caf5f9 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php index f46c0062d93..8fa20813945 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php index 94be19ef033..7c356b8bc88 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php index 7207fc98360..7ba0fbca36d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ObjectWithDeprecatedFields.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php index e090fa5da83..d384345c949 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php index d9ebf2648df..d5ddda1de12 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php index a583e6581e2..29cd1a1125a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php index d7516db2d86..856f8424cd3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php index c47cfd4a7cc..f2f43ad5113 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php index c8762b0ecb9..89020266166 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php index b2e44d8d5e8..4ea681b091f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php index 8b150675356..2c36baf9865 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php index ee6fdc68f7d..e1a8dc81ead 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php index 69903972344..e93e0bd5174 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SingleRefType.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php index 19416facec4..6cc79ee741a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php index c73f7f173b3..b8d19f8a84d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php index 5b1cdd68cc5..8347e6360b4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index f83b0f02b7c..9e565f7db2b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -17,7 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech - * OpenAPI Generator version: 6.5.0 + * OpenAPI Generator version: 6.6.0-SNAPSHOT */ /** diff --git a/samples/client/petstore/powershell/.openapi-generator/VERSION b/samples/client/petstore/powershell/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/powershell/.openapi-generator/VERSION +++ b/samples/client/petstore/powershell/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION +++ b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python-legacy/.openapi-generator/VERSION b/samples/client/petstore/python-legacy/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/python-legacy/.openapi-generator/VERSION +++ b/samples/client/petstore/python-legacy/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python-prior/.openapi-generator/VERSION b/samples/client/petstore/python-prior/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/python-prior/.openapi-generator/VERSION +++ b/samples/client/petstore/python-prior/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION +++ b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python-tornado/.openapi-generator/VERSION b/samples/client/petstore/python-tornado/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/python-tornado/.openapi-generator/VERSION +++ b/samples/client/petstore/python-tornado/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby-autoload/.openapi-generator/VERSION b/samples/client/petstore/ruby-autoload/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/ruby-autoload/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby-autoload/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby-autoload/lib/petstore.rb b/samples/client/petstore/ruby-autoload/lib/petstore.rb index c03b9d5dce5..257eb7977b4 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb index 52401ebc792..05d0b3fa011 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/default_api.rb index bf57abb8f20..4f59877179d 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/default_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb index 92fc3b49922..5411ccf5f03 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_classname_tags123_api.rb index 7163d22acdb..57ce0947f70 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb index 9784263d466..a786d55f253 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb index 2faf3e96fac..e6502cb9087 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/user_api.rb index e9374098fab..9a6110e474e 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api_client.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api_client.rb index e62df74d628..aeb0065db84 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb index 54f766c835d..394e649d9aa 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/configuration.rb b/samples/client/petstore/ruby-autoload/lib/petstore/configuration.rb index 8b3798b8d36..962ae306fed 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/additional_properties_class.rb index 85f934fbe83..1f64bd0a207 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb index d9c9c557bc7..0d6b38fd363 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/all_of_with_single_ref.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/animal.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/animal.rb index c88e2808b38..ea1d3ca0e83 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/api_response.rb index c33bb7ae960..a43c816fce2 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_array_of_number_only.rb index 9607532b5e9..0621e52ce24 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_number_only.rb index caccc4b3a86..b1840a1a5a1 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_test.rb index 3684ea373c5..41d5e8fbd04 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/capitalization.rb index b3cd8886e18..5fd70df7332 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/cat.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/cat.rb index b15c6431046..a37c471d174 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb index 0c493378e45..b36704d4b44 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/category.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/category.rb index 525eb69facd..e56421bb1aa 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/class_model.rb index fadc9ff2c59..daa407f71d9 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/client.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/client.rb index da9d5583e25..1b7abcb0f4e 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/deprecated_object.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/deprecated_object.rb index 8d782757eae..1938fca46b7 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/deprecated_object.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/deprecated_object.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/dog.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/dog.rb index fb0b890b66c..d5005fa2ee3 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb index 0e28eec69c3..cd7da3805ac 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb index 48807017b08..1468aec213b 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_class.rb index 63f015c5035..e20d0b910a1 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_test.rb index 42675d322bd..6c19338a5df 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/file.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/file.rb index ad942c95415..060b9fd0dd6 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/file_schema_test_class.rb index 3877578a7d2..93d9a784ce1 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/foo.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/foo.rb index 7db19d53a13..78436b99622 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/foo.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/foo_get_default_response.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/foo_get_default_response.rb index ec890622158..e365037664b 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/foo_get_default_response.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/foo_get_default_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/format_test.rb index 98674d89cab..2c9f0e0f8a7 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/has_only_read_only.rb index 7b8c7b66528..62eb9936a5b 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/health_check_result.rb index eca6e1bf89f..6078f60b4c0 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/health_check_result.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/list.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/list.rb index 8809bbeb996..5a041b4978a 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/map_test.rb index 34b38ccd45e..e5e35aa130d 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 6804bfcb801..039dee330b1 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/model200_response.rb index b23616c0dbe..16cceaebc69 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/model200_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/model_return.rb index 293e707a32c..c0d70250e3e 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/name.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/name.rb index 93e0dcd0b18..051ee8ef2d0 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/nullable_class.rb index 1ae0c066461..855c08a6a19 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/nullable_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/number_only.rb index 55247c29ff7..dd46a3dca8e 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/object_with_deprecated_fields.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/object_with_deprecated_fields.rb index 685b9c9ea71..0f145a6f9f9 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/object_with_deprecated_fields.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/object_with_deprecated_fields.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb index e5d717f276b..c09b646dcee 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_composite.rb index 31fa4f38538..e3ce4ce59e0 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum.rb index 9f0814868fa..ca87ce455b8 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_default_value.rb index bd3a3a01a2d..5dd90a7444f 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer.rb index 33124dad26e..2b4a30d3372 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer_default_value.rb index 4d80c951ea7..c32fc3c27c8 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_object_with_enum_property.rb index ac665b80bb9..f89144df0f3 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/pet.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/pet.rb index 96e709723ef..58f66a67674 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/read_only_first.rb index 887f4c2ef6d..a2371786b6b 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/single_ref_type.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/single_ref_type.rb index ae1263e2104..0220f0ff961 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/single_ref_type.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/single_ref_type.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/special_model_name.rb index 84494665abb..9fb30d7bb79 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/tag.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/tag.rb index 38fc2289a4c..a7188f76af2 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/user.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/user.rb index 0e9145c0cf1..f09a3af5dfa 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/version.rb b/samples/client/petstore/ruby-autoload/lib/petstore/version.rb index f5413995f48..f01d4052179 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/version.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/petstore.gemspec b/samples/client/petstore/ruby-autoload/petstore.gemspec index 50dbc74b26c..f714e6f2d52 100644 --- a/samples/client/petstore/ruby-autoload/petstore.gemspec +++ b/samples/client/petstore/ruby-autoload/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb b/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb index 32ca71c6507..5f95ca65c3f 100644 --- a/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb b/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb index 2fa4efb69dc..f0a4b88ab64 100644 --- a/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-autoload/spec/spec_helper.rb b/samples/client/petstore/ruby-autoload/spec/spec_helper.rb index 268f9c61093..3d9db7fd694 100644 --- a/samples/client/petstore/ruby-autoload/spec/spec_helper.rb +++ b/samples/client/petstore/ruby-autoload/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb index a603aafe683..e5a8f8329e3 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb index 52401ebc792..05d0b3fa011 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb index bf57abb8f20..4f59877179d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb index 92fc3b49922..5411ccf5f03 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb index 7163d22acdb..57ce0947f70 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb index 046e4f9f23d..de9f0e93a6b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb index c6b26867f2f..2a1d04a1a03 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb index 134a85a769b..1c2a83fd668 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb index bf11677cd60..ad4f898b48d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb index 54f766c835d..394e649d9aa 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb index 8b5395d29e2..401e8c2d216 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb index 85f934fbe83..1f64bd0a207 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb index d9c9c557bc7..0d6b38fd363 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/all_of_with_single_ref.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb index c88e2808b38..ea1d3ca0e83 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb index c33bb7ae960..a43c816fce2 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb index 9607532b5e9..0621e52ce24 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb index caccc4b3a86..b1840a1a5a1 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb index 3684ea373c5..41d5e8fbd04 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb index b3cd8886e18..5fd70df7332 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb index b15c6431046..a37c471d174 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb index 0c493378e45..b36704d4b44 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb index 525eb69facd..e56421bb1aa 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb index fadc9ff2c59..daa407f71d9 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb index da9d5583e25..1b7abcb0f4e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb index 8d782757eae..1938fca46b7 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/deprecated_object.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb index fb0b890b66c..d5005fa2ee3 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb index 0e28eec69c3..cd7da3805ac 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb index 48807017b08..1468aec213b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb index 63f015c5035..e20d0b910a1 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb index 42675d322bd..6c19338a5df 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb index ad942c95415..060b9fd0dd6 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb index 3877578a7d2..93d9a784ce1 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb index 7db19d53a13..78436b99622 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo_get_default_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo_get_default_response.rb index ec890622158..e365037664b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo_get_default_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo_get_default_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb index 98674d89cab..2c9f0e0f8a7 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb index 7b8c7b66528..62eb9936a5b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb index eca6e1bf89f..6078f60b4c0 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb index 8809bbeb996..5a041b4978a 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb index 34b38ccd45e..e5e35aa130d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 6804bfcb801..039dee330b1 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb index b23616c0dbe..16cceaebc69 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb index 293e707a32c..c0d70250e3e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb index 93e0dcd0b18..051ee8ef2d0 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb index 1ae0c066461..855c08a6a19 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb index 55247c29ff7..dd46a3dca8e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb index 685b9c9ea71..0f145a6f9f9 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/object_with_deprecated_fields.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb index e5d717f276b..c09b646dcee 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb index 31fa4f38538..e3ce4ce59e0 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb index 9f0814868fa..ca87ce455b8 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb index bd3a3a01a2d..5dd90a7444f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb index 33124dad26e..2b4a30d3372 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb index 4d80c951ea7..c32fc3c27c8 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb index ac665b80bb9..f89144df0f3 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb index 96e709723ef..58f66a67674 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb index 887f4c2ef6d..a2371786b6b 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/single_ref_type.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/single_ref_type.rb index ae1263e2104..0220f0ff961 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/single_ref_type.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/single_ref_type.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb index 84494665abb..9fb30d7bb79 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb index 38fc2289a4c..a7188f76af2 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb index 0e9145c0cf1..f09a3af5dfa 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb index f5413995f48..f01d4052179 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/petstore.gemspec b/samples/client/petstore/ruby-faraday/petstore.gemspec index 5c43b82416b..b36a17bdc20 100644 --- a/samples/client/petstore/ruby-faraday/petstore.gemspec +++ b/samples/client/petstore/ruby-faraday/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb index dec22b4709c..eaa843843e2 100644 --- a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb index d587103f666..9edd18cb080 100644 --- a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb index 268f9c61093..3d9db7fd694 100644 --- a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb +++ b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/ruby/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index a603aafe683..e5a8f8329e3 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb index 52401ebc792..05d0b3fa011 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb index bf57abb8f20..4f59877179d 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index 92fc3b49922..5411ccf5f03 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb index 7163d22acdb..57ce0947f70 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb index 9784263d466..a786d55f253 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb index 2faf3e96fac..e6502cb9087 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb index e9374098fab..9a6110e474e 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index e62df74d628..aeb0065db84 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb index 54f766c835d..394e649d9aa 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index 8b3798b8d36..962ae306fed 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb index 85f934fbe83..1f64bd0a207 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb b/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb index d9c9c557bc7..0d6b38fd363 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/all_of_with_single_ref.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb index c88e2808b38..ea1d3ca0e83 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb index c33bb7ae960..a43c816fce2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index 9607532b5e9..0621e52ce24 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index caccc4b3a86..b1840a1a5a1 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb index 3684ea373c5..41d5e8fbd04 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb index b3cd8886e18..5fd70df7332 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb index b15c6431046..a37c471d174 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb index 0c493378e45..b36704d4b44 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb index 525eb69facd..e56421bb1aa 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb index fadc9ff2c59..daa407f71d9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb index da9d5583e25..1b7abcb0f4e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb b/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb index 8d782757eae..1938fca46b7 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/deprecated_object.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb index fb0b890b66c..d5005fa2ee3 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb index 0e28eec69c3..cd7da3805ac 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb index 48807017b08..1468aec213b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb index 63f015c5035..e20d0b910a1 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb index 42675d322bd..6c19338a5df 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb index ad942c95415..060b9fd0dd6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb index 3877578a7d2..93d9a784ce1 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/foo.rb b/samples/client/petstore/ruby/lib/petstore/models/foo.rb index 7db19d53a13..78436b99622 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/foo.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/foo_get_default_response.rb b/samples/client/petstore/ruby/lib/petstore/models/foo_get_default_response.rb index ec890622158..e365037664b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/foo_get_default_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/foo_get_default_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb index 98674d89cab..2c9f0e0f8a7 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb index 7b8c7b66528..62eb9936a5b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb index eca6e1bf89f..6078f60b4c0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb index 8809bbeb996..5a041b4978a 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb index 34b38ccd45e..e5e35aa130d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 6804bfcb801..039dee330b1 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb index b23616c0dbe..16cceaebc69 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb index 293e707a32c..c0d70250e3e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb index 93e0dcd0b18..051ee8ef2d0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb index 1ae0c066461..855c08a6a19 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb index 55247c29ff7..dd46a3dca8e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb b/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb index 685b9c9ea71..0f145a6f9f9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/object_with_deprecated_fields.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb index e5d717f276b..c09b646dcee 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb index 31fa4f38538..e3ce4ce59e0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb index 9f0814868fa..ca87ce455b8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb index bd3a3a01a2d..5dd90a7444f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb index 33124dad26e..2b4a30d3372 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb index 4d80c951ea7..c32fc3c27c8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb index ac665b80bb9..f89144df0f3 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb index 96e709723ef..58f66a67674 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb index 887f4c2ef6d..a2371786b6b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/single_ref_type.rb b/samples/client/petstore/ruby/lib/petstore/models/single_ref_type.rb index ae1263e2104..0220f0ff961 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/single_ref_type.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/single_ref_type.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb index 84494665abb..9fb30d7bb79 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb index 38fc2289a4c..a7188f76af2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb index 0e9145c0cf1..f09a3af5dfa 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb index f5413995f48..f01d4052179 100644 --- a/samples/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/client/petstore/ruby/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec index 50dbc74b26c..f714e6f2d52 100644 --- a/samples/client/petstore/ruby/petstore.gemspec +++ b/samples/client/petstore/ruby/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb index 32ca71c6507..5f95ca65c3f 100644 --- a/samples/client/petstore/ruby/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/spec/configuration_spec.rb b/samples/client/petstore/ruby/spec/configuration_spec.rb index 2fa4efb69dc..f0a4b88ab64 100644 --- a/samples/client/petstore/ruby/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb index 268f9c61093..3d9db7fd694 100644 --- a/samples/client/petstore/ruby/spec/spec_helper.rb +++ b/samples/client/petstore/ruby/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore-async-middleware/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/scala-akka/.openapi-generator/VERSION b/samples/client/petstore/scala-akka/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/scala-akka/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-akka/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION b/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/scala-sttp/.openapi-generator/VERSION b/samples/client/petstore/scala-sttp/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/scala-sttp/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-sttp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 257bc70c30a..05c05aa6e1c 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java index a89c21f1987..93e6853b05d 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java index 14c0d4186dd..dfe7947249d 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java index df14a5ba602..34fcbe689b0 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index a89c21f1987..93e6853b05d 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 14c0d4186dd..dfe7947249d 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index df14a5ba602..34fcbe689b0 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/VERSION b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 88f2f093e13..c2a0b54b85a 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java index e713c590113..0dbe9d3ce2a 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 91c30bed2e4..97f50c64f6f 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java index 04e81921acf..8384fa7fb16 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java index 3c489a604ca..0b84a819b21 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java index 029a3011103..c26fdb009ee 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java index 620004c2783..cb214a4edee 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/.openapi-generator/VERSION b/samples/client/petstore/spring-http-interface/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/spring-http-interface/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-http-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3121df168c2..ec495ca3c44 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java index 9383a3ef51e..657624c0d05 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 3961aae63c1..a6ab38b1310 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java index 7d6ff5a2ede..ac303a71575 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java index 59fcbe72539..786ee8a9dee 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java index 47e3e83061e..cac05c18448 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java index 620004c2783..cb214a4edee 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION b/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/asyncAwaitLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/default/.openapi-generator/VERSION b/samples/client/petstore/swift5/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/default/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION b/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/frozenEnums/.openapi-generator/VERSION b/samples/client/petstore/swift5/frozenEnums/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/frozenEnums/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/frozenEnums/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION b/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION b/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION b/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION b/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/validation/.openapi-generator/VERSION b/samples/client/petstore/swift5/validation/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/validation/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/validation/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION b/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v14-query-param-object-format/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v14-query-param-object-format/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v14-query-param-object-format/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v14-query-param-object-format/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/test-petstore/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-node-imports/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-string-enums/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION b/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION +++ b/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml index f0ec700c5eb..cce42aed834 100644 --- a/samples/meta-codegen/lib/pom.xml +++ b/samples/meta-codegen/lib/pom.xml @@ -121,7 +121,7 @@ UTF-8 - 6.5.0 + 6.6.0-SNAPSHOT 1.0.0 4.13.2 diff --git a/samples/meta-codegen/usage/.openapi-generator/VERSION b/samples/meta-codegen/usage/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/meta-codegen/usage/.openapi-generator/VERSION +++ b/samples/meta-codegen/usage/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/3_0_3_unit_test/python/.openapi-generator/VERSION b/samples/openapi3/client/3_0_3_unit_test/python/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/3_0_3_unit_test/python/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/elm/.openapi-generator/VERSION b/samples/openapi3/client/elm/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/elm/.openapi-generator/VERSION +++ b/samples/openapi3/client/elm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb index 87349ab219d..d91959973d0 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb index d7215032f4b..7a6ca0c6f26 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb index 93832e01b34..8677d9a2891 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb index 2fedb6a24a7..fbc5916e61a 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb index 1e77b9740fd..325c7afb8e8 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb index 7f071951cbd..f8a0d16b371 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb index bd6680c5861..b1b0fb17430 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb index d16d4620539..4d7633cf6b0 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb index bb696b47832..f843c284205 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec index d6d4ccebbd5..6d4f1a3bab1 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec b/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec index 0c9fcca629c..1ffb9c74c86 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec +++ b/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb index ad7a7003e1f..345ce5bbe63 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb index ca7ac26767f..166d15a1873 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb index 0ee7167c236..e3341d31e86 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb index ed742972b55..fd77a5a018f 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb index 3a671c36b18..23c395ce9b4 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb index 25acb2f7e6f..34376ab3525 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb index bbdc12e23f8..5ccc1426266 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb index 52f81ccee8c..b87d8cd6458 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb index e37c9a87599..00c8edfe565 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb index 3404676d23a..85f61f1c524 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb index edfef16b640..fca23f17636 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb index ce5c009babd..864da148890 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb index 15cfed1446c..89fb48ad1d8 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb index adca20c1e89..78bc5b136be 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb index febbef19d7d..09c1172c0af 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb index 78d9c7b7e26..39e6a02d9b1 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb index ed18a27b388..22c659d63bc 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec index 85bd6017097..604104f6eec 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec @@ -8,7 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb index b9de8bfa8b0..c9c8a19d252 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb index 51ede7a1545..862732fcf02 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb index 86a0d644009..33f3faebaf1 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb @@ -6,7 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -OpenAPI Generator version: 6.5.0 +OpenAPI Generator version: 6.6.0-SNAPSHOT =end diff --git a/samples/openapi3/client/petstore/dart-dio/oneof/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/oneof/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/dart-dio/oneof/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/oneof/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100755 --- a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100755 --- a/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-nextgen/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-prior/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-prior/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/python-prior/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-prior/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java index 92e69ee3c3c..a847edc3745 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java index 2b53c83e0fd..586a3ee3c3d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java index 84fcd9439d5..a00fe267dce 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index fd60e1c5043..d4e5a168232 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index b22a2702fdf..5586d9dbe63 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index 368403674be..f57bf08e271 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 74126bc7aad..77117b5e2a0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index ec48a4f2635..cbeeb3e6ff5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index e157df0cced..25f4c78a08d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 8cb7b4b06c9..f1dc1416e0c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java index 6e27df2ead7..7df980be144 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index f47398e2bac..aa0a0a65979 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index a00ee406501..48e9c65071d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index afeb420c208..692747c1626 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 525e71955db..590cbad7aed 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 00a92009dd2..b4fa20fd37e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index fe89bca1a46..fa56fcbb8c6 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 1d9dbc01f7e..f697879f04c 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index c98b6af25ab..9aaeb6a25a4 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java index 36912fd6cd2..dedb49c7a9c 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index 7b234b346c7..97d9884a3c5 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index c8b576f506c..d55ecdfdc76 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/spring-stubs/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index c49cfca894b..1f709c32258 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index 87519f01e03..2c2ea792cc5 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index 9d9a89f454f..96810c41a55 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/browser/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/browser/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/schema/petstore/avro-schema/.openapi-generator/VERSION b/samples/openapi3/schema/petstore/avro-schema/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/schema/petstore/avro-schema/.openapi-generator/VERSION +++ b/samples/openapi3/schema/petstore/avro-schema/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java index 96437c5ff6d..bb8f2e38be0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java index 31bff59705a..71f4bed28f9 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java index 41c15579d77..4b8826ac313 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java index af04f8a7995..b201e5f8b57 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java index f2374cd3a0c..30b88e68bc8 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java index ca42ce705e7..b87b869b878 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java index 5c9e29d6cb5..3a50124d809 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java index 4b0a3d06f23..17aeeddb465 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 0bb8f6fb93e..827c5e085a4 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index f4c98b5fecb..45e95d7df60 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index aae1fd2669e..de538b18f5d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index d77dd779583..693664d5166 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 009e01ee750..5c5e76de85f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 3901ee7d9ee..ad3251d90a3 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 457c742c8e9..c1a894ca499 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index b7c2f866c8d..413b4bfe18a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e5b380af62d..7727adf9699 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 37ff153aa0c..2d7b508f42c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 305bd7cf8b7..8ac8f70291a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index e8cb6fe6986..f83b02872e0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java index 13b00d2f3a4..6024e00ff06 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java index ed9199348c4..c287edd2550 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java index 543cf6d3b4e..876633d5b57 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/openapi3/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index a9ffc82e7ce..3bd0f71d151 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index d68d13d00f6..59ce82ebcd2 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 14423f9e940..d7cb45aff0a 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/schema/petstore/ktorm-modelMutable/.openapi-generator/VERSION b/samples/schema/petstore/ktorm-modelMutable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/schema/petstore/ktorm-modelMutable/.openapi-generator/VERSION +++ b/samples/schema/petstore/ktorm-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/schema/petstore/ktorm/.openapi-generator/VERSION b/samples/schema/petstore/ktorm/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/schema/petstore/ktorm/.openapi-generator/VERSION +++ b/samples/schema/petstore/ktorm/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/schema/petstore/mysql/.openapi-generator/VERSION b/samples/schema/petstore/mysql/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/schema/petstore/mysql/.openapi-generator/VERSION +++ b/samples/schema/petstore/mysql/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION b/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION +++ b/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-6.0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/aspnetcore-6.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-6.0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION b/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION b/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp index 9b34c42a1c1..d8dfffbb933 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h index 381f4f47b10..20176fcbaa9 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp index cfde779ea8d..cd73e672e8c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h index e1801018139..f4476e54841 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp index f55ef594ba6..000a89c909a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h index 98d8b0260e1..0f964ff5d9e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp index 23a09a13d5e..df91df84e52 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h index 2a42920ac77..a3a7028ec46 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp index 511900c1096..73d81f95c58 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h index 1497f994cd0..35d1a24c808 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp index 98737e88124..a7ea634a0d4 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h index bfb14d51e47..b1b08fa2a10 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp index bb00af89a4c..0d3dc726963 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h index dfeb2ac2748..21c76e8ba4d 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp index 0eef8a03771..4ef3e3d282c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h index f0a1b2a476a..b03ea84b90c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp index 9819d605143..3e40304fdeb 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h index 1acfd382b75..c88a08edd05 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp index d5d461a046c..fc6e0a7fc58 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h index 08c5246edd2..2c09dacd375 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp index 122742e788f..462a3147acc 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h index 289dc96a5d7..7c00c456a50 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp index 161381468cf..3855861478b 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h index 88fd938870e..da90bcde757 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp index ebf110c6f33..08e7a848007 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h index 9de0c021ef4..56ec8435ce0 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp index a8cfdc210c5..2cfe33fffe8 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h index 95a6ff46d45..4a1bf294f09 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp index 5834ff6434c..4628969eb5b 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h index f7aed72f8ae..ec1a97be053 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp index 10fefc3c9c0..ede8b0c3067 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h index f5f045c25ae..223a8cc6e79 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp index d5f887d4067..cfa249cef9a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h index 8170a35f82d..a6baaa59423 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp index a5aa1800987..28897979fef 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h index e5092d86157..bed42f0e0e1 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp index 4cad1a7559a..0702f3d7e9e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h index 3af3975edcf..88c60724fcb 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp index 8511e2d7207..f1fd9be2974 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h index f54e0995622..dc8a8f1bdb2 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp index 0356695024e..6c87b513dfd 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h index e1ea3b8c36a..ba773ede854 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp index 80312d24d7b..337b84288cc 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h index 90a441fdfc5..82cafbd636e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp index e0ca3059622..c72f66fcfa2 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h index 20ef908fefc..6da4c439480 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp index e00708e0ec3..20ad829bc3a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h index 781725635a8..3b84896f115 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp index a13b2e5bec4..9f3513e7715 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h index e8ec3392449..90b9320187c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp index 2fa91420d42..04c74acdff7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h index 26ab37d8900..afcd6e5e8ae 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp index f65524c3572..d80447fb054 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h index ebd17277cec..5faec8104b8 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp index f69afe8fc0c..384f02eeb1b 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h index c01478c33a6..fd5e8e57ba2 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp index 1b857bc9cd1..7b0554b9780 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h index 48dde763fa7..628817d2188 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp index 063d91de9cf..96f9d5e3aa5 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h index a04f263e846..d51f4c9d5cb 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp index 918d347efe7..87a95b75d34 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h index ac7ae7c111c..7c7c5e7a657 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp index 40e54e1cd9b..d8e83d186b6 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h index a4fb9bfa1c9..24ef4fdb462 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp index a1decc8e62d..8010b9382a6 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h index 0bd83e49e3d..5cd6bfaace4 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp index 240f242bf8b..ec9dcbeb8ef 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h index 127ff11df59..997e1e8f015 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp index 7ae918e9481..fe0b7ab629a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h index 9652ba3ade2..17f1c9e5d63 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp index ee062180b3f..b388d8dec48 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h index fbd27114a21..82085a4f3f6 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp index 36d5d709b53..2780ed25e0a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h index e851deed2b7..078f4bad907 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp index 8baa8c4bd24..8c6235a0dbd 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h index 1725da4ae21..ab8546364f0 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp index fd86a647a7e..523ff755bc3 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h index 5a7c28d9199..4956accfdc5 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp index 3ba2d387f66..d9cf42731bc 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h index 331ac5ea299..9d31a2ff161 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp index d115457b449..c3f83f8cea7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h index eba1a79b3e4..187e3b0cdd4 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp index 8ba07c12fc0..8a3086e68b7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h index c59cd099554..2f8ab0290fd 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp index 41d6524e5da..7b9c16414d8 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h index 1d00a0af891..cfe0bbaa9a7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp index b871b949224..ec48cd9b45b 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h index 6bd4c6eaab2..01cb20b0b16 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp index 76234fbfa01..a77e594a702 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h index 108554839cf..cb8cab99069 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp index e2129f2a061..13c97075c51 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h index f0008a813cb..8476bdc368e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp index 93a4c40a8f5..1af26db64ea 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h index 2f8de7c4e23..915bcea0d6a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp index 185394f95fa..1d67df8341c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h index 26b37cf6c6f..490817be078 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp index 6cb256384c2..0bb8b6eb517 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h index ffe82b40b02..c66caa41167 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp index 6bb9d9224f1..1b865ef6c21 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h index b0da954252e..c79e53ec873 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp index 7f61cdb5ad1..0caa7e49476 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h index cabced96400..9968459bb84 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp index 45306f69e4e..a17c2cc59eb 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h index 8868ba11d2d..9863862c29e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp index 7554087323a..d95f4c0482a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h index 3fffc76f687..95f50abf200 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp index c3452e44511..7f287d5b4b7 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h index 829ee6dbc3b..ff06e271e3e 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h index 5f97d712809..0c919e3d908 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp index d73ecf32ed2..3d2383cbd2c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h index 45c8501d400..55ee8c8176a 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h @@ -5,7 +5,7 @@ * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 6.5.0. + * NOTE: This class is auto generated by OpenAPI-Generator 6.6.0-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/erlang-server/.openapi-generator/VERSION b/samples/server/petstore/erlang-server/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/erlang-server/.openapi-generator/VERSION +++ b/samples/server/petstore/erlang-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-api-server/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/go-api-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-api-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-chi-server/.openapi-generator/VERSION b/samples/server/petstore/go-chi-server/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/go-chi-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-chi-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-echo-server/.openapi-generator/VERSION b/samples/server/petstore/go-echo-server/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/go-echo-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-echo-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-server-required/.openapi-generator/VERSION b/samples/server/petstore/go-server-required/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/go-server-required/.openapi-generator/VERSION +++ b/samples/server/petstore/go-server-required/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/haskell-servant/.openapi-generator/VERSION b/samples/server/petstore/haskell-servant/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/haskell-servant/.openapi-generator/VERSION +++ b/samples/server/petstore/haskell-servant/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/haskell-yesod/.openapi-generator/VERSION b/samples/server/petstore/haskell-yesod/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/haskell-yesod/.openapi-generator/VERSION +++ b/samples/server/petstore/haskell-yesod/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-camel/.openapi-generator/VERSION b/samples/server/petstore/java-camel/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-camel/.openapi-generator/VERSION +++ b/samples/server/petstore/java-camel/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-camel/pom.xml b/samples/server/petstore/java-camel/pom.xml index 46c37a72714..c71b3fa11c7 100644 --- a/samples/server/petstore/java-camel/pom.xml +++ b/samples/server/petstore/java-camel/pom.xml @@ -1,6 +1,6 @@ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java index bc3b8f6c66e..c69b6498c87 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/ValidationErrorProcessor.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/ValidationErrorProcessor.java index 37d9b15aefd..1ea28c799c1 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/ValidationErrorProcessor.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/ValidationErrorProcessor.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java index fd2532cd671..966ed20a5c6 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java index 79c466503fc..bc1e7c33329 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiValidator.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiValidator.java index 626b81b7c0d..9133a3eedd7 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiValidator.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiValidator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApi.java index da898c4e057..ac791fbffc0 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java index 8108b0228f1..4b7ee0235bc 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiValidator.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiValidator.java index db069d523cf..7e245bac113 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiValidator.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiValidator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApi.java index 82aba7d23c8..c0b71af24e2 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java index 221e587b9d8..723bf62a5f6 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiValidator.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiValidator.java index b848d9be926..d642cf365d9 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiValidator.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiValidator.java @@ -1,5 +1,5 @@ /** -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/java-camel/src/main/resources/application.properties b/samples/server/petstore/java-camel/src/main/resources/application.properties index 7a7b71c29fe..53893317865 100644 --- a/samples/server/petstore/java-camel/src/main/resources/application.properties +++ b/samples/server/petstore/java-camel/src/main/resources/application.properties @@ -1,4 +1,4 @@ -# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). +# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). # https://openapi-generator.tech # Do not edit the class manually. diff --git a/samples/server/petstore/java-helidon-server/mp/.openapi-generator/VERSION b/samples/server/petstore/java-helidon-server/mp/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-helidon-server/mp/.openapi-generator/VERSION +++ b/samples/server/petstore/java-helidon-server/mp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-helidon-server/se/.openapi-generator/VERSION b/samples/server/petstore/java-helidon-server/se/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-helidon-server/se/.openapi-generator/VERSION +++ b/samples/server/petstore/java-helidon-server/se/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-micronaut-server/.openapi-generator/VERSION b/samples/server/petstore/java-micronaut-server/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-micronaut-server/.openapi-generator/VERSION +++ b/samples/server/petstore/java-micronaut-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION +++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-undertow/.openapi-generator/VERSION b/samples/server/petstore/java-undertow/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-undertow/.openapi-generator/VERSION +++ b/samples/server/petstore/java-undertow/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION b/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION +++ b/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/java8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-jakarta/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/julia/.openapi-generator/VERSION b/samples/server/petstore/julia/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/julia/.openapi-generator/VERSION +++ b/samples/server/petstore/julia/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server-modelMutable/README.md b/samples/server/petstore/kotlin-server-modelMutable/README.md index 98a15d5f9c4..f93aeafd6ca 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/README.md +++ b/samples/server/petstore/kotlin-server-modelMutable/README.md @@ -2,7 +2,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -Generated by OpenAPI Generator 6.5.0. +Generated by OpenAPI Generator 6.6.0-SNAPSHOT. ## Requires diff --git a/samples/server/petstore/kotlin-server/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/jaxrs-spec/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-server/jaxrs-spec/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server/jaxrs-spec/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md index 98a15d5f9c4..f93aeafd6ca 100644 --- a/samples/server/petstore/kotlin-server/ktor/README.md +++ b/samples/server/petstore/kotlin-server/ktor/README.md @@ -2,7 +2,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -Generated by OpenAPI Generator 6.5.0. +Generated by OpenAPI Generator 6.6.0-SNAPSHOT. ## Requires diff --git a/samples/server/petstore/kotlin-springboot-3/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-springboot-3/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index f450ef18741..b5c8137f43e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 4bc64fcf4d4..472b908b0ce 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index e88b20e7782..c290826e4b5 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-source-swagger1/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-source-swagger2/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-springfox/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-springfox/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-springfox/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-vertx-modelMutable/.openapi-generator/VERSION b/samples/server/petstore/kotlin-vertx-modelMutable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin-vertx-modelMutable/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-vertx-modelMutable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION b/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin/vertx/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-laravel/.openapi-generator/VERSION b/samples/server/petstore/php-laravel/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/php-laravel/.openapi-generator/VERSION +++ b/samples/server/petstore/php-laravel/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION +++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION b/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION +++ b/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION b/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION +++ b/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-slim4/.openapi-generator/VERSION b/samples/server/petstore/php-slim4/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/php-slim4/.openapi-generator/VERSION +++ b/samples/server/petstore/php-slim4/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION +++ b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-fastapi/.openapi-generator/VERSION b/samples/server/petstore/python-fastapi/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/python-fastapi/.openapi-generator/VERSION +++ b/samples/server/petstore/python-fastapi/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-flask/.openapi-generator/VERSION b/samples/server/petstore/python-flask/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/python-flask/.openapi-generator/VERSION +++ b/samples/server/petstore/python-flask/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION b/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION +++ b/samples/server/petstore/scala-akka-http-server/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java index 7aecebb678a..5e403262555 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index c5e1b39dfbf..43b02451eac 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e0873f04fb0..ad4f3ee2673 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java index b279949bfe7..db06ceb0099 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java index d07e70a2db5..07286e99d6a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java index 1f863ec0529..1dab39c466b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION b/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-boot-nullable-set/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java index 9a09d977a29..44f5395aae8 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index e71d03ee2b5..e92e3f003ac 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index c5d4d66f8ef..bb8a7f6449c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b941108210d..f47b1091fa2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 2ec860ed35c..c88254615eb 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 7ea34ac37fb..71d982b71cf 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 52fcd675071..8c735aaed8c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index e71d03ee2b5..e92e3f003ac 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index c5d4d66f8ef..bb8a7f6449c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b941108210d..f47b1091fa2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index 2ec860ed35c..c88254615eb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 7ea34ac37fb..71d982b71cf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index 52fcd675071..8c735aaed8c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 95380ccf953..d96ca713f7e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index c205ddc6ebd..d220b8979d9 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 17a855f68bc..4e1bc66c031 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index a25dc15f2a3..899295a4e46 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 255dedfdb89..f8009eeee46 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index 1f8f7c26552..3dca4da53e0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java index 47403f5f86e..52a2814a6c2 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java index ec7c6ee038e..dbf3155c49c 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java index 8fe6b47682b..f7982dd06ef 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 95380ccf953..d96ca713f7e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index c205ddc6ebd..d220b8979d9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 17a855f68bc..4e1bc66c031 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index a25dc15f2a3..899295a4e46 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 255dedfdb89..f8009eeee46 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 1f8f7c26552..3dca4da53e0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java index 20309677d06..b360ea1cd9d 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java index ed9199348c4..c287edd2550 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java index 543cf6d3b4e..876633d5b57 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index e71d03ee2b5..e92e3f003ac 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 6055c7bc26e..ee7f604c620 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b941108210d..f47b1091fa2 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 48af6a63cda..7af26aaed8d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 7ea34ac37fb..71d982b71cf 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 52fcd675071..8c735aaed8c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index e8acb813d7f..77e8ec2a98b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index d51f8492e55..9315c722130 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e71c6272da0..959c05581ea 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 5924b3afe4b..9ee669016c3 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 4bd283c236c..8ab650b3963 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index eb0ad964e4f..8ebf55168a8 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 2175936d56d..a411e98cb96 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index e7523faef39..a528a3c61b1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index af1c1a59374..72937ebd7f4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index b36166005b3..0dc990e943e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index f697d5f96db..db8129e6103 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index 487c1534430..dfae18f8051 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index a69e6fd80ef..ff0ef0f5dd2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index 2175936d56d..a411e98cb96 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index e7523faef39..a528a3c61b1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index af1c1a59374..72937ebd7f4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index b36166005b3..0dc990e943e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index f697d5f96db..db8129e6103 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index 487c1534430..dfae18f8051 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java index d27b2ef9cfa..0438ff8c9b2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index f31080cb2c7..d93d73152b8 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index c651d03c372..8b7f39b23f7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 355dade6fef..33fdf0aab9a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index e0df01a0ceb..5855396371c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 21ce887e05e..24f8b620261 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index 67e79c3f967..76fc9860ed5 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index f424fccea0a..f8328af34fc 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index f31080cb2c7..d93d73152b8 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index c651d03c372..8b7f39b23f7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 355dade6fef..33fdf0aab9a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index e0df01a0ceb..5855396371c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 21ce887e05e..24f8b620261 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 67e79c3f967..76fc9860ed5 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java index dd997c03cbf..88e6699a723 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index e71d03ee2b5..e92e3f003ac 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 41dd2a0f0a4..5d3b98518d8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b941108210d..f47b1091fa2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 9c426b53678..3d1219c01bd 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 7ea34ac37fb..71d982b71cf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index 52fcd675071..8c735aaed8c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index a5c17af94d3..fc123822e00 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index a5e8e1c451c..ecb476cceb6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index df97133a7a3..efbb32ad3a2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index b777029e331..84e6a923219 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index 6398066a708..15c411357dc 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index d72d2b287b7..473b0ed9ee6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION index 4be2c727ad9..ba8a874deab 100644 --- a/samples/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0 \ No newline at end of file +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index dcd923e097d..a1952d9e40a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index 6e8e551a82e..adc851f16d5 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 445e5f04644..6e6107d05be 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 5054eee9e2b..a5741ae50db 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index 92f9fad031f..b23026e355a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index de77203cb7a..fccd671491c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,5 @@ /** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.5.0). + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.6.0-SNAPSHOT). * https://openapi-generator.tech * Do not edit the class manually. */ From 938c72cec0c6512ef27198c5f82fe0df75eea613 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 1 Apr 2023 19:00:14 +0800 Subject: [PATCH 103/131] trigger build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fe07b5d13c2..f83a6d7630e 100644 --- a/README.md +++ b/README.md @@ -1245,3 +1245,4 @@ See the License for the specific language governing permissions and limitations under the License. --- + From 033b946856c17aaed53c4cc566fa0df6c7de9765 Mon Sep 17 00:00:00 2001 From: Samuel Kahn <48932506+Kahncode@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:01:45 +0200 Subject: [PATCH 104/131] [cpp-ue4] Series of fixes for cpp-ue4 (#15068) * [cpp-ue4] Removed warning related to wrong casing of HTTP module * [cpp-ue4] Fixed compilation error when using file parameters in json body generation * [cpp-ue4] Do not write the form param json body generation unless there actually are form params * [cpp-ue4] Added support for enum values in path params --- .../src/main/resources/cpp-ue4/Build.cs.mustache | 2 +- .../resources/cpp-ue4/api-operations-source.mustache | 9 ++++++++- .../src/main/resources/cpp-ue4/helpers-header.mustache | 8 +++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/Build.cs.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/Build.cs.mustache index 9b33c5d3d57..bfbee1158a3 100644 --- a/modules/openapi-generator/src/main/resources/cpp-ue4/Build.cs.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-ue4/Build.cs.mustache @@ -11,7 +11,7 @@ public class {{unrealModuleName}} : ModuleRules new string[] { "Core", - "Http", + "HTTP", "Json", } ); diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/api-operations-source.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/api-operations-source.mustache index 4868c236ea1..15ef30e93a5 100644 --- a/modules/openapi-generator/src/main/resources/cpp-ue4/api-operations-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-ue4/api-operations-source.mustache @@ -172,11 +172,16 @@ void {{classname}}::{{operationIdCamelCase}}Request::SetupHttpRequest(const FHtt HttpRequest->SetContentAsString(JsonBody); {{/bodyParams.0}} {{^bodyParams.0}} - // Form parameters + {{#formParams.0}} + // Form parameters added to try to generate a json body when no body parameters are specified. FString JsonBody; JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); Writer->WriteObjectStart(); {{#formParams}} + {{#isFile}} + UE_LOG(Log{{unrealModuleName}}, Error, TEXT("Form parameter ({{baseName}}) was ignored, Files are not supported in json body")); + {{/isFile}} + {{^isFile}} {{#required}} Writer->WriteIdentifierPrefix(TEXT("{{baseName}}")); WriteJsonValue(Writer, {{paramName}}); @@ -187,11 +192,13 @@ void {{classname}}::{{operationIdCamelCase}}Request::SetupHttpRequest(const FHtt WriteJsonValue(Writer, {{paramName}}.GetValue()); } {{/required}} + {{/isFile}} {{/formParams}} Writer->WriteObjectEnd(); Writer->Close(); HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); HttpRequest->SetContentAsString(JsonBody); + {{/formParams.0}} {{/bodyParams.0}} } else if (Consumes.Contains(TEXT("multipart/form-data"))) diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-header.mustache index 640db9da815..f2a75bcf9dd 100644 --- a/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-header.mustache @@ -94,12 +94,18 @@ FString Base64UrlEncode(const T& Value) return Base64String; } -template +template::value, int>::type = 0> inline FStringFormatArg ToStringFormatArg(const T& Value) { return FStringFormatArg(Value); } +template::value, int>::type = 0> +inline FStringFormatArg ToStringFormatArg(const T& EnumModelValue) +{ + return FStringFormatArg(T::EnumToString(EnumModelValue.Value)); +} + inline FStringFormatArg ToStringFormatArg(const FDateTime& Value) { return FStringFormatArg(Value.ToIso8601()); From 3d7c173eb2f40ff97d067eaa14d2991f2cd6b7a5 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 1 Apr 2023 19:11:37 +0800 Subject: [PATCH 105/131] update ue4 c++ client --- samples/client/petstore/cpp-ue4/OpenAPI.Build.cs | 2 +- .../petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp | 9 +++------ samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h | 8 +++++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/samples/client/petstore/cpp-ue4/OpenAPI.Build.cs b/samples/client/petstore/cpp-ue4/OpenAPI.Build.cs index f6d2f83eba8..bb8262b7433 100644 --- a/samples/client/petstore/cpp-ue4/OpenAPI.Build.cs +++ b/samples/client/petstore/cpp-ue4/OpenAPI.Build.cs @@ -22,7 +22,7 @@ public class OpenAPI : ModuleRules new string[] { "Core", - "Http", + "HTTP", "Json", } ); diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp index 4708d2e8468..5e19551bda8 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp @@ -382,7 +382,7 @@ void OpenAPIPetApi::UpdatePetWithFormRequest::SetupHttpRequest(const FHttpReques // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { - // Form parameters + // Form parameters added to try to generate a json body when no body parameters are specified. FString JsonBody; JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); Writer->WriteObjectStart(); @@ -470,7 +470,7 @@ void OpenAPIPetApi::UploadFileRequest::SetupHttpRequest(const FHttpRequestRef& H // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { - // Form parameters + // Form parameters added to try to generate a json body when no body parameters are specified. FString JsonBody; JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); Writer->WriteObjectStart(); @@ -478,10 +478,7 @@ void OpenAPIPetApi::UploadFileRequest::SetupHttpRequest(const FHttpRequestRef& H Writer->WriteIdentifierPrefix(TEXT("additionalMetadata")); WriteJsonValue(Writer, AdditionalMetadata.GetValue()); } - if (File.IsSet()){ - Writer->WriteIdentifierPrefix(TEXT("file")); - WriteJsonValue(Writer, File.GetValue()); - } + UE_LOG(LogOpenAPI, Error, TEXT("Form parameter (file) was ignored, Files are not supported in json body")); Writer->WriteObjectEnd(); Writer->Close(); HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h index ff8497f23f9..799e218f281 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h @@ -103,12 +103,18 @@ FString Base64UrlEncode(const T& Value) return Base64String; } -template +template::value, int>::type = 0> inline FStringFormatArg ToStringFormatArg(const T& Value) { return FStringFormatArg(Value); } +template::value, int>::type = 0> +inline FStringFormatArg ToStringFormatArg(const T& EnumModelValue) +{ + return FStringFormatArg(T::EnumToString(EnumModelValue.Value)); +} + inline FStringFormatArg ToStringFormatArg(const FDateTime& Value) { return FStringFormatArg(Value.ToIso8601()); From 3b1118720009e87a91a1455da4d4d6c106f392eb Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Tue, 4 Apr 2023 03:15:14 -0400 Subject: [PATCH 106/131] made escaped regex be not literal strings (#15107) --- .../src/main/resources/csharp-netcore/ClientUtils.mustache | 2 +- .../libraries/generichost/ClientUtils.mustache | 2 +- .../src/main/resources/csharp-netcore/validatable.mustache | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs | 4 ++-- .../src/Org.OpenAPITools/Model/FormatTest.cs | 6 +++--- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Client/ClientUtils.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- 50 files changed, 80 insertions(+), 80 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache index ab126614f96..ffd28edb4a2 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache @@ -42,7 +42,7 @@ namespace {{packageName}}.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache index a8a92172aaf..7e59130d6eb 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache @@ -96,7 +96,7 @@ namespace {{packageName}}.{{clientPackage}} /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache index 19b22fe6610..2799fca039b 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache @@ -74,7 +74,7 @@ {{#pattern}} {{^isByteArray}} // {{{name}}} ({{{dataType}}}) pattern - Regex regex{{{name}}} = new Regex(@"{{{vendorExtensions.x-regex}}}"{{#vendorExtensions.x-modifiers}}{{#-first}}, {{/-first}}RegexOptions.{{{.}}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}); + Regex regex{{{name}}} = new Regex("{{{vendorExtensions.x-regex}}}"{{#vendorExtensions.x-modifiers}}{{#-first}}, {{/-first}}RegexOptions.{{{.}}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}); if (false == regex{{{name}}}.Match(this.{{{name}}}{{#isUuid}}.ToString(){{/isUuid}}).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for {{{name}}}, must match a pattern of " + regex{{{name}}}, new [] { "{{{name}}}" }); diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs index 3bcd98df7ca..d434ef6ec95 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs index 8e33ee2d9b5..85ec4341271 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs index 11b480ef63b..da13eb8e763 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs @@ -183,14 +183,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs index 6878c32a1cc..40e08c968d8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs @@ -796,7 +796,7 @@ namespace Org.OpenAPITools.Model } // String (string) pattern - Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexString = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); @@ -815,14 +815,14 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index de88a24f150..b856a6fc2da 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -253,7 +253,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs index 891954e7423..4cb4f694a0d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -100,7 +100,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs index 3159d60abc0..fb804227a4a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs @@ -82,14 +82,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index 947ae38ad22..cef3da2565d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -303,21 +303,21 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); } // StringProperty (string) pattern - Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexStringProperty = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexStringProperty.Match(this.StringProperty).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index a2c51715075..3d8c9eaa03c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -100,7 +100,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs index 812a804966f..dfba54b0e22 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -98,7 +98,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs index 7282462348f..2dfef8c50f9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs @@ -80,14 +80,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index 5c0a53ed71a..d5ee0dad1d7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -301,21 +301,21 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); } // StringProperty (string) pattern - Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexStringProperty = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexStringProperty.Match(this.StringProperty).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 090600eafa4..f3ffa051767 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -98,7 +98,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs index d8a9f0ca4a0..5ca0572afc1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -100,7 +100,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs index 6eb7acc88f4..f751f61c759 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -100,7 +100,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs index 6eb7acc88f4..f751f61c759 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -100,7 +100,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs index 46f2d9ea2b3..0ad137a0707 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -98,7 +98,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs index 7282462348f..2dfef8c50f9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs @@ -80,14 +80,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index 5c0a53ed71a..d5ee0dad1d7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -301,21 +301,21 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); } // StringProperty (string) pattern - Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexStringProperty = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexStringProperty.Match(this.StringProperty).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 090600eafa4..f3ffa051767 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -98,7 +98,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs index 8e33ee2d9b5..85ec4341271 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs index 26fb7d71d1c..b8cf5d357d3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs @@ -140,14 +140,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs index 518a272be5a..bf8985d265c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -417,7 +417,7 @@ namespace Org.OpenAPITools.Model } // String (string) pattern - Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexString = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); @@ -436,14 +436,14 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index ab33594b0e2..f38683669af 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -166,7 +166,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs index 8e33ee2d9b5..85ec4341271 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs index 8b1f87d1aa9..5e83de8a154 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs @@ -139,14 +139,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs index 743b84f13a9..caa163075e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs @@ -416,7 +416,7 @@ namespace Org.OpenAPITools.Model } // String (string) pattern - Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexString = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); @@ -435,14 +435,14 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 2a0e96d6bc0..0a0750f14cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs index 8e33ee2d9b5..85ec4341271 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs index 8b1f87d1aa9..5e83de8a154 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs @@ -139,14 +139,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs index 743b84f13a9..caa163075e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs @@ -416,7 +416,7 @@ namespace Org.OpenAPITools.Model } // String (string) pattern - Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexString = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); @@ -435,14 +435,14 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 2a0e96d6bc0..0a0750f14cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs index 8e33ee2d9b5..85ec4341271 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs index 8b1f87d1aa9..5e83de8a154 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs @@ -139,14 +139,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs index 743b84f13a9..caa163075e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -416,7 +416,7 @@ namespace Org.OpenAPITools.Model } // String (string) pattern - Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexString = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); @@ -435,14 +435,14 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 2a0e96d6bc0..0a0750f14cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs index 6653454671d..362905a2e52 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -32,7 +32,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs index 8e33ee2d9b5..85ec4341271 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs index 8b1f87d1aa9..5e83de8a154 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs @@ -139,14 +139,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs index 743b84f13a9..caa163075e7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -416,7 +416,7 @@ namespace Org.OpenAPITools.Model } // String (string) pattern - Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexString = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); @@ -435,14 +435,14 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 2a0e96d6bc0..0a0750f14cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -165,7 +165,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs index 8e33ee2d9b5..85ec4341271 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs index 4706c3f55e8..7c02585ec3f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs @@ -127,14 +127,14 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Cultivar (string) pattern - Regex regexCultivar = new Regex(@"^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); + Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); if (false == regexCultivar.Match(this.Cultivar).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Cultivar, must match a pattern of " + regexCultivar, new [] { "Cultivar" }); } // Origin (string) pattern - Regex regexOrigin = new Regex(@"^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexOrigin = new Regex("^[A-Z\\s]*$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexOrigin.Match(this.Origin).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Origin, must match a pattern of " + regexOrigin, new [] { "Origin" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs index 9829a5b138b..58000bcfd12 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs @@ -401,7 +401,7 @@ namespace Org.OpenAPITools.Model } // String (string) pattern - Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexString = new Regex("[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); @@ -420,14 +420,14 @@ namespace Org.OpenAPITools.Model } // PatternWithDigits (string) pattern - Regex regexPatternWithDigits = new Regex(@"^\\d{10}$", RegexOptions.CultureInvariant); + Regex regexPatternWithDigits = new Regex("^\\d{10}$", RegexOptions.CultureInvariant); if (false == regexPatternWithDigits.Match(this.PatternWithDigits).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigits, must match a pattern of " + regexPatternWithDigits, new [] { "PatternWithDigits" }); } // PatternWithDigitsAndDelimiter (string) pattern - Regex regexPatternWithDigitsAndDelimiter = new Regex(@"^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); + Regex regexPatternWithDigitsAndDelimiter = new Regex("^image_\\d{1,3}$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexPatternWithDigitsAndDelimiter.Match(this.PatternWithDigitsAndDelimiter).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 9fd3973afb8..392d7bc7596 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -153,7 +153,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern - Regex regexUuidWithPattern = new Regex(@"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); + Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); if (false == regexUuidWithPattern.Match(this.UuidWithPattern.ToString()).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for UuidWithPattern, must match a pattern of " + regexUuidWithPattern, new [] { "UuidWithPattern" }); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs index 4e45e6485db..8aa6221bd12 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Client /// Filename public static string SanitizeFilename(string filename) { - Match match = Regex.Match(filename, @".*[/\\](.*)$"); + Match match = Regex.Match(filename, ".*[/\\](.*)$"); return match.Success ? match.Groups[1].Value : filename; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs index e1cd62ca772..0a47bedfd72 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model public IEnumerable Validate(ValidationContext validationContext) { // Name (string) pattern - Regex regexName = new Regex(@"^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$", RegexOptions.CultureInvariant); + Regex regexName = new Regex("^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$", RegexOptions.CultureInvariant); if (false == regexName.Match(this.Name).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, must match a pattern of " + regexName, new [] { "Name" }); From b409ceb3a08dba80e07381075bdab5c9475be802 Mon Sep 17 00:00:00 2001 From: Tommaso Barbugli Date: Tue, 4 Apr 2023 10:45:27 +0200 Subject: [PATCH 107/131] respect api visibility for oneof enum (#15122) --- .../src/main/resources/swift5/modelOneOf.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/swift5/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/swift5/modelOneOf.mustache index 277f6f26ab4..629de6611bf 100644 --- a/modules/openapi-generator/src/main/resources/swift5/modelOneOf.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/modelOneOf.mustache @@ -1,4 +1,4 @@ -public enum {{classname}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} { +{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable, JSONEncodable{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{/useVapor}} { {{#oneOf}} case type{{.}}({{.}}) {{/oneOf}} From 07227d4650e1f9f95d87abfa887f85b331336f8a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 6 Apr 2023 11:51:12 +0800 Subject: [PATCH 108/131] add support for union of strictfloat and strictint (#15124) --- bin/configs/python-nextgen-aiohttp.yaml | 2 +- bin/configs/python-nextgen.yaml | 1 + docs/generators/python-nextgen.md | 2 +- .../languages/PythonNextgenClientCodegen.java | 108 +++++-- .../src/test/resources/3_0/echo_api.yaml | 13 + .../.openapi-generator/FILES | 2 + .../echo_api/java/apache-httpclient/README.md | 1 + .../java/apache-httpclient/api/openapi.yaml | 13 + .../docs/NumberPropertiesOnly.md | 15 + .../client/model/NumberPropertiesOnly.java | 238 ++++++++++++++++ .../model/NumberPropertiesOnlyTest.java | 65 +++++ .../java/feign-gson/.openapi-generator/FILES | 1 + .../echo_api/java/feign-gson/api/openapi.yaml | 13 + .../client/model/NumberPropertiesOnly.java | 155 +++++++++++ .../model/NumberPropertiesOnlyTest.java | 64 +++++ .../java/native/.openapi-generator/FILES | 2 + samples/client/echo_api/java/native/README.md | 1 + .../echo_api/java/native/api/openapi.yaml | 13 + .../java/native/docs/NumberPropertiesOnly.md | 15 + .../client/model/NumberPropertiesOnly.java | 225 +++++++++++++++ .../model/NumberPropertiesOnlyTest.java | 65 +++++ .../java/okhttp-gson/.openapi-generator/FILES | 2 + .../echo_api/java/okhttp-gson/README.md | 1 + .../java/okhttp-gson/api/openapi.yaml | 13 + .../okhttp-gson/docs/NumberPropertiesOnly.md | 15 + .../java/org/openapitools/client/JSON.java | 1 + .../client/model/NumberPropertiesOnly.java | 263 ++++++++++++++++++ .../model/NumberPropertiesOnlyTest.java | 65 +++++ .../python-nextgen/.openapi-generator/FILES | 2 + .../client/echo_api/python-nextgen/README.md | 1 + .../docs/NumberPropertiesOnly.md | 30 ++ .../python-nextgen/openapi_client/__init__.py | 1 + .../openapi_client/models/__init__.py | 1 + .../models/number_properties_only.py | 75 +++++ .../python-nextgen/test/test_manual.py | 11 + .../test/test_number_properties_only.py | 57 ++++ .../petstore_api/api/fake_api.py | 8 +- .../petstore_api/api/fake_api.py | 4 +- 38 files changed, 1530 insertions(+), 34 deletions(-) create mode 100644 samples/client/echo_api/java/apache-httpclient/docs/NumberPropertiesOnly.md create mode 100644 samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java create mode 100644 samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java create mode 100644 samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java create mode 100644 samples/client/echo_api/java/feign-gson/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java create mode 100644 samples/client/echo_api/java/native/docs/NumberPropertiesOnly.md create mode 100644 samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java create mode 100644 samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java create mode 100644 samples/client/echo_api/java/okhttp-gson/docs/NumberPropertiesOnly.md create mode 100644 samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java create mode 100644 samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java create mode 100644 samples/client/echo_api/python-nextgen/docs/NumberPropertiesOnly.md create mode 100644 samples/client/echo_api/python-nextgen/openapi_client/models/number_properties_only.py create mode 100644 samples/client/echo_api/python-nextgen/test/test_number_properties_only.py diff --git a/bin/configs/python-nextgen-aiohttp.yaml b/bin/configs/python-nextgen-aiohttp.yaml index b211652bf57..991d18a620e 100644 --- a/bin/configs/python-nextgen-aiohttp.yaml +++ b/bin/configs/python-nextgen-aiohttp.yaml @@ -5,4 +5,4 @@ templateDir: modules/openapi-generator/src/main/resources/python-nextgen library: asyncio additionalProperties: packageName: petstore_api - floatStrictType: false + mapNumberTo: float diff --git a/bin/configs/python-nextgen.yaml b/bin/configs/python-nextgen.yaml index c2c09ee0147..c3636e22a5d 100644 --- a/bin/configs/python-nextgen.yaml +++ b/bin/configs/python-nextgen.yaml @@ -6,3 +6,4 @@ additionalProperties: packageName: petstore_api useOneOfDiscriminatorLookup: "true" disallowAdditionalPropertiesIfNotPresent: false + mapNumberTo: StrictFloat diff --git a/docs/generators/python-nextgen.md b/docs/generators/python-nextgen.md index cfde5ec5624..c8a3984195a 100644 --- a/docs/generators/python-nextgen.md +++ b/docs/generators/python-nextgen.md @@ -22,10 +22,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl |dateFormat|date format for query parameters| |%Y-%m-%d| |datetimeFormat|datetime format for query parameters| |%Y-%m-%dT%H:%M:%S%z| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| -|floatStrictType|Use strict type for float, i.e. StrictFloat or confloat(strict=true, ...)| |true| |generateSourceCodeOnly|Specifies that only a library source code is to be generated.| |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| |library|library template (sub-template) to use: asyncio, tornado (deprecated), urllib3| |urllib3| +|mapNumberTo|Map number to Union[StrictFloat, StrictInt], StrictStr or float.| |Union[StrictFloat, StrictInt]| |packageName|python package name (convention: snake_case).| |openapi_client| |packageUrl|python package URL.| |null| |packageVersion|python package version.| |1.0.0| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java index c2a5863fba8..ae2b72ac085 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java @@ -47,18 +47,18 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements public static final String PACKAGE_URL = "packageUrl"; public static final String DEFAULT_LIBRARY = "urllib3"; public static final String RECURSION_LIMIT = "recursionLimit"; - public static final String FLOAT_STRICT_TYPE = "floatStrictType"; public static final String DATETIME_FORMAT = "datetimeFormat"; public static final String DATE_FORMAT = "dateFormat"; + public static final String MAP_NUMBER_TO = "mapNumberTo"; protected String packageUrl; protected String apiDocPath = "docs" + File.separator; protected String modelDocPath = "docs" + File.separator; protected boolean hasModelsToImport = Boolean.FALSE; protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup - protected boolean floatStrictType = true; protected String datetimeFormat = "%Y-%m-%dT%H:%M:%S.%f%z"; protected String dateFormat = "%Y-%m-%d"; + protected String mapNumberTo = "Union[StrictFloat, StrictInt]"; protected Map regexModifiers; @@ -177,8 +177,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements cliOptions.add(new CliOption(CodegenConstants.SOURCECODEONLY_GENERATION, CodegenConstants.SOURCECODEONLY_GENERATION_DESC) .defaultValue(Boolean.FALSE.toString())); cliOptions.add(new CliOption(RECURSION_LIMIT, "Set the recursion limit. If not set, use the system default value.")); - cliOptions.add(new CliOption(FLOAT_STRICT_TYPE, "Use strict type for float, i.e. StrictFloat or confloat(strict=true, ...)") - .defaultValue(Boolean.TRUE.toString())); + cliOptions.add(new CliOption(MAP_NUMBER_TO, "Map number to Union[StrictFloat, StrictInt], StrictStr or float.") + .defaultValue("Union[StrictFloat, StrictInt]")); cliOptions.add(new CliOption(DATETIME_FORMAT, "datetime format for query parameters") .defaultValue("%Y-%m-%dT%H:%M:%S%z")); cliOptions.add(new CliOption(DATE_FORMAT, "date format for query parameters") @@ -281,8 +281,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements additionalProperties.put(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, useOneOfDiscriminatorLookup); } - if (additionalProperties.containsKey(FLOAT_STRICT_TYPE)) { - setFloatStrictType(convertPropertyToBooleanAndWriteBack(FLOAT_STRICT_TYPE)); + if (additionalProperties.containsKey(MAP_NUMBER_TO)) { + setMapNumberTo(String.valueOf(additionalProperties.get(MAP_NUMBER_TO))); } if (additionalProperties.containsKey(DATETIME_FORMAT)) { @@ -478,34 +478,59 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements } else if (cp.isNumber || cp.isFloat || cp.isDouble) { if (cp.hasValidation) { List fieldCustomization = new ArrayList<>(); + List intFieldCustomization = new ArrayList<>(); + // e.g. confloat(ge=10, le=100, strict=True) if (cp.getMaximum() != null) { if (cp.getExclusiveMaximum()) { - fieldCustomization.add("gt=" + cp.getMaximum()); + fieldCustomization.add("lt=" + cp.getMaximum()); + intFieldCustomization.add("lt=" + Math.ceil(Double.valueOf(cp.getMaximum()))); // e.g. < 7.59 becomes < 8 } else { - fieldCustomization.add("ge=" + cp.getMaximum()); + fieldCustomization.add("le=" + cp.getMaximum()); + intFieldCustomization.add("le=" + Math.floor(Double.valueOf(cp.getMaximum()))); // e.g. <= 7.59 becomes <= 7 } } if (cp.getMinimum() != null) { if (cp.getExclusiveMinimum()) { - fieldCustomization.add("lt=" + cp.getMinimum()); + fieldCustomization.add("gt=" + cp.getMinimum()); + intFieldCustomization.add("gt=" + Math.floor(Double.valueOf(cp.getMinimum()))); // e.g. > 7.59 becomes > 7 } else { - fieldCustomization.add("le=" + cp.getMinimum()); + fieldCustomization.add("ge=" + cp.getMinimum()); + intFieldCustomization.add("ge=" + Math.ceil(Double.valueOf(cp.getMinimum()))); // e.g. >= 7.59 becomes >= 8 } } if (cp.getMultipleOf() != null) { fieldCustomization.add("multiple_of=" + cp.getMultipleOf()); } - if (floatStrictType) { + if ("Union[StrictFloat, StrictInt]".equals(mapNumberTo)) { fieldCustomization.add("strict=True"); + intFieldCustomization.add("strict=True"); + pydanticImports.add("confloat"); + pydanticImports.add("conint"); + typingImports.add("Union"); + return String.format(Locale.ROOT, "Union[%s(%s), %s(%s)]", "confloat", + StringUtils.join(fieldCustomization, ", "), + "conint", + StringUtils.join(intFieldCustomization, ", ") + ); + } else if ("StrictFloat".equals(mapNumberTo)) { + fieldCustomization.add("strict=True"); + pydanticImports.add("confloat"); + return String.format(Locale.ROOT, "%s(%s)", "confloat", + StringUtils.join(fieldCustomization, ", ")); + } else { // float + pydanticImports.add("confloat"); + return String.format(Locale.ROOT, "%s(%s)", "confloat", + StringUtils.join(fieldCustomization, ", ")); } - - pydanticImports.add("confloat"); - return String.format(Locale.ROOT, "%s(%s)", "confloat", - StringUtils.join(fieldCustomization, ", ")); } else { - if (floatStrictType) { + if ("Union[StrictFloat, StrictInt]".equals(mapNumberTo)) { + typingImports.add("Union"); + pydanticImports.add("StrictFloat"); + pydanticImports.add("StrictInt"); + return "Union[StrictFloat, StrictInt]"; + } else if ("StrictFloat".equals(mapNumberTo)) { pydanticImports.add("StrictFloat"); return "StrictFloat"; } else { @@ -723,34 +748,59 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements } else if (cp.isNumber || cp.isFloat || cp.isDouble) { if (cp.hasValidation) { List fieldCustomization = new ArrayList<>(); + List intFieldCustomization = new ArrayList<>(); + // e.g. confloat(ge=10, le=100, strict=True) if (cp.getMaximum() != null) { if (cp.getExclusiveMaximum()) { fieldCustomization.add("lt=" + cp.getMaximum()); + intFieldCustomization.add("lt=" + (int) Math.ceil(Double.valueOf(cp.getMaximum()))); // e.g. < 7.59 => < 8 } else { fieldCustomization.add("le=" + cp.getMaximum()); + intFieldCustomization.add("le=" + (int) Math.floor(Double.valueOf(cp.getMaximum()))); // e.g. <= 7.59 => <= 7 } } if (cp.getMinimum() != null) { if (cp.getExclusiveMinimum()) { fieldCustomization.add("gt=" + cp.getMinimum()); + intFieldCustomization.add("gt=" + (int) Math.floor(Double.valueOf(cp.getMinimum()))); // e.g. > 7.59 => > 7 } else { fieldCustomization.add("ge=" + cp.getMinimum()); + intFieldCustomization.add("ge=" + (int) Math.ceil(Double.valueOf(cp.getMinimum()))); // e.g. >= 7.59 => >= 8 } } if (cp.getMultipleOf() != null) { fieldCustomization.add("multiple_of=" + cp.getMultipleOf()); } - if (floatStrictType) { + if ("Union[StrictFloat, StrictInt]".equals(mapNumberTo)) { fieldCustomization.add("strict=True"); + intFieldCustomization.add("strict=True"); + pydanticImports.add("confloat"); + pydanticImports.add("conint"); + typingImports.add("Union"); + return String.format(Locale.ROOT, "Union[%s(%s), %s(%s)]", "confloat", + StringUtils.join(fieldCustomization, ", "), + "conint", + StringUtils.join(intFieldCustomization, ", ") + ); + } else if ("StrictFloat".equals(mapNumberTo)) { + fieldCustomization.add("strict=True"); + pydanticImports.add("confloat"); + return String.format(Locale.ROOT, "%s(%s)", "confloat", + StringUtils.join(fieldCustomization, ", ")); + } else { // float + pydanticImports.add("confloat"); + return String.format(Locale.ROOT, "%s(%s)", "confloat", + StringUtils.join(fieldCustomization, ", ")); } - - pydanticImports.add("confloat"); - return String.format(Locale.ROOT, "%s(%s)", "confloat", - StringUtils.join(fieldCustomization, ", ")); } else { - if (floatStrictType) { + if ("Union[StrictFloat, StrictInt]".equals(mapNumberTo)) { + typingImports.add("Union"); + pydanticImports.add("StrictFloat"); + pydanticImports.add("StrictInt"); + return "Union[StrictFloat, StrictInt]"; + } else if ("StrictFloat".equals(mapNumberTo)) { pydanticImports.add("StrictFloat"); return "StrictFloat"; } else { @@ -1334,8 +1384,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements } } - vendorExtensions.put("x-regex", regex.replace("\"","\\\"")); - vendorExtensions.put("x-pattern", pattern.replace("\"","\\\"")); + vendorExtensions.put("x-regex", regex.replace("\"", "\\\"")); + vendorExtensions.put("x-pattern", pattern.replace("\"", "\\\"")); vendorExtensions.put("x-modifiers", modifiers); } } @@ -1529,8 +1579,14 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements return "var_" + name; } - public void setFloatStrictType(boolean floatStrictType) { - this.floatStrictType = floatStrictType; + public void setMapNumberTo(String mapNumberTo) { + if ("Union[StrictFloat, StrictInt]".equals(mapNumberTo) + || "StrictFloat".equals(mapNumberTo) + || "float".equals(mapNumberTo)) { + this.mapNumberTo = mapNumberTo; + } else { + throw new IllegalArgumentException("mapNumberTo value must be Union[StrictFloat, StrictInt], StrictStr or float"); + } } public void setDatetimeFormat(String datetimeFormat) { diff --git a/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml b/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml index 4da38f3dd7e..c1739912eb1 100644 --- a/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml @@ -516,3 +516,16 @@ components: format: date-time description: A date - $ref: '#/components/schemas/Query' + NumberPropertiesOnly: + type: object + properties: + number: + type: number + float: + type: number + format: float + double: + type: number + format: double + minimum: 0.8 + maximum: 50.2 diff --git a/samples/client/echo_api/java/apache-httpclient/.openapi-generator/FILES b/samples/client/echo_api/java/apache-httpclient/.openapi-generator/FILES index b73ae3b78e7..89fac5b44a4 100644 --- a/samples/client/echo_api/java/apache-httpclient/.openapi-generator/FILES +++ b/samples/client/echo_api/java/apache-httpclient/.openapi-generator/FILES @@ -13,6 +13,7 @@ docs/DataQueryAllOf.md docs/DefaultValue.md docs/FormApi.md docs/HeaderApi.md +docs/NumberPropertiesOnly.md docs/PathApi.md docs/Pet.md docs/Query.md @@ -53,6 +54,7 @@ src/main/java/org/openapitools/client/model/Category.java src/main/java/org/openapitools/client/model/DataQuery.java src/main/java/org/openapitools/client/model/DataQueryAllOf.java src/main/java/org/openapitools/client/model/DefaultValue.java +src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/Query.java src/main/java/org/openapitools/client/model/StringEnumRef.java diff --git a/samples/client/echo_api/java/apache-httpclient/README.md b/samples/client/echo_api/java/apache-httpclient/README.md index 1145d8901a4..23a54dd12af 100644 --- a/samples/client/echo_api/java/apache-httpclient/README.md +++ b/samples/client/echo_api/java/apache-httpclient/README.md @@ -127,6 +127,7 @@ Class | Method | HTTP request | Description - [DataQuery](docs/DataQuery.md) - [DataQueryAllOf](docs/DataQueryAllOf.md) - [DefaultValue](docs/DefaultValue.md) + - [NumberPropertiesOnly](docs/NumberPropertiesOnly.md) - [Pet](docs/Pet.md) - [Query](docs/Query.md) - [StringEnumRef](docs/StringEnumRef.md) diff --git a/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml b/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml index 3c38cd48549..e786a332be0 100644 --- a/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml @@ -521,6 +521,19 @@ components: allOf: - $ref: '#/components/schemas/DataQuery_allOf' - $ref: '#/components/schemas/Query' + NumberPropertiesOnly: + properties: + number: + type: number + float: + format: float + type: number + double: + format: double + maximum: 50.2 + minimum: 0.8 + type: number + type: object test_form_integer_boolean_string_request: properties: integer_form: diff --git a/samples/client/echo_api/java/apache-httpclient/docs/NumberPropertiesOnly.md b/samples/client/echo_api/java/apache-httpclient/docs/NumberPropertiesOnly.md new file mode 100644 index 00000000000..7e153538475 --- /dev/null +++ b/samples/client/echo_api/java/apache-httpclient/docs/NumberPropertiesOnly.md @@ -0,0 +1,15 @@ + + +# NumberPropertiesOnly + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**number** | **BigDecimal** | | [optional] | +|**_float** | **Float** | | [optional] | +|**_double** | **Double** | | [optional] | + + + diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java new file mode 100644 index 00000000000..2144ee2d79e --- /dev/null +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java @@ -0,0 +1,238 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.StringJoiner; + +/** + * NumberPropertiesOnly + */ +@JsonPropertyOrder({ + NumberPropertiesOnly.JSON_PROPERTY_NUMBER, + NumberPropertiesOnly.JSON_PROPERTY_FLOAT, + NumberPropertiesOnly.JSON_PROPERTY_DOUBLE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class NumberPropertiesOnly { + public static final String JSON_PROPERTY_NUMBER = "number"; + private BigDecimal number; + + public static final String JSON_PROPERTY_FLOAT = "float"; + private Float _float; + + public static final String JSON_PROPERTY_DOUBLE = "double"; + private Double _double; + + public NumberPropertiesOnly() { + } + + public NumberPropertiesOnly number(BigDecimal number) { + + this.number = number; + return this; + } + + /** + * Get number + * @return number + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public BigDecimal getNumber() { + return number; + } + + + @JsonProperty(JSON_PROPERTY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNumber(BigDecimal number) { + this.number = number; + } + + + public NumberPropertiesOnly _float(Float _float) { + + this._float = _float; + return this; + } + + /** + * Get _float + * @return _float + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FLOAT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Float getFloat() { + return _float; + } + + + @JsonProperty(JSON_PROPERTY_FLOAT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFloat(Float _float) { + this._float = _float; + } + + + public NumberPropertiesOnly _double(Double _double) { + + this._double = _double; + return this; + } + + /** + * Get _double + * minimum: 0.8 + * maximum: 50.2 + * @return _double + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DOUBLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Double getDouble() { + return _double; + } + + + @JsonProperty(JSON_PROPERTY_DOUBLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDouble(Double _double) { + this._double = _double; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + NumberPropertiesOnly numberPropertiesOnly = (NumberPropertiesOnly) o; + return Objects.equals(this.number, numberPropertiesOnly.number) && + Objects.equals(this._float, numberPropertiesOnly._float) && + Objects.equals(this._double, numberPropertiesOnly._double); + } + + @Override + public int hashCode() { + return Objects.hash(number, _float, _double); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class NumberPropertiesOnly {\n"); + sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); + sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `number` to the URL query string + if (getNumber() != null) { + try { + joiner.add(String.format("%snumber%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getNumber()), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + + // add `float` to the URL query string + if (getFloat() != null) { + try { + joiner.add(String.format("%sfloat%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFloat()), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + + // add `double` to the URL query string + if (getDouble() != null) { + try { + joiner.add(String.format("%sdouble%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDouble()), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + + return joiner.toString(); + } + +} + diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java new file mode 100644 index 00000000000..2d9c5b371fe --- /dev/null +++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java @@ -0,0 +1,65 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Model tests for NumberPropertiesOnly + */ +public class NumberPropertiesOnlyTest { + private final NumberPropertiesOnly model = new NumberPropertiesOnly(); + + /** + * Model tests for NumberPropertiesOnly + */ + @Test + public void testNumberPropertiesOnly() { + // TODO: test NumberPropertiesOnly + } + + /** + * Test the property 'number' + */ + @Test + public void numberTest() { + // TODO: test number + } + + /** + * Test the property '_float' + */ + @Test + public void _floatTest() { + // TODO: test _float + } + + /** + * Test the property '_double' + */ + @Test + public void _doubleTest() { + // TODO: test _double + } + +} diff --git a/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES b/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES index a45b0a1ad80..d5dbc5f00cc 100644 --- a/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES +++ b/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES @@ -33,6 +33,7 @@ src/main/java/org/openapitools/client/model/Category.java src/main/java/org/openapitools/client/model/DataQuery.java src/main/java/org/openapitools/client/model/DataQueryAllOf.java src/main/java/org/openapitools/client/model/DefaultValue.java +src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/Query.java src/main/java/org/openapitools/client/model/StringEnumRef.java diff --git a/samples/client/echo_api/java/feign-gson/api/openapi.yaml b/samples/client/echo_api/java/feign-gson/api/openapi.yaml index 3c38cd48549..e786a332be0 100644 --- a/samples/client/echo_api/java/feign-gson/api/openapi.yaml +++ b/samples/client/echo_api/java/feign-gson/api/openapi.yaml @@ -521,6 +521,19 @@ components: allOf: - $ref: '#/components/schemas/DataQuery_allOf' - $ref: '#/components/schemas/Query' + NumberPropertiesOnly: + properties: + number: + type: number + float: + format: float + type: number + double: + format: double + maximum: 50.2 + minimum: 0.8 + type: number + type: object test_form_integer_boolean_string_request: properties: integer_form: diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java new file mode 100644 index 00000000000..acea6a62ec7 --- /dev/null +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java @@ -0,0 +1,155 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.math.BigDecimal; + +/** + * NumberPropertiesOnly + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class NumberPropertiesOnly { + public static final String SERIALIZED_NAME_NUMBER = "number"; + @SerializedName(SERIALIZED_NAME_NUMBER) + private BigDecimal number; + + public static final String SERIALIZED_NAME_FLOAT = "float"; + @SerializedName(SERIALIZED_NAME_FLOAT) + private Float _float; + + public static final String SERIALIZED_NAME_DOUBLE = "double"; + @SerializedName(SERIALIZED_NAME_DOUBLE) + private Double _double; + + public NumberPropertiesOnly() { + } + + public NumberPropertiesOnly number(BigDecimal number) { + + this.number = number; + return this; + } + + /** + * Get number + * @return number + **/ + @javax.annotation.Nullable + + public BigDecimal getNumber() { + return number; + } + + + public void setNumber(BigDecimal number) { + this.number = number; + } + + + public NumberPropertiesOnly _float(Float _float) { + + this._float = _float; + return this; + } + + /** + * Get _float + * @return _float + **/ + @javax.annotation.Nullable + + public Float getFloat() { + return _float; + } + + + public void setFloat(Float _float) { + this._float = _float; + } + + + public NumberPropertiesOnly _double(Double _double) { + + this._double = _double; + return this; + } + + /** + * Get _double + * minimum: 0.8 + * maximum: 50.2 + * @return _double + **/ + @javax.annotation.Nullable + + public Double getDouble() { + return _double; + } + + + public void setDouble(Double _double) { + this._double = _double; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + NumberPropertiesOnly numberPropertiesOnly = (NumberPropertiesOnly) o; + return Objects.equals(this.number, numberPropertiesOnly.number) && + Objects.equals(this._float, numberPropertiesOnly._float) && + Objects.equals(this._double, numberPropertiesOnly._double); + } + + @Override + public int hashCode() { + return Objects.hash(number, _float, _double); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class NumberPropertiesOnly {\n"); + sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); + sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/echo_api/java/feign-gson/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java b/samples/client/echo_api/java/feign-gson/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java new file mode 100644 index 00000000000..715209c0e76 --- /dev/null +++ b/samples/client/echo_api/java/feign-gson/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java @@ -0,0 +1,64 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.math.BigDecimal; +import org.junit.jupiter.api.Test; + + +/** + * Model tests for NumberPropertiesOnly + */ +class NumberPropertiesOnlyTest { + private final NumberPropertiesOnly model = new NumberPropertiesOnly(); + + /** + * Model tests for NumberPropertiesOnly + */ + @Test + void testNumberPropertiesOnly() { + // TODO: test NumberPropertiesOnly + } + + /** + * Test the property 'number' + */ + @Test + void numberTest() { + // TODO: test number + } + + /** + * Test the property '_float' + */ + @Test + void _floatTest() { + // TODO: test _float + } + + /** + * Test the property '_double' + */ + @Test + void _doubleTest() { + // TODO: test _double + } + +} diff --git a/samples/client/echo_api/java/native/.openapi-generator/FILES b/samples/client/echo_api/java/native/.openapi-generator/FILES index 68f5fdb9b8a..231f7bb0e54 100644 --- a/samples/client/echo_api/java/native/.openapi-generator/FILES +++ b/samples/client/echo_api/java/native/.openapi-generator/FILES @@ -13,6 +13,7 @@ docs/DataQueryAllOf.md docs/DefaultValue.md docs/FormApi.md docs/HeaderApi.md +docs/NumberPropertiesOnly.md docs/PathApi.md docs/Pet.md docs/Query.md @@ -50,6 +51,7 @@ src/main/java/org/openapitools/client/model/Category.java src/main/java/org/openapitools/client/model/DataQuery.java src/main/java/org/openapitools/client/model/DataQueryAllOf.java src/main/java/org/openapitools/client/model/DefaultValue.java +src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/Query.java src/main/java/org/openapitools/client/model/StringEnumRef.java diff --git a/samples/client/echo_api/java/native/README.md b/samples/client/echo_api/java/native/README.md index 17877db7344..d598d1a9a5b 100644 --- a/samples/client/echo_api/java/native/README.md +++ b/samples/client/echo_api/java/native/README.md @@ -139,6 +139,7 @@ Class | Method | HTTP request | Description - [DataQuery](docs/DataQuery.md) - [DataQueryAllOf](docs/DataQueryAllOf.md) - [DefaultValue](docs/DefaultValue.md) + - [NumberPropertiesOnly](docs/NumberPropertiesOnly.md) - [Pet](docs/Pet.md) - [Query](docs/Query.md) - [StringEnumRef](docs/StringEnumRef.md) diff --git a/samples/client/echo_api/java/native/api/openapi.yaml b/samples/client/echo_api/java/native/api/openapi.yaml index 3c38cd48549..e786a332be0 100644 --- a/samples/client/echo_api/java/native/api/openapi.yaml +++ b/samples/client/echo_api/java/native/api/openapi.yaml @@ -521,6 +521,19 @@ components: allOf: - $ref: '#/components/schemas/DataQuery_allOf' - $ref: '#/components/schemas/Query' + NumberPropertiesOnly: + properties: + number: + type: number + float: + format: float + type: number + double: + format: double + maximum: 50.2 + minimum: 0.8 + type: number + type: object test_form_integer_boolean_string_request: properties: integer_form: diff --git a/samples/client/echo_api/java/native/docs/NumberPropertiesOnly.md b/samples/client/echo_api/java/native/docs/NumberPropertiesOnly.md new file mode 100644 index 00000000000..7e153538475 --- /dev/null +++ b/samples/client/echo_api/java/native/docs/NumberPropertiesOnly.md @@ -0,0 +1,15 @@ + + +# NumberPropertiesOnly + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**number** | **BigDecimal** | | [optional] | +|**_float** | **Float** | | [optional] | +|**_double** | **Double** | | [optional] | + + + diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java new file mode 100644 index 00000000000..70403b35f42 --- /dev/null +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java @@ -0,0 +1,225 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +/** + * NumberPropertiesOnly + */ +@JsonPropertyOrder({ + NumberPropertiesOnly.JSON_PROPERTY_NUMBER, + NumberPropertiesOnly.JSON_PROPERTY_FLOAT, + NumberPropertiesOnly.JSON_PROPERTY_DOUBLE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class NumberPropertiesOnly { + public static final String JSON_PROPERTY_NUMBER = "number"; + private BigDecimal number; + + public static final String JSON_PROPERTY_FLOAT = "float"; + private Float _float; + + public static final String JSON_PROPERTY_DOUBLE = "double"; + private Double _double; + + public NumberPropertiesOnly() { + } + + public NumberPropertiesOnly number(BigDecimal number) { + this.number = number; + return this; + } + + /** + * Get number + * @return number + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public BigDecimal getNumber() { + return number; + } + + + @JsonProperty(JSON_PROPERTY_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNumber(BigDecimal number) { + this.number = number; + } + + + public NumberPropertiesOnly _float(Float _float) { + this._float = _float; + return this; + } + + /** + * Get _float + * @return _float + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FLOAT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Float getFloat() { + return _float; + } + + + @JsonProperty(JSON_PROPERTY_FLOAT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFloat(Float _float) { + this._float = _float; + } + + + public NumberPropertiesOnly _double(Double _double) { + this._double = _double; + return this; + } + + /** + * Get _double + * minimum: 0.8 + * maximum: 50.2 + * @return _double + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DOUBLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Double getDouble() { + return _double; + } + + + @JsonProperty(JSON_PROPERTY_DOUBLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDouble(Double _double) { + this._double = _double; + } + + + /** + * Return true if this NumberPropertiesOnly object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + NumberPropertiesOnly numberPropertiesOnly = (NumberPropertiesOnly) o; + return Objects.equals(this.number, numberPropertiesOnly.number) && + Objects.equals(this._float, numberPropertiesOnly._float) && + Objects.equals(this._double, numberPropertiesOnly._double); + } + + @Override + public int hashCode() { + return Objects.hash(number, _float, _double); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class NumberPropertiesOnly {\n"); + sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); + sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `number` to the URL query string + if (getNumber() != null) { + joiner.add(String.format("%snumber%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + // add `float` to the URL query string + if (getFloat() != null) { + joiner.add(String.format("%sfloat%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFloat()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + // add `double` to the URL query string + if (getDouble() != null) { + joiner.add(String.format("%sdouble%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDouble()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + return joiner.toString(); + } +} + diff --git a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java new file mode 100644 index 00000000000..2d9c5b371fe --- /dev/null +++ b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java @@ -0,0 +1,65 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Model tests for NumberPropertiesOnly + */ +public class NumberPropertiesOnlyTest { + private final NumberPropertiesOnly model = new NumberPropertiesOnly(); + + /** + * Model tests for NumberPropertiesOnly + */ + @Test + public void testNumberPropertiesOnly() { + // TODO: test NumberPropertiesOnly + } + + /** + * Test the property 'number' + */ + @Test + public void numberTest() { + // TODO: test number + } + + /** + * Test the property '_float' + */ + @Test + public void _floatTest() { + // TODO: test _float + } + + /** + * Test the property '_double' + */ + @Test + public void _doubleTest() { + // TODO: test _double + } + +} diff --git a/samples/client/echo_api/java/okhttp-gson/.openapi-generator/FILES b/samples/client/echo_api/java/okhttp-gson/.openapi-generator/FILES index e9d00ee6961..e1eb9213fc4 100644 --- a/samples/client/echo_api/java/okhttp-gson/.openapi-generator/FILES +++ b/samples/client/echo_api/java/okhttp-gson/.openapi-generator/FILES @@ -13,6 +13,7 @@ docs/DataQueryAllOf.md docs/DefaultValue.md docs/FormApi.md docs/HeaderApi.md +docs/NumberPropertiesOnly.md docs/PathApi.md docs/Pet.md docs/Query.md @@ -58,6 +59,7 @@ src/main/java/org/openapitools/client/model/Category.java src/main/java/org/openapitools/client/model/DataQuery.java src/main/java/org/openapitools/client/model/DataQueryAllOf.java src/main/java/org/openapitools/client/model/DefaultValue.java +src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/Query.java src/main/java/org/openapitools/client/model/StringEnumRef.java diff --git a/samples/client/echo_api/java/okhttp-gson/README.md b/samples/client/echo_api/java/okhttp-gson/README.md index 20765f701d1..3c82c336a97 100644 --- a/samples/client/echo_api/java/okhttp-gson/README.md +++ b/samples/client/echo_api/java/okhttp-gson/README.md @@ -134,6 +134,7 @@ Class | Method | HTTP request | Description - [DataQuery](docs/DataQuery.md) - [DataQueryAllOf](docs/DataQueryAllOf.md) - [DefaultValue](docs/DefaultValue.md) + - [NumberPropertiesOnly](docs/NumberPropertiesOnly.md) - [Pet](docs/Pet.md) - [Query](docs/Query.md) - [StringEnumRef](docs/StringEnumRef.md) diff --git a/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml b/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml index 3c38cd48549..e786a332be0 100644 --- a/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml @@ -521,6 +521,19 @@ components: allOf: - $ref: '#/components/schemas/DataQuery_allOf' - $ref: '#/components/schemas/Query' + NumberPropertiesOnly: + properties: + number: + type: number + float: + format: float + type: number + double: + format: double + maximum: 50.2 + minimum: 0.8 + type: number + type: object test_form_integer_boolean_string_request: properties: integer_form: diff --git a/samples/client/echo_api/java/okhttp-gson/docs/NumberPropertiesOnly.md b/samples/client/echo_api/java/okhttp-gson/docs/NumberPropertiesOnly.md new file mode 100644 index 00000000000..7e153538475 --- /dev/null +++ b/samples/client/echo_api/java/okhttp-gson/docs/NumberPropertiesOnly.md @@ -0,0 +1,15 @@ + + +# NumberPropertiesOnly + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**number** | **BigDecimal** | | [optional] | +|**_float** | **Float** | | [optional] | +|**_double** | **Double** | | [optional] | + + + diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java index 8345513ed98..36fe90437a1 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java @@ -98,6 +98,7 @@ public class JSON { gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.DataQuery.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.DataQueryAllOf.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.DefaultValue.CustomTypeAdapterFactory()); + gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.NumberPropertiesOnly.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Pet.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Tag.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.CustomTypeAdapterFactory()); diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java new file mode 100644 index 00000000000..5e13e669d94 --- /dev/null +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java @@ -0,0 +1,263 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.math.BigDecimal; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.openapitools.client.JSON; + +/** + * NumberPropertiesOnly + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class NumberPropertiesOnly { + public static final String SERIALIZED_NAME_NUMBER = "number"; + @SerializedName(SERIALIZED_NAME_NUMBER) + private BigDecimal number; + + public static final String SERIALIZED_NAME_FLOAT = "float"; + @SerializedName(SERIALIZED_NAME_FLOAT) + private Float _float; + + public static final String SERIALIZED_NAME_DOUBLE = "double"; + @SerializedName(SERIALIZED_NAME_DOUBLE) + private Double _double; + + public NumberPropertiesOnly() { + } + + public NumberPropertiesOnly number(BigDecimal number) { + + this.number = number; + return this; + } + + /** + * Get number + * @return number + **/ + @javax.annotation.Nullable + + public BigDecimal getNumber() { + return number; + } + + + public void setNumber(BigDecimal number) { + this.number = number; + } + + + public NumberPropertiesOnly _float(Float _float) { + + this._float = _float; + return this; + } + + /** + * Get _float + * @return _float + **/ + @javax.annotation.Nullable + + public Float getFloat() { + return _float; + } + + + public void setFloat(Float _float) { + this._float = _float; + } + + + public NumberPropertiesOnly _double(Double _double) { + + this._double = _double; + return this; + } + + /** + * Get _double + * minimum: 0.8 + * maximum: 50.2 + * @return _double + **/ + @javax.annotation.Nullable + + public Double getDouble() { + return _double; + } + + + public void setDouble(Double _double) { + this._double = _double; + } + + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + NumberPropertiesOnly numberPropertiesOnly = (NumberPropertiesOnly) o; + return Objects.equals(this.number, numberPropertiesOnly.number) && + Objects.equals(this._float, numberPropertiesOnly._float) && + Objects.equals(this._double, numberPropertiesOnly._double); + } + + @Override + public int hashCode() { + return Objects.hash(number, _float, _double); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class NumberPropertiesOnly {\n"); + sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); + sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + + public static HashSet openapiFields; + public static HashSet openapiRequiredFields; + + static { + // a set of all properties/fields (JSON key names) + openapiFields = new HashSet(); + openapiFields.add("number"); + openapiFields.add("float"); + openapiFields.add("double"); + + // a set of required properties/fields (JSON key names) + openapiRequiredFields = new HashSet(); + } + + /** + * Validates the JSON Object and throws an exception if issues found + * + * @param jsonObj JSON Object + * @throws IOException if the JSON Object is invalid with respect to NumberPropertiesOnly + */ + public static void validateJsonObject(JsonObject jsonObj) throws IOException { + if (jsonObj == null) { + if (!NumberPropertiesOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null + throw new IllegalArgumentException(String.format("The required field(s) %s in NumberPropertiesOnly is not found in the empty JSON string", NumberPropertiesOnly.openapiRequiredFields.toString())); + } + } + + Set> entries = jsonObj.entrySet(); + // check to see if the JSON string contains additional fields + for (Entry entry : entries) { + if (!NumberPropertiesOnly.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `NumberPropertiesOnly` properties. JSON: %s", entry.getKey(), jsonObj.toString())); + } + } + } + + public static class CustomTypeAdapterFactory implements TypeAdapterFactory { + @SuppressWarnings("unchecked") + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + if (!NumberPropertiesOnly.class.isAssignableFrom(type.getRawType())) { + return null; // this class only serializes 'NumberPropertiesOnly' and its subtypes + } + final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); + final TypeAdapter thisAdapter + = gson.getDelegateAdapter(this, TypeToken.get(NumberPropertiesOnly.class)); + + return (TypeAdapter) new TypeAdapter() { + @Override + public void write(JsonWriter out, NumberPropertiesOnly value) throws IOException { + JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); + elementAdapter.write(out, obj); + } + + @Override + public NumberPropertiesOnly read(JsonReader in) throws IOException { + JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject(); + validateJsonObject(jsonObj); + return thisAdapter.fromJsonTree(jsonObj); + } + + }.nullSafe(); + } + } + + /** + * Create an instance of NumberPropertiesOnly given an JSON string + * + * @param jsonString JSON string + * @return An instance of NumberPropertiesOnly + * @throws IOException if the JSON string is invalid with respect to NumberPropertiesOnly + */ + public static NumberPropertiesOnly fromJson(String jsonString) throws IOException { + return JSON.getGson().fromJson(jsonString, NumberPropertiesOnly.class); + } + + /** + * Convert an instance of NumberPropertiesOnly to an JSON string + * + * @return JSON string + */ + public String toJson() { + return JSON.getGson().toJson(this); + } +} + diff --git a/samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java b/samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java new file mode 100644 index 00000000000..a796ce5ce94 --- /dev/null +++ b/samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java @@ -0,0 +1,65 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.math.BigDecimal; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + + +/** + * Model tests for NumberPropertiesOnly + */ +public class NumberPropertiesOnlyTest { + private final NumberPropertiesOnly model = new NumberPropertiesOnly(); + + /** + * Model tests for NumberPropertiesOnly + */ + @Test + public void testNumberPropertiesOnly() { + // TODO: test NumberPropertiesOnly + } + + /** + * Test the property 'number' + */ + @Test + public void numberTest() { + // TODO: test number + } + + /** + * Test the property '_float' + */ + @Test + public void _floatTest() { + // TODO: test _float + } + + /** + * Test the property '_double' + */ + @Test + public void _doubleTest() { + // TODO: test _double + } + +} diff --git a/samples/client/echo_api/python-nextgen/.openapi-generator/FILES b/samples/client/echo_api/python-nextgen/.openapi-generator/FILES index 82a301a4b1f..96803d40eaf 100644 --- a/samples/client/echo_api/python-nextgen/.openapi-generator/FILES +++ b/samples/client/echo_api/python-nextgen/.openapi-generator/FILES @@ -11,6 +11,7 @@ docs/DataQueryAllOf.md docs/DefaultValue.md docs/FormApi.md docs/HeaderApi.md +docs/NumberPropertiesOnly.md docs/PathApi.md docs/Pet.md docs/Query.md @@ -36,6 +37,7 @@ openapi_client/models/category.py openapi_client/models/data_query.py openapi_client/models/data_query_all_of.py openapi_client/models/default_value.py +openapi_client/models/number_properties_only.py openapi_client/models/pet.py openapi_client/models/query.py openapi_client/models/string_enum_ref.py diff --git a/samples/client/echo_api/python-nextgen/README.md b/samples/client/echo_api/python-nextgen/README.md index 1762a748c33..fa00f83adf0 100644 --- a/samples/client/echo_api/python-nextgen/README.md +++ b/samples/client/echo_api/python-nextgen/README.md @@ -107,6 +107,7 @@ Class | Method | HTTP request | Description - [DataQuery](docs/DataQuery.md) - [DataQueryAllOf](docs/DataQueryAllOf.md) - [DefaultValue](docs/DefaultValue.md) + - [NumberPropertiesOnly](docs/NumberPropertiesOnly.md) - [Pet](docs/Pet.md) - [Query](docs/Query.md) - [StringEnumRef](docs/StringEnumRef.md) diff --git a/samples/client/echo_api/python-nextgen/docs/NumberPropertiesOnly.md b/samples/client/echo_api/python-nextgen/docs/NumberPropertiesOnly.md new file mode 100644 index 00000000000..e35fad694e7 --- /dev/null +++ b/samples/client/echo_api/python-nextgen/docs/NumberPropertiesOnly.md @@ -0,0 +1,30 @@ +# NumberPropertiesOnly + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**number** | **float** | | [optional] +**float** | **float** | | [optional] +**double** | **float** | | [optional] + +## Example + +```python +from openapi_client.models.number_properties_only import NumberPropertiesOnly + +# TODO update the JSON string below +json = "{}" +# create an instance of NumberPropertiesOnly from a JSON string +number_properties_only_instance = NumberPropertiesOnly.from_json(json) +# print the JSON string representation of the object +print NumberPropertiesOnly.to_json() + +# convert the object into a dict +number_properties_only_dict = number_properties_only_instance.to_dict() +# create an instance of NumberPropertiesOnly from a dict +number_properties_only_form_dict = number_properties_only.from_dict(number_properties_only_dict) +``` +[[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/client/echo_api/python-nextgen/openapi_client/__init__.py b/samples/client/echo_api/python-nextgen/openapi_client/__init__.py index 1177a5d9b38..56a61164ed2 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/__init__.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/__init__.py @@ -39,6 +39,7 @@ from openapi_client.models.category import Category from openapi_client.models.data_query import DataQuery from openapi_client.models.data_query_all_of import DataQueryAllOf from openapi_client.models.default_value import DefaultValue +from openapi_client.models.number_properties_only import NumberPropertiesOnly from openapi_client.models.pet import Pet from openapi_client.models.query import Query from openapi_client.models.string_enum_ref import StringEnumRef diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py b/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py index 29619e9c8dc..2489f30be85 100644 --- a/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/__init__.py @@ -20,6 +20,7 @@ from openapi_client.models.category import Category from openapi_client.models.data_query import DataQuery from openapi_client.models.data_query_all_of import DataQueryAllOf from openapi_client.models.default_value import DefaultValue +from openapi_client.models.number_properties_only import NumberPropertiesOnly from openapi_client.models.pet import Pet from openapi_client.models.query import Query from openapi_client.models.string_enum_ref import StringEnumRef diff --git a/samples/client/echo_api/python-nextgen/openapi_client/models/number_properties_only.py b/samples/client/echo_api/python-nextgen/openapi_client/models/number_properties_only.py new file mode 100644 index 00000000000..cd837770154 --- /dev/null +++ b/samples/client/echo_api/python-nextgen/openapi_client/models/number_properties_only.py @@ -0,0 +1,75 @@ +# coding: utf-8 + +""" + Echo Server API + + Echo Server API # noqa: E501 + + The version of the OpenAPI document: 0.1.0 + Contact: team@openapitools.org + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +from __future__ import annotations +from inspect import getfullargspec +import pprint +import re # noqa: F401 +import json + + +from typing import Optional, Union +from pydantic import BaseModel, StrictFloat, StrictInt, confloat, conint + +class NumberPropertiesOnly(BaseModel): + """ + NumberPropertiesOnly + """ + number: Optional[Union[StrictFloat, StrictInt]] = None + float: Optional[Union[StrictFloat, StrictInt]] = None + double: Optional[Union[confloat(le=50.2, ge=0.8, strict=True), conint(le=50, ge=1, strict=True)]] = None + __properties = ["number", "float", "double"] + + class Config: + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> NumberPropertiesOnly: + """Create an instance of NumberPropertiesOnly from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + }, + exclude_none=True) + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> NumberPropertiesOnly: + """Create an instance of NumberPropertiesOnly from a dict""" + if obj is None: + return None + + if type(obj) is not dict: + return NumberPropertiesOnly.parse_obj(obj) + + _obj = NumberPropertiesOnly.parse_obj({ + "number": obj.get("number"), + "float": obj.get("float"), + "double": obj.get("double") + }) + return _obj + diff --git a/samples/client/echo_api/python-nextgen/test/test_manual.py b/samples/client/echo_api/python-nextgen/test/test_manual.py index d89e6145304..506f6dc7ecd 100644 --- a/samples/client/echo_api/python-nextgen/test/test_manual.py +++ b/samples/client/echo_api/python-nextgen/test/test_manual.py @@ -59,6 +59,17 @@ class TestManual(unittest.TestCase): api_response = api_instance.test_binary_gif() self.assertEqual((base64.b64encode(api_response)).decode("utf-8"), "R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==") + def testNumberPropertiesOnly(self): + n = openapi_client.NumberPropertiesOnly.from_json('{"number": 123, "float": 456, "double": 34}') + self.assertEqual(n.number, 123) + self.assertEqual(n.float, 456) + self.assertEqual(n.double, 34) + + n = openapi_client.NumberPropertiesOnly.from_json('{"number": 123.1, "float": 456.2, "double": 34.3}') + self.assertEqual(n.number, 123.1) + self.assertEqual(n.float, 456.2) + self.assertEqual(n.double, 34.3) + class EchoServerResponseParser(): def __init__(self, http_response): if http_response is None: diff --git a/samples/client/echo_api/python-nextgen/test/test_number_properties_only.py b/samples/client/echo_api/python-nextgen/test/test_number_properties_only.py new file mode 100644 index 00000000000..68aa757f9df --- /dev/null +++ b/samples/client/echo_api/python-nextgen/test/test_number_properties_only.py @@ -0,0 +1,57 @@ +# coding: utf-8 + +""" + Echo Server API + + Echo Server API # noqa: E501 + + The version of the OpenAPI document: 0.1.0 + Contact: team@openapitools.org + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" + + +import unittest +import datetime + +import openapi_client +from openapi_client.models.number_properties_only import NumberPropertiesOnly # noqa: E501 +from openapi_client.rest import ApiException + +class TestNumberPropertiesOnly(unittest.TestCase): + """NumberPropertiesOnly unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional): + """Test NumberPropertiesOnly + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `NumberPropertiesOnly` + """ + model = openapi_client.models.number_properties_only.NumberPropertiesOnly() # noqa: E501 + if include_optional : + return NumberPropertiesOnly( + number = 1.337, + float = 1.337, + double = '' + ) + else : + return NumberPropertiesOnly( + ) + """ + + def testNumberPropertiesOnly(self): + """Test NumberPropertiesOnly""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py index aa5c5a4118c..d6e1bf1e559 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/api/fake_api.py @@ -2060,15 +2060,15 @@ class FakeApi(object): _request_auth=_params.get('_request_auth')) @overload - async def test_endpoint_parameters(self, number : Annotated[confloat(ge=543.2, le=32.1), Field(..., description="None")], double : Annotated[confloat(ge=123.4, le=67.8), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(ge=987.6)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, **kwargs) -> None: # noqa: E501 + async def test_endpoint_parameters(self, number : Annotated[confloat(le=543.2, ge=32.1), Field(..., description="None")], double : Annotated[confloat(le=123.4, ge=67.8), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(le=987.6)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, **kwargs) -> None: # noqa: E501 ... @overload - def test_endpoint_parameters(self, number : Annotated[confloat(ge=543.2, le=32.1), Field(..., description="None")], double : Annotated[confloat(ge=123.4, le=67.8), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(ge=987.6)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, async_req: Optional[bool]=True, **kwargs) -> None: # noqa: E501 + def test_endpoint_parameters(self, number : Annotated[confloat(le=543.2, ge=32.1), Field(..., description="None")], double : Annotated[confloat(le=123.4, ge=67.8), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(le=987.6)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, async_req: Optional[bool]=True, **kwargs) -> None: # noqa: E501 ... @validate_arguments - def test_endpoint_parameters(self, number : Annotated[confloat(ge=543.2, le=32.1), Field(..., description="None")], double : Annotated[confloat(ge=123.4, le=67.8), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(ge=987.6)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, async_req: Optional[bool]=None, **kwargs) -> Union[None, Awaitable[None]]: # noqa: E501 + def test_endpoint_parameters(self, number : Annotated[confloat(le=543.2, ge=32.1), Field(..., description="None")], double : Annotated[confloat(le=123.4, ge=67.8), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(le=987.6)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, async_req: Optional[bool]=None, **kwargs) -> Union[None, Awaitable[None]]: # noqa: E501 """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 @@ -2127,7 +2127,7 @@ class FakeApi(object): return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, integer, int32, int64, float, string, binary, var_date, date_time, password, param_callback, **kwargs) # noqa: E501 @validate_arguments - def test_endpoint_parameters_with_http_info(self, number : Annotated[confloat(ge=543.2, le=32.1), Field(..., description="None")], double : Annotated[confloat(ge=123.4, le=67.8), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(ge=987.6)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, **kwargs): # noqa: E501 + def test_endpoint_parameters_with_http_info(self, number : Annotated[confloat(le=543.2, ge=32.1), Field(..., description="None")], double : Annotated[confloat(le=123.4, ge=67.8), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(le=987.6)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, **kwargs): # noqa: E501 """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py index 19abb688c13..44c7b2d4e0a 100755 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/api/fake_api.py @@ -1929,7 +1929,7 @@ class FakeApi(object): _request_auth=_params.get('_request_auth')) @validate_arguments - def test_endpoint_parameters(self, number : Annotated[confloat(ge=543.2, le=32.1, strict=True), Field(..., description="None")], double : Annotated[confloat(ge=123.4, le=67.8, strict=True), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(ge=987.6, strict=True)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, **kwargs) -> None: # noqa: E501 + def test_endpoint_parameters(self, number : Annotated[confloat(le=543.2, ge=32.1, strict=True), Field(..., description="None")], double : Annotated[confloat(le=123.4, ge=67.8, strict=True), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(le=987.6, strict=True)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, **kwargs) -> None: # noqa: E501 """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 @@ -1986,7 +1986,7 @@ class FakeApi(object): return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, integer, int32, int64, float, string, binary, var_date, date_time, password, param_callback, **kwargs) # noqa: E501 @validate_arguments - def test_endpoint_parameters_with_http_info(self, number : Annotated[confloat(ge=543.2, le=32.1, strict=True), Field(..., description="None")], double : Annotated[confloat(ge=123.4, le=67.8, strict=True), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(ge=987.6, strict=True)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, **kwargs): # noqa: E501 + def test_endpoint_parameters_with_http_info(self, number : Annotated[confloat(le=543.2, ge=32.1, strict=True), Field(..., description="None")], double : Annotated[confloat(le=123.4, ge=67.8, strict=True), Field(..., description="None")], pattern_without_delimiter : Annotated[constr(strict=True), Field(..., description="None")], byte : Annotated[StrictStr, Field(..., description="None")], integer : Annotated[Optional[conint(strict=True, le=100, ge=10)], Field(description="None")] = None, int32 : Annotated[Optional[conint(strict=True, le=200, ge=20)], Field(description="None")] = None, int64 : Annotated[Optional[StrictInt], Field(description="None")] = None, float : Annotated[Optional[confloat(le=987.6, strict=True)], Field(description="None")] = None, string : Annotated[Optional[constr(strict=True)], Field(description="None")] = None, binary : Annotated[Optional[StrictStr], Field(description="None")] = None, var_date : Annotated[Optional[date], Field(description="None")] = None, date_time : Annotated[Optional[datetime], Field(description="None")] = None, password : Annotated[Optional[constr(strict=True, max_length=64, min_length=10)], Field(description="None")] = None, param_callback : Annotated[Optional[StrictStr], Field(description="None")] = None, **kwargs): # noqa: E501 """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 From ba2c42e34b3f7fbde92b01b6d0f5ed1b023a553e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 6 Apr 2023 15:00:14 +0800 Subject: [PATCH 109/131] add override to java native pojo (#15125) --- .../Java/libraries/native/pojo.mustache | 17 +++++++++++ .../codegen/java/JavaClientCodegenTest.java | 30 ++++++++++++++++++- .../openapitools/client/model/DataQuery.java | 12 ++++++++ .../org/openapitools/client/model/Cat.java | 12 ++++++++ .../org/openapitools/client/model/Dog.java | 12 ++++++++ .../openapitools/client/model/ParentPet.java | 6 ++++ .../org/openapitools/client/model/Cat.java | 12 ++++++++ .../org/openapitools/client/model/Dog.java | 12 ++++++++ .../openapitools/client/model/ParentPet.java | 6 ++++ 9 files changed, 118 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index d8dd7cd3839..dbd74e348ca 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -267,6 +267,23 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vars}} {{>libraries/native/additional_properties}} + {{#parent}} + {{#allVars}} + {{#isOverridden}} + @Override + public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) { + {{#vendorExtensions.x-is-jackson-optional-nullable}} + this.{{setter}}(JsonNullable.<{{{datatypeWithEnum}}}>of({{name}})); + {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{^vendorExtensions.x-is-jackson-optional-nullable}} + this.{{setter}}({{name}}); + {{/vendorExtensions.x-is-jackson-optional-nullable}} + return this; + } + + {{/isOverridden}} + {{/allVars}} + {{/parent}} /** * Return true if this {{name}} object is equal to o. */ diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index b4f7a8ca460..f6f599d9cc3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -1954,4 +1954,32 @@ public class JavaClientCodegenTest { " public Pet petType(String petType) {\n"); } -} \ No newline at end of file + + @Test + public void testForJavaNativeClientOverrideSetter() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/allOf_composition_discriminator.yaml", null, new ParseOptions()).getOpenAPI(); + + JavaClientCodegen codegen = new JavaClientCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + codegen.setLibrary(JavaClientCodegen.NATIVE); + + generator.opts(input).generate(); + + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Cat.java"), " @Override\n" + + " public Cat petType(String petType) {"); + assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/client/model/Pet.java"), " }\n" + + "\n" + + " public Pet petType(String petType) {\n"); + + } +} diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java index 23fd24cf179..f38b803dc81 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java @@ -129,6 +129,18 @@ public class DataQuery extends Query { } + @Override + public DataQuery id(Long id) { + this.setId(id); + return this; + } + + @Override + public DataQuery outcomes(List outcomes) { + this.setOutcomes(outcomes); + return this; + } + /** * Return true if this DataQuery object is equal to o. */ diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java index 8b85a7bb108..6c3b20b091e 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java @@ -78,6 +78,18 @@ public class Cat extends Animal { } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } + /** * Return true if this Cat object is equal to o. */ diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java index e46cae8e00e..7fd17f897a6 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java @@ -78,6 +78,18 @@ public class Dog extends Animal { } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } + /** * Return true if this Dog object is equal to o. */ diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java index 1ea01ee0938..7b3ac1af02a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java @@ -52,6 +52,12 @@ public class ParentPet extends GrandparentAnimal { public ParentPet() { } + @Override + public ParentPet petType(String petType) { + this.setPetType(petType); + return this; + } + /** * Return true if this ParentPet object is equal to o. */ diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java index 8b85a7bb108..6c3b20b091e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java @@ -78,6 +78,18 @@ public class Cat extends Animal { } + @Override + public Cat className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Cat color(String color) { + this.setColor(color); + return this; + } + /** * Return true if this Cat object is equal to o. */ diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java index e46cae8e00e..7fd17f897a6 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java @@ -78,6 +78,18 @@ public class Dog extends Animal { } + @Override + public Dog className(String className) { + this.setClassName(className); + return this; + } + + @Override + public Dog color(String color) { + this.setColor(color); + return this; + } + /** * Return true if this Dog object is equal to o. */ diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java index 1ea01ee0938..7b3ac1af02a 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java @@ -52,6 +52,12 @@ public class ParentPet extends GrandparentAnimal { public ParentPet() { } + @Override + public ParentPet petType(String petType) { + this.setPetType(petType); + return this; + } + /** * Return true if this ParentPet object is equal to o. */ From bd7bc9aa798d01031e46c97750ce249bf3271261 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 7 Apr 2023 09:34:04 +0800 Subject: [PATCH 110/131] [python-nextgen] Add bytearray, none_type as primitive type (#15130) * add bytearray, none type as primitive type * update samples * update doc --- docs/generators/python-nextgen.md | 2 ++ .../codegen/languages/PythonNextgenClientCodegen.java | 2 ++ samples/client/echo_api/python-nextgen/docs/BodyApi.md | 2 +- .../petstore/python-nextgen-aiohttp/docs/FakeApi.md | 6 +++--- .../petstore/python-nextgen-aiohttp/docs/FormatTest.md | 4 ++-- .../petstore/python-nextgen-aiohttp/docs/PetApi.md | 4 ++-- .../petstore_api/models/format_test.py | 10 ++-------- .../client/petstore/python-nextgen/docs/FakeApi.md | 6 +++--- .../client/petstore/python-nextgen/docs/FormatTest.md | 4 ++-- .../client/petstore/python-nextgen/docs/PetApi.md | 4 ++-- .../python-nextgen/petstore_api/models/format_test.py | 10 ++-------- 11 files changed, 23 insertions(+), 31 deletions(-) diff --git a/docs/generators/python-nextgen.md b/docs/generators/python-nextgen.md index c8a3984195a..5343d442b36 100644 --- a/docs/generators/python-nextgen.md +++ b/docs/generators/python-nextgen.md @@ -50,6 +50,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
        • Dict
        • List
        • bool
        • +
        • bytearray
        • bytes
        • date
        • datetime
        • @@ -58,6 +59,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
        • float
        • int
        • list
        • +
        • none_type
        • object
        • str
        • diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java index ae2b72ac085..4c83af570fa 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonNextgenClientCodegen.java @@ -120,6 +120,8 @@ public class PythonNextgenClientCodegen extends AbstractPythonCodegen implements languageSpecificPrimitives.remove("file"); languageSpecificPrimitives.add("decimal.Decimal"); + languageSpecificPrimitives.add("bytearray"); + languageSpecificPrimitives.add("none_type"); supportsInheritance = true; modelPackage = "models"; diff --git a/samples/client/echo_api/python-nextgen/docs/BodyApi.md b/samples/client/echo_api/python-nextgen/docs/BodyApi.md index cbe30800e20..f0ba44f9747 100644 --- a/samples/client/echo_api/python-nextgen/docs/BodyApi.md +++ b/samples/client/echo_api/python-nextgen/docs/BodyApi.md @@ -51,7 +51,7 @@ This endpoint does not need any parameter. ### Return type -[**bytearray**](bytearray.md) +**bytearray** ### Authorization diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md index aba30bd3e1e..6c225b2426f 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FakeApi.md @@ -612,7 +612,7 @@ configuration = petstore_api.Configuration( async with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) - body = petstore_api.bytearray() # bytearray | image to upload + body = None # bytearray | image to upload try: await api_instance.test_body_with_binary(body) @@ -934,13 +934,13 @@ async with petstore_api.ApiClient(configuration) as api_client: number = 3.4 # float | None double = 3.4 # float | None pattern_without_delimiter = 'pattern_without_delimiter_example' # str | None - byte = petstore_api.bytearray() # bytearray | None + byte = None # bytearray | None integer = 56 # int | None (optional) int32 = 56 # int | None (optional) int64 = 56 # int | None (optional) float = 3.4 # float | None (optional) string = 'string_example' # str | None (optional) - binary = petstore_api.bytearray() # bytearray | None (optional) + binary = None # bytearray | None (optional) var_date = '2013-10-20' # date | None (optional) date_time = '2013-10-20T19:20:30+01:00' # datetime | None (optional) password = 'password_example' # str | None (optional) diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md index 9ab2ba76245..aa81e585952 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/FormatTest.md @@ -13,8 +13,8 @@ Name | Type | Description | Notes **decimal** | **decimal.Decimal** | | [optional] **string** | **str** | | [optional] **string_with_double_quote_pattern** | **str** | | [optional] -**byte** | [**bytearray**](bytearray.md) | | [optional] -**binary** | [**bytearray**](bytearray.md) | | [optional] +**byte** | **bytearray** | | [optional] +**binary** | **bytearray** | | [optional] **var_date** | **date** | | **date_time** | **datetime** | | [optional] **uuid** | **str** | | [optional] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/PetApi.md b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/PetApi.md index ffd45c7f4f9..c63c0c6ec48 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/PetApi.md +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/docs/PetApi.md @@ -1176,7 +1176,7 @@ async with petstore_api.ApiClient(configuration) as api_client: api_instance = petstore_api.PetApi(api_client) pet_id = 56 # int | ID of pet to update additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional) - file = petstore_api.bytearray() # bytearray | file to upload (optional) + file = None # bytearray | file to upload (optional) try: # uploads an image @@ -1250,7 +1250,7 @@ async with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.PetApi(api_client) pet_id = 56 # int | ID of pet to update - required_file = petstore_api.bytearray() # bytearray | file to upload + required_file = None # bytearray | file to upload additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional) try: diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py index c8b1eb5e694..811d3a4ee27 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/format_test.py @@ -92,12 +92,6 @@ class FormatTest(BaseModel): exclude={ }, exclude_none=True) - # override the default output from pydantic by calling `to_dict()` of byte - if self.byte: - _dict['byte'] = self.byte.to_dict() - # override the default output from pydantic by calling `to_dict()` of binary - if self.binary: - _dict['binary'] = self.binary.to_dict() return _dict @classmethod @@ -119,8 +113,8 @@ class FormatTest(BaseModel): "decimal": obj.get("decimal"), "string": obj.get("string"), "string_with_double_quote_pattern": obj.get("string_with_double_quote_pattern"), - "byte": bytearray.from_dict(obj.get("byte")) if obj.get("byte") is not None else None, - "binary": bytearray.from_dict(obj.get("binary")) if obj.get("binary") is not None else None, + "byte": obj.get("byte"), + "binary": obj.get("binary"), "var_date": obj.get("date"), "date_time": obj.get("dateTime"), "uuid": obj.get("uuid"), diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md b/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md index 34f265a1b56..fc6167ff8b9 100755 --- a/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-nextgen/docs/FakeApi.md @@ -612,7 +612,7 @@ configuration = petstore_api.Configuration( with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) - body = petstore_api.bytearray() # bytearray | image to upload + body = None # bytearray | image to upload try: api_instance.test_body_with_binary(body) @@ -934,13 +934,13 @@ with petstore_api.ApiClient(configuration) as api_client: number = 3.4 # float | None double = 3.4 # float | None pattern_without_delimiter = 'pattern_without_delimiter_example' # str | None - byte = petstore_api.bytearray() # bytearray | None + byte = None # bytearray | None integer = 56 # int | None (optional) int32 = 56 # int | None (optional) int64 = 56 # int | None (optional) float = 3.4 # float | None (optional) string = 'string_example' # str | None (optional) - binary = petstore_api.bytearray() # bytearray | None (optional) + binary = None # bytearray | None (optional) var_date = '2013-10-20' # date | None (optional) date_time = '2013-10-20T19:20:30+01:00' # datetime | None (optional) password = 'password_example' # str | None (optional) diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md b/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md index 9ab2ba76245..aa81e585952 100755 --- a/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md +++ b/samples/openapi3/client/petstore/python-nextgen/docs/FormatTest.md @@ -13,8 +13,8 @@ Name | Type | Description | Notes **decimal** | **decimal.Decimal** | | [optional] **string** | **str** | | [optional] **string_with_double_quote_pattern** | **str** | | [optional] -**byte** | [**bytearray**](bytearray.md) | | [optional] -**binary** | [**bytearray**](bytearray.md) | | [optional] +**byte** | **bytearray** | | [optional] +**binary** | **bytearray** | | [optional] **var_date** | **date** | | **date_time** | **datetime** | | [optional] **uuid** | **str** | | [optional] diff --git a/samples/openapi3/client/petstore/python-nextgen/docs/PetApi.md b/samples/openapi3/client/petstore/python-nextgen/docs/PetApi.md index 1a33b030317..0321e8336bc 100755 --- a/samples/openapi3/client/petstore/python-nextgen/docs/PetApi.md +++ b/samples/openapi3/client/petstore/python-nextgen/docs/PetApi.md @@ -1176,7 +1176,7 @@ with petstore_api.ApiClient(configuration) as api_client: api_instance = petstore_api.PetApi(api_client) pet_id = 56 # int | ID of pet to update additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional) - file = petstore_api.bytearray() # bytearray | file to upload (optional) + file = None # bytearray | file to upload (optional) try: # uploads an image @@ -1250,7 +1250,7 @@ with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.PetApi(api_client) pet_id = 56 # int | ID of pet to update - required_file = petstore_api.bytearray() # bytearray | file to upload + required_file = None # bytearray | file to upload additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional) try: diff --git a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py index 4fe80d0e6aa..89f85aa14cd 100644 --- a/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py +++ b/samples/openapi3/client/petstore/python-nextgen/petstore_api/models/format_test.py @@ -94,12 +94,6 @@ class FormatTest(BaseModel): "additional_properties" }, exclude_none=True) - # override the default output from pydantic by calling `to_dict()` of byte - if self.byte: - _dict['byte'] = self.byte.to_dict() - # override the default output from pydantic by calling `to_dict()` of binary - if self.binary: - _dict['binary'] = self.binary.to_dict() # puts key-value pairs in additional_properties in the top level if self.additional_properties is not None: for _key, _value in self.additional_properties.items(): @@ -126,8 +120,8 @@ class FormatTest(BaseModel): "decimal": obj.get("decimal"), "string": obj.get("string"), "string_with_double_quote_pattern": obj.get("string_with_double_quote_pattern"), - "byte": bytearray.from_dict(obj.get("byte")) if obj.get("byte") is not None else None, - "binary": bytearray.from_dict(obj.get("binary")) if obj.get("binary") is not None else None, + "byte": obj.get("byte"), + "binary": obj.get("binary"), "var_date": obj.get("date"), "date_time": obj.get("dateTime"), "uuid": obj.get("uuid"), From bda2e4a1671b11399d4e9354f0081d4098c3519e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 7 Apr 2023 09:34:20 +0800 Subject: [PATCH 111/131] fix NPE in simplifyOneOfAnyOf (#15142) --- .../java/org/openapitools/codegen/OpenAPINormalizer.java | 2 +- .../3_0/simplifyAnyOfStringAndEnumString_test.yaml | 7 +++++++ .../src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index 794d3c8110c..bf9d4dcfca6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -728,7 +728,7 @@ public class OpenAPINormalizer { // if only one element left, simplify to just the element (schema) if (schema.getAnyOf().size() == 1) { - if (schema.getNullable()) { // retain nullable setting + if (Boolean.TRUE.equals(schema.getNullable())) { // retain nullable setting ((Schema) schema.getAnyOf().get(0)).setNullable(true); } return (Schema) schema.getAnyOf().get(0); diff --git a/modules/openapi-generator/src/test/resources/3_0/simplifyAnyOfStringAndEnumString_test.yaml b/modules/openapi-generator/src/test/resources/3_0/simplifyAnyOfStringAndEnumString_test.yaml index 453b35e0f46..a2fbdb49a79 100644 --- a/modules/openapi-generator/src/test/resources/3_0/simplifyAnyOfStringAndEnumString_test.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/simplifyAnyOfStringAndEnumString_test.yaml @@ -36,4 +36,11 @@ components: enum: - A - B + SingleAnyOfTest: + description: to test anyOf (enum string only) + anyOf: + - type: string + enum: + - A + - B diff --git a/modules/openapi-generator/src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml b/modules/openapi-generator/src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml index 5f0cf2370de..2a2fe727152 100644 --- a/modules/openapi-generator/src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml @@ -42,4 +42,10 @@ components: - type: integer - type: string - $ref: null - + SingleAnyOfTest: + description: to test anyOf (enum string only) + anyOf: + - type: string + enum: + - A + - B \ No newline at end of file From e8e62ccadbfc7253ec2b918b2f0c946899c2e646 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 7 Apr 2023 15:54:42 +0800 Subject: [PATCH 112/131] simplify enum of string & string to enum of string (#15149) --- .../java/org/openapitools/codegen/OpenAPINormalizer.java | 8 ++++---- .../org/openapitools/codegen/OpenAPINormalizerTest.java | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java index bf9d4dcfca6..6b98b0d5e24 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java @@ -598,7 +598,7 @@ public class OpenAPINormalizer { /** * If the schema is anyOf and the sub-schemas are either string or enum of string, - * then simplify it to just string as many generators do not yet support anyOf. + * then simplify it to just enum of string as many generators do not yet support anyOf. * * @param schema Schema * @return Schema @@ -624,12 +624,12 @@ public class OpenAPINormalizer { s0 = ModelUtils.getReferencedSchema(openAPI, s0); s1 = ModelUtils.getReferencedSchema(openAPI, s1); - // find the string schema (not enum) + // find the string schema (enum) if (s0 instanceof StringSchema && s1 instanceof StringSchema) { if (((StringSchema) s0).getEnum() != null) { // s0 is enum, s1 is string - result = (StringSchema) s1; - } else if (((StringSchema) s1).getEnum() != null) { // s1 is enum, s0 is string result = (StringSchema) s0; + } else if (((StringSchema) s1).getEnum() != null) { // s1 is enum, s0 is string + result = (StringSchema) s1; } else { // both are string result = schema; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java index 93deecc445d..79535e0d241 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java @@ -132,6 +132,7 @@ public class OpenAPINormalizerTest { Schema schema3 = openAPI.getComponents().getSchemas().get("AnyOfTest"); assertNull(schema3.getAnyOf()); assertTrue(schema3 instanceof StringSchema); + assertTrue(schema3.getEnum().size() > 0); } @Test From b2be16746c93617e02c4de555e397220a3d50ce3 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 7 Apr 2023 16:14:24 +0800 Subject: [PATCH 113/131] fix link, add links to posts (#15153) --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f83a6d7630e..cdc17f7039f 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,13 @@
          [Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`6.6.0`): -[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) +[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://app.travis-ci.com/github/OpenAPITools/openapi-generator/builds) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator) [![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67) [7.0.x](https://github.com/OpenAPITools/openapi-generator/tree/7.0.x) (`7.0.x`): -[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/7.0.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) +[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/7.0.x.svg?label=Integration%20Test)](https://app.travis-ci.com/github/OpenAPITools/openapi-generator/builds) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/7.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=7.0.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator) [![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/7.0.x?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67) @@ -904,6 +904,10 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - 2022-12-13 - [API-First with Spring WebFlux and OpenAPI Generator](https://boottechnologies-ci.medium.com/api-first-with-spring-webflux-and-openapi-generator-38b7804c4ed4) by [Eric Anicet](https://boottechnologies-ci.medium.com/) - 2023-01-06 - [Major Improvements with Helidon and OpenAPI](https://medium.com/helidon/major-improvements-with-helidon-and-openapi-f76a0951508e) by [Tim Quinn](https://medium.com/@tquinno600) - 2023-02-02 - [Replacing Postman with the Jetbrains HTTP Client](https://lengrand.fr/replacing-postman-in-seconds-with-the-jetbrains-http-client/) by [julien Lengrand-Lambert](https://github.com/jlengrand) +- 2023-03-15 - [OpenAPI Generatorに適したOpenAPIの書き方](https://techblog.zozo.com/entry/how-to-write-openapi-for-openapi-generator) by [ZOZO Tech Blog](https://techblog.zozo.com/) +- 2023-03-19 - [EXOGEM: Extending OpenAPI Generator for Monitoring of RESTful APIs](https://link.springer.com/chapter/10.1007/978-3-031-26507-5_10) by Daniel Friis Holtebo, Jannik Lucas Sommer, Magnus Mølgaard Lund, Alessandro Tibo, Junior Dongo & Michele Albano at "ICSOC 2022: Service-Oriented Computing – ICSOC 2022 Workshops" +- 2023-03-28 - [API-First Design with OpenAPI Generator](https://www.linkedin.com/pulse/api-first-design-openapi-generator-jonathan-manera/) by [Jonathan Manera](https://www.linkedin.com/in/manerajona/) +- 2023-03-28 - [ハンズオンで学ぶサーバーサイド Kotlin(Spring Boot&Arrow&OpenAPI Generator)v1.0.1](https://zenn.dev/msksgm/books/implementing-server-side-kotlin-development) by [msk](https://zenn.dev/msksgm) ## [6 - About Us](#table-of-contents) From f40433d28fc0d205876f772d5b6700670a84b157 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Fri, 7 Apr 2023 10:24:11 +0200 Subject: [PATCH 114/131] qt ctest (#14968) * [cpp-qt-client] Fix warning about deprecated count() method * [cpp-qt-client] Ignore build directory * [cpp-qt-client] Use ctest * Fix CMakeLists.txt for cpp-qt-client --- .github/workflows/samples-cpp-qt-client.yaml | 6 +- .../cpp-qt-client/CMakeLists.txt.mustache | 69 +++++++++++-------- .../cpp-qt-client/helpers-body.mustache | 2 +- samples/client/petstore/cpp-qt/.gitignore | 1 + samples/client/petstore/cpp-qt/CMakeLists.txt | 13 ++-- .../petstore/cpp-qt/build-and-test.bash | 10 +-- .../petstore/cpp-qt/client/CMakeLists.txt | 67 ++++++++++-------- .../petstore/cpp-qt/client/PFXHelpers.cpp | 2 +- 8 files changed, 98 insertions(+), 72 deletions(-) create mode 100644 samples/client/petstore/cpp-qt/.gitignore diff --git a/.github/workflows/samples-cpp-qt-client.yaml b/.github/workflows/samples-cpp-qt-client.yaml index 2ef3fbc96a1..e1e6e4e5dc4 100644 --- a/.github/workflows/samples-cpp-qt-client.yaml +++ b/.github/workflows/samples-cpp-qt-client.yaml @@ -23,12 +23,16 @@ jobs: - ubuntu-latest - macOS-latest - windows-latest + include: + - os: windows-latest + tools: 'tools_openssl_x64' runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: jurplel/install-qt-action@v3 with: version: ${{ matrix.qt-version }} + tools: ${{ matrix.tools }} - name: Build working-directory: "samples/client/petstore/cpp-qt" - run: ./build-and-test.bash + run: cmake . && cmake --build . diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/CMakeLists.txt.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/CMakeLists.txt.mustache index ae484139eb4..338fbf63591 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/CMakeLists.txt.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/CMakeLists.txt.mustache @@ -2,39 +2,53 @@ cmake_minimum_required(VERSION 3.2) project({{{packageName}}}) -set(CMAKE_VERBOSE_MAKEFILE ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CXX_STANDARD_REQUIRED ON) - -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 14) -endif() - -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -endif() - -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network Gui) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Network Gui) include(GNUInstallDirs) include(CMakePackageConfigHelpers) -file(GLOB_RECURSE HEADER_FILES "*.h") -file(GLOB_RECURSE SOURCE_FILES "*.cpp") - -add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES}) - -target_compile_options(${PROJECT_NAME} - PRIVATE - $<$,$,$>: - -Wall -Wno-unused-variable> -) +add_library(${PROJECT_NAME} +{{#models}} +{{#model}} + {{classname}}.h +{{/model}} +{{/models}} +{{#apiInfo}} +{{#apis}} +{{#operations}} + {{classname}}.h +{{/operations}} +{{/apis}} +{{/apiInfo}} + {{prefix}}Helpers.h + {{prefix}}HttpRequest.h + {{prefix}}Object.h + {{prefix}}Enum.h + {{prefix}}HttpFileElement.h + {{prefix}}ServerConfiguration.h + {{prefix}}ServerVariable.h + {{prefix}}Oauth.h +{{#models}} +{{#model}} + {{classname}}.cpp +{{/model}} +{{/models}} +{{#apiInfo}} +{{#apis}} +{{#operations}} + {{classname}}.cpp +{{/operations}} +{{/apis}} +{{/apiInfo}} + {{prefix}}Helpers.cpp + {{prefix}}HttpRequest.cpp + {{prefix}}HttpFileElement.cpp + {{prefix}}Oauth.cpp + ) target_include_directories(${PROJECT_NAME} PUBLIC - $ + $ $ ) @@ -48,11 +62,6 @@ target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES}{{/contentCompression}} ) -if(NOT APPLE) - find_package(OpenSSL REQUIRED) - target_link_libraries(${PROJECT_NAME} PRIVATE ssl crypto) -endif() - configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-body.mustache index 0e19b1771fb..707a93be139 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-body.mustache @@ -225,7 +225,7 @@ bool fromStringValue(const QString &inStr, QByteArray &value) { } else { value.clear(); value.append(inStr.toUtf8()); - return value.count() > 0; + return value.size() > 0; } } diff --git a/samples/client/petstore/cpp-qt/.gitignore b/samples/client/petstore/cpp-qt/.gitignore new file mode 100644 index 00000000000..378eac25d31 --- /dev/null +++ b/samples/client/petstore/cpp-qt/.gitignore @@ -0,0 +1 @@ +build diff --git a/samples/client/petstore/cpp-qt/CMakeLists.txt b/samples/client/petstore/cpp-qt/CMakeLists.txt index 5fb20c83ec9..4ec3a21f490 100644 --- a/samples/client/petstore/cpp-qt/CMakeLists.txt +++ b/samples/client/petstore/cpp-qt/CMakeLists.txt @@ -1,20 +1,25 @@ cmake_minimum_required(VERSION 3.2) -project(cpp-qt5-petstore) +project(cpp-qt-petstore) set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network Gui Test) + add_subdirectory(client) -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Test) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test) -add_executable(${PROJECT_NAME} +add_executable(cpp-qt-petstore PetStore/main.cpp PetStore/PetApiTests.cpp PetStore/StoreApiTests.cpp PetStore/UserApiTests.cpp ) -target_link_libraries(${PROJECT_NAME} PRIVATE CppQtPetstoreClient Qt${QT_VERSION_MAJOR}::Test) +target_link_libraries(cpp-qt-petstore PRIVATE CppQtPetstoreClient Qt${QT_VERSION_MAJOR}::Test) + +enable_testing() + +add_test(NAME cpp-qt-petstore-test COMMAND cpp-qt-petstore) diff --git a/samples/client/petstore/cpp-qt/build-and-test.bash b/samples/client/petstore/cpp-qt/build-and-test.bash index 4104bdac1bc..9602f77ede5 100755 --- a/samples/client/petstore/cpp-qt/build-and-test.bash +++ b/samples/client/petstore/cpp-qt/build-and-test.bash @@ -8,14 +8,14 @@ cd build cmake .. -make +cmake --build . if [[ -z "${RUN_VALGRIND_TESTS}" ]]; then - echo "Running Qt5 Petstore Tests" - ./cpp-qt5-petstore + echo "Running Qt Petstore Tests" + ctest else - echo "Running Qt5 Petstore Tests with Valgrind" - valgrind --leak-check=full ./cpp-qt5-petstore |& tee result.log || exit 1 + echo "Running Qt Petstore Tests with Valgrind" + valgrind --leak-check=full ./cpp-qt-petstore |& tee result.log || exit 1 testCount=$(cat result.log | grep 'Finished testing of' | wc -l) if [ $testCount == 3 ] then diff --git a/samples/client/petstore/cpp-qt/client/CMakeLists.txt b/samples/client/petstore/cpp-qt/client/CMakeLists.txt index 869830afa19..fb37e4dc2d5 100644 --- a/samples/client/petstore/cpp-qt/client/CMakeLists.txt +++ b/samples/client/petstore/cpp-qt/client/CMakeLists.txt @@ -2,39 +2,51 @@ cmake_minimum_required(VERSION 3.2) project(CppQtPetstoreClient) -set(CMAKE_VERBOSE_MAKEFILE ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CXX_STANDARD_REQUIRED ON) - -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 14) -endif() - -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -endif() - -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network Gui) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Network Gui) include(GNUInstallDirs) include(CMakePackageConfigHelpers) -file(GLOB_RECURSE HEADER_FILES "*.h") -file(GLOB_RECURSE SOURCE_FILES "*.cpp") - -add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES}) - -target_compile_options(${PROJECT_NAME} - PRIVATE - $<$,$,$>: - -Wall -Wno-unused-variable> -) +add_library(${PROJECT_NAME} + PFXApiResponse.h + PFXCategory.h + PFXOrder.h + PFXPet.h + PFXTag.h + PFXTestAnyType.h + PFXUser.h + PFXPetApi.h + PFXPrimitivesApi.h + PFXStoreApi.h + PFXUserApi.h + PFXHelpers.h + PFXHttpRequest.h + PFXObject.h + PFXEnum.h + PFXHttpFileElement.h + PFXServerConfiguration.h + PFXServerVariable.h + PFXOauth.h + PFXApiResponse.cpp + PFXCategory.cpp + PFXOrder.cpp + PFXPet.cpp + PFXTag.cpp + PFXTestAnyType.cpp + PFXUser.cpp + PFXPetApi.cpp + PFXPrimitivesApi.cpp + PFXStoreApi.cpp + PFXUserApi.cpp + PFXHelpers.cpp + PFXHttpRequest.cpp + PFXHttpFileElement.cpp + PFXOauth.cpp + ) target_include_directories(${PROJECT_NAME} PUBLIC - $ + $ $ ) @@ -46,11 +58,6 @@ target_link_libraries(${PROJECT_NAME} ) -if(NOT APPLE) - find_package(OpenSSL REQUIRED) - target_link_libraries(${PROJECT_NAME} PRIVATE ssl crypto) -endif() - configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" diff --git a/samples/client/petstore/cpp-qt/client/PFXHelpers.cpp b/samples/client/petstore/cpp-qt/client/PFXHelpers.cpp index aab9ed05f20..a25beb3c517 100644 --- a/samples/client/petstore/cpp-qt/client/PFXHelpers.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXHelpers.cpp @@ -233,7 +233,7 @@ bool fromStringValue(const QString &inStr, QByteArray &value) { } else { value.clear(); value.append(inStr.toUtf8()); - return value.count() > 0; + return value.size() > 0; } } From a5bc7f107d21126ca01048025d178f9f6d1dc177 Mon Sep 17 00:00:00 2001 From: Ween Jiann <16207788+lwj5@users.noreply.github.com> Date: Mon, 10 Apr 2023 02:43:58 +0800 Subject: [PATCH 115/131] [typescript] Make TypeScriptClientCodegen extend AbstractTypeScriptClientCodegen (#15096) * Make TypeScriptClientCodegen extend AbstractTypeScriptClientCodegen * Regenerate samples * Update docs * Clean up * Remove updated toEnumName * Fix: SUPPORTS_ES6 * Fix: `setSupportsES6` should not be set directly in unit tests * Set modelPropertyNaming to camelCase --- docs/generators/typescript.md | 26 +- .../AbstractTypeScriptClientCodegen.java | 12 +- .../languages/TypeScriptClientCodegen.java | 606 ++---------------- .../TypeScriptAxiosClientCodegenTest.java | 4 +- .../TypeScriptFetchClientCodegenTest.java | 4 +- 5 files changed, 65 insertions(+), 587 deletions(-) diff --git a/docs/generators/typescript.md b/docs/generators/typescript.md index 58e50f191f2..a5ff44cf2b3 100644 --- a/docs/generators/typescript.md +++ b/docs/generators/typescript.md @@ -21,6 +21,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
          **false**
          The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
          **true**
          Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
          |true| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| +|enumNameSuffix|Suffix that will be appended to all enum names.| |Enum| +|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
          **false**
          No changes to the enum's are made, this is the default option.
          **true**
          With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
          |false| |fileContentDataType|Specifies the type to use for the content of a file - i.e. Blob (Browser, Deno) / Buffer (node)| |Buffer| |framework|Specify the framework which should be used in the client code.|
          **fetch-api**
          fetch-api
          **jquery**
          jquery
          |fetch-api| @@ -30,6 +32,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null| |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| |npmVersion|The version of your npm package. If not provided, using the version from the OpenAPI specification file.| |1.0.0| +|nullSafeAdditionalProps|Set to make additional properties types declare that their indexer may return undefined| |false| +|paramNaming|Naming convention for parameters: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase| |platform|Specifies the platform the code should run on. The default is 'node' for the 'request' framework and 'browser' otherwise.|
          **browser**
          browser
          **node**
          node
          **deno**
          deno
          |browser| |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| @@ -67,11 +71,13 @@ These options may be applied as additional-properties (cli) or configOptions (pl
        • Long
        • Map
        • Object
        • +
        • ReadonlyArray
        • Set
        • String
        • any
        • boolean
        • number
        • +
        • object
        • string
        • @@ -156,7 +162,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl ### Client Modification Feature | Name | Supported | Defined By | | ---- | --------- | ---------- | -|BasePath|✗|ToolingExtension +|BasePath|✓|ToolingExtension |Authorizations|✗|ToolingExtension |UserAgent|✗|ToolingExtension |MockServer|✗|ToolingExtension @@ -201,7 +207,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl ### Documentation Feature | Name | Supported | Defined By | | ---- | --------- | ---------- | -|Readme|✗|ToolingExtension +|Readme|✓|ToolingExtension |Model|✓|ToolingExtension |Api|✓|ToolingExtension @@ -221,7 +227,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |MultiServer|✗|OAS3 |ParameterizedServer|✗|OAS3 |ParameterStyling|✗|OAS3 -|Callbacks|✓|OAS3 +|Callbacks|✗|OAS3 |LinkObjects|✗|OAS3 ### Parameter Feature @@ -250,14 +256,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl ### Security Feature | Name | Supported | Defined By | | ---- | --------- | ---------- | -|BasicAuth|✓|OAS2,OAS3 -|ApiKey|✓|OAS2,OAS3 +|BasicAuth|✗|OAS2,OAS3 +|ApiKey|✗|OAS2,OAS3 |OpenIDConnect|✗|OAS3 -|BearerToken|✓|OAS3 -|OAuth2_Implicit|✓|OAS2,OAS3 -|OAuth2_Password|✓|OAS2,OAS3 -|OAuth2_ClientCredentials|✓|OAS2,OAS3 -|OAuth2_AuthorizationCode|✓|OAS2,OAS3 +|BearerToken|✗|OAS3 +|OAuth2_Implicit|✗|OAS2,OAS3 +|OAuth2_Password|✗|OAS2,OAS3 +|OAuth2_ClientCredentials|✗|OAS2,OAS3 +|OAuth2_AuthorizationCode|✗|OAS2,OAS3 ### Wire Format Feature | Name | Supported | Defined By | diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 779a71ccf60..89ac30bb52d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -25,10 +25,10 @@ import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapitools.codegen.*; import org.openapitools.codegen.CodegenConstants.ENUM_PROPERTY_NAMING_TYPE; import org.openapitools.codegen.CodegenConstants.MODEL_PROPERTY_NAMING_TYPE; import org.openapitools.codegen.CodegenConstants.PARAM_NAMING_TYPE; -import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.ModelsMap; @@ -46,7 +46,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.openapitools.codegen.languages.AbstractTypeScriptClientCodegen.ParameterExpander.ParamStyle.*; +import static org.openapitools.codegen.languages.AbstractTypeScriptClientCodegen.ParameterExpander.ParamStyle.form; +import static org.openapitools.codegen.languages.AbstractTypeScriptClientCodegen.ParameterExpander.ParamStyle.simple; import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER; import static org.openapitools.codegen.utils.StringUtils.camelize; import static org.openapitools.codegen.utils.StringUtils.underscore; @@ -392,10 +393,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp setParamNaming((String) additionalProperties.get(CodegenConstants.PARAM_NAMING)); } - if (additionalProperties.containsKey(CodegenConstants.SUPPORTS_ES6)) { - setSupportsES6(Boolean.valueOf(additionalProperties.get(CodegenConstants.SUPPORTS_ES6).toString())); - additionalProperties.put("supportsES6", getSupportsES6()); - } + setSupportsES6(convertPropertyToBooleanAndWriteBack(CodegenConstants.SUPPORTS_ES6)); if (additionalProperties.containsKey(NULL_SAFE_ADDITIONAL_PROPS)) { setNullSafeAdditionalProps(Boolean.valueOf(additionalProperties.get(NULL_SAFE_ADDITIONAL_PROPS).toString())); @@ -839,7 +837,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp if ("number".equals(datatype) || "boolean".equals(datatype)) { return value; } else { - return "\'" + escapeText(value) + "\'"; + return "'" + escapeText(value) + "'"; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java index d346d903063..62887e2cf61 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java @@ -17,17 +17,12 @@ package org.openapitools.codegen.languages; +import com.github.curiousoddman.rgxgen.RgxGen; import com.google.common.collect.Sets; - import io.swagger.v3.core.util.Json; import io.swagger.v3.oas.models.media.*; -import io.swagger.v3.oas.models.media.MediaType; -import io.swagger.v3.oas.models.parameters.RequestBody; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.media.ArraySchema; -import io.swagger.v3.oas.models.media.ComposedSchema; -import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; +import io.swagger.v3.oas.models.parameters.RequestBody; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.*; import org.openapitools.codegen.CodegenDiscriminator.MappedModel; @@ -40,42 +35,30 @@ import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.curiousoddman.rgxgen.RgxGen; -import com.github.curiousoddman.rgxgen.config.RgxGenOption; -import com.github.curiousoddman.rgxgen.config.RgxGenProperties; import java.io.File; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.util.regex.Pattern; -import java.util.regex.Matcher; -import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; - -import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER; -import static org.openapitools.codegen.utils.StringUtils.camelize; -import static org.openapitools.codegen.utils.StringUtils.underscore; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static org.openapitools.codegen.utils.OnceLogger.once; -public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig { +public class TypeScriptClientCodegen extends AbstractTypeScriptClientCodegen implements CodegenConfig { private final Logger LOGGER = LoggerFactory.getLogger(TypeScriptClientCodegen.class); - private static final String X_DISCRIMINATOR_TYPE = "x-discriminator-value"; - private static final String UNDEFINED_VALUE = "undefined"; - private static final String FRAMEWORK_SWITCH = "framework"; private static final String FRAMEWORK_SWITCH_DESC = "Specify the framework which should be used in the client code."; - private static final String[] FRAMEWORKS = { "fetch-api", "jquery" }; + private static final String[] FRAMEWORKS = {"fetch-api", "jquery"}; private static final String PLATFORM_SWITCH = "platform"; private static final String PLATFORM_SWITCH_DESC = "Specifies the platform the code should run on. The default is 'node' for the 'request' framework and 'browser' otherwise."; - private static final String[] PLATFORMS = { "browser", "node", "deno" }; + private static final String[] PLATFORMS = {"browser", "node", "deno"}; private static final String IMPORT_FILE_EXTENSION_SWITCH = "importFileExtension"; private static final String IMPORT_FILE_EXTENSION_SWITCH_DESC = "File extension to use with relative imports. Set it to '.js' or '.mjs' when using [ESM](https://nodejs.org/api/esm.html). Defaults to '.ts' when 'platform' is set to 'deno'."; - private static final String FILE_CONTENT_DATA_TYPE= "fileContentDataType"; + private static final String FILE_CONTENT_DATA_TYPE = "fileContentDataType"; private static final String FILE_CONTENT_DATA_TYPE_DESC = "Specifies the type to use for the content of a file - i.e. Blob (Browser, Deno) / Buffer (node)"; private static final String USE_RXJS_SWITCH = "useRxJS"; private static final String USE_RXJS_SWITCH_DESC = "Enable this to internally use rxjs observables. If disabled, a stub is used instead. This is required for the 'angular' framework."; @@ -85,27 +68,17 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo private static final String USE_OBJECT_PARAMS_SWITCH = "useObjectParameters"; private static final String USE_OBJECT_PARAMS_DESC = "Use aggregate parameter objects as function arguments for api operations instead of passing each parameter as a separate function argument."; - private final Map frameworkToHttpLibMap; // NPM Options - private static final String SNAPSHOT = "snapshot"; - @SuppressWarnings("squid:S5164") - protected static final ThreadLocal SNAPSHOT_SUFFIX_FORMAT = ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT)); private static final String NPM_REPOSITORY = "npmRepository"; - private static final String NPM_NAME = "npmName"; - private static final String NPM_VERSION = "npmVersion"; // NPM Option Values protected String npmRepository = null; protected String snapshot = null; - protected String npmName = null; - protected String npmVersion = "1.0.0"; - protected String modelPropertyNaming = "camelCase"; - protected HashSet languageGenericTypes; - private DateTimeFormatter iso8601Date = DateTimeFormatter.ISO_DATE; - private DateTimeFormatter iso8601DateTime = DateTimeFormatter.ISO_DATE_TIME; + private final DateTimeFormatter iso8601Date = DateTimeFormatter.ISO_DATE; + private final DateTimeFormatter iso8601DateTime = DateTimeFormatter.ISO_DATE_TIME; public TypeScriptClientCodegen() { super(); @@ -114,88 +87,23 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo this.frameworkToHttpLibMap.put("fetch-api", "isomorphic-fetch"); this.frameworkToHttpLibMap.put("jquery", "jquery"); - this.generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata).stability(Stability.EXPERIMENTAL).build(); outputFolder = "generated-code" + File.separator + "typescript"; embeddedTemplateDir = templateDir = "typescript"; - supportsInheritance = true; - // NOTE: TypeScript uses camel cased reserved words, while models are title cased. We don't want lowercase comparisons. reservedWords.addAll(Arrays.asList( // local variable names used in API methods (endpoints) - "varLocalPath", "queryParameters", "headerParams", "formParams", "useFormData", "varLocalDeferred", - "requestOptions", "from", + "from", // Typescript reserved words - "abstract", "await", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "constructor", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield")); + "constructor")); - languageSpecificPrimitives = new HashSet<>(Arrays.asList( - "string", - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float", - "Object", - "Array", - "Date", - "number", - "any", - "File", - "Error", - "Map", - "Set" - )); - - languageGenericTypes = new HashSet<>(Arrays.asList( - "Array" - )); - - instantiationTypes.put("array", "Array"); - - typeMapping = new HashMap<>(); - typeMapping.put("Array", "Array"); - typeMapping.put("array", "Array"); typeMapping.put("List", "Array"); - typeMapping.put("boolean", "boolean"); - typeMapping.put("string", "string"); - typeMapping.put("int", "number"); - typeMapping.put("float", "number"); - typeMapping.put("number", "number"); - typeMapping.put("long", "number"); - typeMapping.put("short", "number"); - typeMapping.put("char", "string"); - typeMapping.put("double", "number"); typeMapping.put("object", "any"); - typeMapping.put("integer", "number"); - typeMapping.put("Map", "any"); - typeMapping.put("map", "any"); - typeMapping.put("Set", "Set"); - typeMapping.put("set", "Set"); - typeMapping.put("date", "string"); typeMapping.put("DateTime", "Date"); - typeMapping.put("binary", "any"); - typeMapping.put("File", "any"); - typeMapping.put("file", "any"); - typeMapping.put("ByteArray", "string"); - typeMapping.put("UUID", "string"); - typeMapping.put("Error", "Error"); - typeMapping.put("AnyType", "any"); - - cliOptions.add(new CliOption(NPM_NAME, "The name under which you want to publish generated npm package." + - " Required to generate a full package")); - cliOptions.add(new CliOption(NPM_VERSION, "The version of your npm package. If not provided, using the version from the OpenAPI specification file.").defaultValue(this.getNpmVersion())); cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); - cliOptions.add(CliOption.newBoolean(SNAPSHOT, - "When setting this property to true, the version will be suffixed with -SNAPSHOT." + SNAPSHOT_SUFFIX_FORMAT.get().toPattern(), - false)); - - cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue("camelCase")); - cliOptions.add(new CliOption(CodegenConstants.SUPPORTS_ES6, CodegenConstants.SUPPORTS_ES6_DESC).defaultValue("false")); cliOptions.add(new CliOption(TypeScriptClientCodegen.FILE_CONTENT_DATA_TYPE, TypeScriptClientCodegen.FILE_CONTENT_DATA_TYPE_DESC).defaultValue("Buffer")); cliOptions.add(new CliOption(TypeScriptClientCodegen.USE_RXJS_SWITCH, TypeScriptClientCodegen.USE_RXJS_SWITCH_DESC).defaultValue("false")); cliOptions.add(new CliOption(TypeScriptClientCodegen.USE_OBJECT_PARAMS_SWITCH, TypeScriptClientCodegen.USE_OBJECT_PARAMS_DESC).defaultValue("false")); @@ -203,20 +111,23 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo cliOptions.add(new CliOption(TypeScriptClientCodegen.IMPORT_FILE_EXTENSION_SWITCH, TypeScriptClientCodegen.IMPORT_FILE_EXTENSION_SWITCH_DESC)); CliOption frameworkOption = new CliOption(TypeScriptClientCodegen.FRAMEWORK_SWITCH, TypeScriptClientCodegen.FRAMEWORK_SWITCH_DESC); - for (String option: TypeScriptClientCodegen.FRAMEWORKS) { + for (String option : TypeScriptClientCodegen.FRAMEWORKS) { frameworkOption.addEnum(option, option); } frameworkOption.defaultValue(FRAMEWORKS[0]); cliOptions.add(frameworkOption); CliOption platformOption = new CliOption(TypeScriptClientCodegen.PLATFORM_SWITCH, TypeScriptClientCodegen.PLATFORM_SWITCH_DESC); - for (String option: TypeScriptClientCodegen.PLATFORMS) { + for (String option : TypeScriptClientCodegen.PLATFORMS) { platformOption.addEnum(option, option); } platformOption.defaultValue(PLATFORMS[0]); cliOptions.add(platformOption); + // Set property naming to camelCase + supportModelPropertyNaming(CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.camelCase); + // Git supportingFiles.add(new SupportingFile(".gitignore.mustache", "", ".gitignore")); supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); @@ -274,42 +185,12 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo this.npmVersion = npmVersion; } - @Override - public CodegenType getTag() { - return CodegenType.CLIENT; - } - - @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - - if (additionalProperties.containsKey(NPM_NAME)) { - - // If no npmVersion is provided in additional properties, version from API specification is used. - // If none of them is provided then fallbacks to default version - if (additionalProperties.containsKey(NPM_VERSION)) { - this.setNpmVersion(additionalProperties.get(NPM_VERSION).toString()); - } else if (openAPI.getInfo() != null && openAPI.getInfo().getVersion() != null) { - this.setNpmVersion(openAPI.getInfo().getVersion()); - } - - if (additionalProperties.containsKey(SNAPSHOT) && Boolean.parseBoolean(additionalProperties.get(SNAPSHOT).toString())) { - if (npmVersion.toUpperCase(Locale.ROOT).matches("^.*-SNAPSHOT$")) { - this.setNpmVersion(npmVersion + "." + SNAPSHOT_SUFFIX_FORMAT.get().format(new Date())); - } else { - this.setNpmVersion(npmVersion + "-SNAPSHOT." + SNAPSHOT_SUFFIX_FORMAT.get().format(new Date())); - } - } - additionalProperties.put(NPM_VERSION, npmVersion); - - } - } - @Override public Map postProcessSupportingFileData(Map objs) { final Object propFramework = additionalProperties.get(FRAMEWORK_SWITCH); Map frameworks = new HashMap<>(); - for (String framework: FRAMEWORKS) { + for (String framework : FRAMEWORKS) { frameworks.put(framework, framework.equals(propFramework)); } objs.put("framework", propFramework); @@ -331,7 +212,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo OperationMap operationsMap = operations.getOperations(); List operationList = operationsMap.getOperation(); - for (CodegenOperation operation: operationList) { + for (CodegenOperation operation : operationList) { List responses = operation.responses; operation.returnType = this.getReturnType(responses); } @@ -340,12 +221,13 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo /** * Returns the correct return type based on all 2xx HTTP responses defined for an operation. + * * @param responses all CodegenResponses defined for one operation * @return TypeScript return type */ private String getReturnType(List responses) { Set returnTypes = new HashSet<>(); - for (CodegenResponse response: responses) { + for (CodegenResponse response : responses) { if (response.is2xx) { if (response.dataType != null) { returnTypes.add(response.dataType); @@ -362,18 +244,21 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return String.join(" | ", returnTypes); } - @Override - public String escapeReservedWord(String name) { - if (this.reservedWordsMappings().containsKey(name)) { - return this.reservedWordsMappings().get(name); - } - return "_" + name; - } - @Override public String toParamName(String name) { - // should be the same as variable name - return toVarName(name); + // sanitize name + name = sanitizeName(name); + + if ("_".equals(name)) { + name = "_u"; + } + + // if it's all upper case, do nothing + if (name.matches("^[A-Z_]*$")) { + return name; + } + + return super.toParamName(name); } @Override @@ -390,22 +275,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return name; } - name = getNameUsingModelPropertyNaming(name); - - // for reserved word or word starting with number, append _ - if (isReservedWord(name) || name.matches("^\\d.*")) { - name = escapeReservedWord(name); - } - - return name; - } - - @Override - public String toModelName(final String name) { - String fullModelName = name; - fullModelName = addPrefix(fullModelName, modelNamePrefix); - fullModelName = addSuffix(fullModelName, modelNameSuffix); - return toTypescriptTypeName(fullModelName, "Model"); + return super.toVarName(name); } @Override @@ -414,283 +284,12 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return "../" + modelPackage() + "/" + toModelName(name); } - protected String addPrefix(String name, String prefix) { - if (!StringUtils.isEmpty(prefix)) { - name = prefix + "_" + name; - } - return name; - } - - protected String addSuffix(String name, String suffix) { - if (!StringUtils.isEmpty(suffix)) { - name = name + "_" + suffix; - } - - return name; - } - - protected String toTypescriptTypeName(final String name, String safePrefix) { - ArrayList exceptions = new ArrayList<>(Arrays.asList("\\|", " ")); - String sanName = sanitizeName(name, "(?![| ])\\W", exceptions); - - sanName = camelize(sanName); - - // model name cannot use reserved keyword, e.g. return - // this is unlikely to happen, because we have just camelized the name, while reserved words are usually all lowercase - if (isReservedWord(sanName)) { - String modelName = safePrefix + sanName; - LOGGER.warn("{} (reserved word) cannot be used as model name. Renamed to {}", sanName, modelName); - return modelName; - } - - // model name starts with number - if (sanName.matches("^\\d.*")) { - String modelName = safePrefix + sanName; // e.g. 200Response => Model200Response - LOGGER.warn("{} (model name starts with number) cannot be used as model name. Renamed to {}", sanName, - modelName); - return modelName; - } - - if (languageSpecificPrimitives.contains(sanName)) { - String modelName = safePrefix + sanName; - LOGGER.warn("{} (model name matches existing language type) cannot be used as a model name. Renamed to {}", - sanName, modelName); - return modelName; - } - - return sanName; - } - - @Override - public String toModelFilename(String name) { - // should be the same as the model name - return toModelName(name); - } - - @Override - protected String getParameterDataType(Parameter parameter, Schema p) { - // handle enums of various data types - Schema inner; - if (ModelUtils.isArraySchema(p)) { - ArraySchema mp1 = (ArraySchema) p; - inner = mp1.getItems(); - return this.getSchemaType(p) + "<" + this.getParameterDataType(parameter, inner) + ">"; - } else if (ModelUtils.isMapSchema(p)) { - inner = (Schema) p.getAdditionalProperties(); - return "{ [key: string]: " + this.getParameterDataType(parameter, inner) + "; }"; - } else if (ModelUtils.isStringSchema(p)) { - // Handle string enums - if (p.getEnum() != null) { - return enumValuesToEnumTypeUnion(p.getEnum(), "string"); - } - } else if (ModelUtils.isIntegerSchema(p)) { - // Handle integer enums - if (p.getEnum() != null) { - return numericEnumValuesToEnumTypeUnion(new ArrayList(p.getEnum())); - } - } else if (ModelUtils.isNumberSchema(p)) { - // Handle double enums - if (p.getEnum() != null) { - return numericEnumValuesToEnumTypeUnion(new ArrayList(p.getEnum())); - } - } - return this.getTypeDeclaration(p); - } - - /** - * Converts a list of strings to a literal union for representing enum values as a type. - * Example output: 'available' | 'pending' | 'sold' - * - * @param values list of allowed enum values - * @param dataType either "string" or "number" - * @return a literal union for representing enum values as a type - */ - protected String enumValuesToEnumTypeUnion(List values, String dataType) { - StringBuilder b = new StringBuilder(); - boolean isFirst = true; - for (String value : values) { - if (!isFirst) { - b.append(" | "); - } - b.append(toEnumValue(value, dataType)); - isFirst = false; - } - return b.toString(); - } - - /** - * Converts a list of numbers to a literal union for representing enum values as a type. - * Example output: 3 | 9 | 55 - * - * @param values a list of numbers - * @return a literal union for representing enum values as a type - */ - protected String numericEnumValuesToEnumTypeUnion(List values) { - List stringValues = new ArrayList<>(); - for (Number value : values) { - stringValues.add(value.toString()); - } - return enumValuesToEnumTypeUnion(stringValues, "number"); - } - - @Override - public String toDefaultValue(Schema p) { - if (ModelUtils.isBooleanSchema(p)) { - return UNDEFINED_VALUE; - } else if (ModelUtils.isDateSchema(p)) { - return UNDEFINED_VALUE; - } else if (ModelUtils.isDateTimeSchema(p)) { - return UNDEFINED_VALUE; - } else if (ModelUtils.isNumberSchema(p)) { - if (p.getDefault() != null) { - return p.getDefault().toString(); - } - return UNDEFINED_VALUE; - } else if (ModelUtils.isIntegerSchema(p)) { - if (p.getDefault() != null) { - return p.getDefault().toString(); - } - return UNDEFINED_VALUE; - } else if (ModelUtils.isStringSchema(p)) { - if (p.getDefault() != null) { - return "'" + (String) p.getDefault() + "'"; - } - return UNDEFINED_VALUE; - } else { - return UNDEFINED_VALUE; - } - - } - - @Override - protected boolean isReservedWord(String word) { - // NOTE: This differs from super's implementation in that TypeScript does _not_ want case insensitive matching. - return reservedWords.contains(word); - } - - @Override - public String getSchemaType(Schema p) { - String openAPIType = super.getSchemaType(p); - String type = null; - if (ModelUtils.isComposedSchema(p)) { - return openAPIType; - } else if (typeMapping.containsKey(openAPIType)) { - type = typeMapping.get(openAPIType); - if (languageSpecificPrimitives.contains(type)) - return type; - } else - type = openAPIType; - return toModelName(type); - } - - @Override - public String toOperationId(String operationId) { - // throw exception if method name is empty - if (StringUtils.isEmpty(operationId)) { - throw new RuntimeException("Empty method name (operationId) not allowed"); - } - - // method name cannot use reserved keyword, e.g. return - // append _ at the beginning, e.g. _return - if (isReservedWord(operationId)) { - return escapeReservedWord(camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER)); - } - - return camelize(sanitizeName(operationId), LOWERCASE_FIRST_LETTER); - } - - public void setModelPropertyNaming(String naming) { - if ("original".equals(naming) || "camelCase".equals(naming) || - "PascalCase".equals(naming) || "snake_case".equals(naming)) { - this.modelPropertyNaming = naming; - } else { - throw new IllegalArgumentException("Invalid model property naming '" + - naming + "'. Must be 'original', 'camelCase', " + - "'PascalCase' or 'snake_case'"); - } - } - - public String getModelPropertyNaming() { - return this.modelPropertyNaming; - } - - public String getNameUsingModelPropertyNaming(String name) { - switch (CodegenConstants.MODEL_PROPERTY_NAMING_TYPE.valueOf(getModelPropertyNaming())) { - case original: - return name; - case camelCase: - return camelize(name, LOWERCASE_FIRST_LETTER); - case PascalCase: - return camelize(name); - case snake_case: - return underscore(name); - default: - throw new IllegalArgumentException("Invalid model property naming '" + - name + "'. Must be 'original', 'camelCase', " + - "'PascalCase' or 'snake_case'"); - } - - } - @Override public String toEnumValue(String value, String datatype) { if ("number".equals(datatype)) { return value; } else { - return "\'" + escapeText(value) + "\'"; - } - } - - @Override - public String toEnumDefaultValue(String value, String datatype) { - return datatype + "_" + value; - } - - @Override - public String toEnumVarName(String name, String datatype) { - if (name.length() == 0) { - return "Empty"; - } - - // for symbol, e.g. $, # - if (getSymbolName(name) != null) { - return camelize(getSymbolName(name)); - } - - // number - if ("number".equals(datatype)) { - String varName = "NUMBER_" + name; - - varName = varName.replaceAll("-", "MINUS_"); - varName = varName.replaceAll("\\+", "PLUS_"); - varName = varName.replaceAll("\\.", "_DOT_"); - return varName; - } - - // string - String enumName = sanitizeName(name); - enumName = enumName.replaceFirst("^_", ""); - enumName = enumName.replaceFirst("_$", ""); - - // camelize the enum variable name - // ref: https://basarat.gitbooks.io/typescript/content/docs/enums.html - enumName = camelize(enumName); - - if (enumName.matches("\\d.*")) { // starts with number - return "_" + enumName; - } else { - return enumName; - } - } - - @Override - public String toEnumName(CodegenProperty property) { - String enumName = toModelName(property.name) + "Enum"; - - if (enumName.matches("\\d.*")) { // starts with number - return "_" + enumName; - } else { - return enumName; + return "'" + escapeText(value) + "'"; } } @@ -738,53 +337,6 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return tsImports; } - @Override - public Map postProcessAllModels(Map objs) { - Map result = super.postProcessAllModels(objs); - - for (ModelsMap entry : result.values()) { - for (ModelMap mo : entry.getModels()) { - CodegenModel cm = mo.getModel(); - if (cm.discriminator != null && cm.children != null) { - for (CodegenModel child : cm.children) { - this.setDiscriminatorValue(child, cm.discriminator.getPropertyName(), this.getDiscriminatorValue(child)); - } - } - } - } - return result; - } - - private void setDiscriminatorValue(CodegenModel model, String baseName, String value) { - for (CodegenProperty prop : model.allVars) { - if (prop.baseName.equals(baseName)) { - prop.discriminatorValue = value; - } - } - if (model.children != null) { - final boolean newDiscriminator = model.discriminator != null; - for (CodegenModel child : model.children) { - this.setDiscriminatorValue(child, baseName, newDiscriminator ? value : this.getDiscriminatorValue(child)); - } - } - } - - private String getDiscriminatorValue(CodegenModel model) { - return model.vendorExtensions.containsKey(X_DISCRIMINATOR_TYPE) ? - (String) model.vendorExtensions.get(X_DISCRIMINATOR_TYPE) : model.classname; - } - - @Override - public String escapeQuotationMark(String input) { - // remove ', " to avoid code injection - return input.replace("\"", "").replace("'", ""); - } - - @Override - public String escapeUnsafeCharacters(String input) { - return input.replace("*/", "*_/").replace("/*", "/_*"); - } - @Override public String getName() { return "typescript"; @@ -795,17 +347,10 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return "Generates a TypeScript client library using Fetch API (beta)."; } - @Override public void processOpts() { super.processOpts(); - if (additionalProperties.containsKey(CodegenConstants.MODEL_PROPERTY_NAMING)) { - setModelPropertyNaming((String) additionalProperties.get(CodegenConstants.MODEL_PROPERTY_NAMING)); - } - - convertPropertyToBooleanAndWriteBack(CodegenConstants.SUPPORTS_ES6); - // change package names apiPackage = this.apiPackage + ".apis"; testPackage = this.testPackage + ".tests"; @@ -815,8 +360,8 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo String httpLibName = this.getHttpLibForFramework(additionalProperties.get(FRAMEWORK_SWITCH).toString()); supportingFiles.add(new SupportingFile( - "http" + File.separator + httpLibName + ".mustache", - "http", httpLibName + ".ts" + "http" + File.separator + httpLibName + ".mustache", + "http", httpLibName + ".ts" )); Object propPlatform = additionalProperties.get(PLATFORM_SWITCH); @@ -826,7 +371,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo } Map platforms = new HashMap<>(); - for (String platform: PLATFORMS) { + for (String platform : PLATFORMS) { platforms.put(platform, platform.equals(propPlatform)); } additionalProperties.put("platforms", platforms); @@ -861,14 +406,6 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo } // NPM Settings - if (additionalProperties.containsKey(NPM_NAME)) { - setNpmName(additionalProperties.get(NPM_NAME).toString()); - } - - if (additionalProperties.containsKey(NPM_VERSION)) { - setNpmVersion(additionalProperties.get(NPM_VERSION).toString()); - } - if (additionalProperties.containsKey(NPM_REPOSITORY)) { setNpmRepository(additionalProperties.get(NPM_REPOSITORY).toString()); } @@ -1396,9 +933,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return example; } - /*** - * * Set the codegenParameter example value * We have a custom version of this function so we can invoke toExampleValue * @@ -1489,64 +1024,6 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo return cp; } - @Override - public String toAnyOfName(List names, ComposedSchema composedSchema) { - List types = getTypesFromSchemas(composedSchema.getAnyOf()); - - return String.join(" | ", types); - } - - @Override - public String toOneOfName(List names, ComposedSchema composedSchema) { - List types = getTypesFromSchemas(composedSchema.getOneOf()); - - return String.join(" | ", types); - } - - @Override - public String toAllOfName(List names, ComposedSchema composedSchema) { - List types = getTypesFromSchemas(composedSchema.getAllOf()); - - return String.join(" & ", types); - } - - /** - * Extracts the list of type names from a list of schemas. - * Excludes `AnyType` if there are other valid types extracted. - * - * @param schemas list of schemas - * @return list of types - */ - protected List getTypesFromSchemas(List schemas) { - List filteredSchemas = schemas.size() > 1 - ? schemas.stream().filter(schema -> !"AnyType".equals(super.getSchemaType(schema))).collect(Collectors.toList()) - : schemas; - - return filteredSchemas.stream().map(schema -> { - String schemaType = getSchemaType(schema); - if (ModelUtils.isArraySchema(schema)) { - ArraySchema ap = (ArraySchema) schema; - Schema inner = ap.getItems(); - schemaType = schemaType + "<" + getSchemaType(inner) + ">"; - } - return schemaType; - }).distinct().collect(Collectors.toList()); - } - - @Override - protected void addImport(CodegenModel m, String type) { - if (type == null) { - return; - } - - String[] parts = splitComposedType(type); - for (String s : parts) { - if (needToImport(s)) { - m.imports.add(s); - } - } - } - @Override protected void addImport(Set importsToBeAddedTo, String type) { if (type == null) { @@ -1567,9 +1044,6 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo * @return list of types */ protected String[] splitComposedType(String type) { - return type.replace(" ","").split("[|&<>]"); + return type.replace(" ", "").split("[|&<>]"); } - - @Override - public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.TYPESCRIPT; } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java index da55a175fbc..8a229bf14ff 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java @@ -89,7 +89,7 @@ public class TypeScriptAxiosClientCodegenTest { codegen.additionalProperties().put("npmName", "@openapi/typescript-axios-petstore"); codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); - codegen.setSupportsES6(true); + codegen.additionalProperties().put("supportsES6", true); codegen.processOpts(); @@ -104,7 +104,7 @@ public class TypeScriptAxiosClientCodegenTest { codegen.additionalProperties().put("npmName", "@openapi/typescript-axios-petstore"); codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); - codegen.setSupportsES6(false); + codegen.additionalProperties().put("supportsES6", false); codegen.processOpts(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java index 34e67404179..0f19827b448 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java @@ -116,7 +116,7 @@ public class TypeScriptFetchClientCodegenTest { codegen.additionalProperties().put("npmName", "@openapi/typescript-fetch-petstore"); codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); - codegen.setSupportsES6(true); + codegen.additionalProperties().put("supportsES6", true); codegen.processOpts(); @@ -131,7 +131,7 @@ public class TypeScriptFetchClientCodegenTest { codegen.additionalProperties().put("npmName", "@openapi/typescript-fetch-petstore"); codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); - codegen.setSupportsES6(false); + codegen.additionalProperties().put("supportsES6", false); codegen.processOpts(); From 4a83c9181f45377adc102a309a767c963fda134e Mon Sep 17 00:00:00 2001 From: Tushar Date: Mon, 10 Apr 2023 08:01:37 +0530 Subject: [PATCH 116/131] fix(python-nextgen): Use spec format for authors in pyproject (#15170) --- .../src/main/resources/python-nextgen/pyproject.mustache | 3 ++- samples/client/echo_api/python-nextgen/pyproject.toml | 3 ++- .../client/petstore/python-nextgen-aiohttp/pyproject.toml | 3 ++- samples/openapi3/client/petstore/python-nextgen/pyproject.toml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache index 192ca581341..2371b4975b6 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache @@ -2,7 +2,7 @@ name = "{{{packageName}}}" version = "{{{packageVersion}}}" description = "{{{appName}}}" -authors = ["{{infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}"] +authors = ["{{infoName}}{{^infoName}}OpenAPI Generator Community{{/infoName}} <{{infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}>"] license = "{{{licenseInfo}}}{{^licenseInfo}}NoLicense{{/licenseInfo}}" readme = "README.md" repository = "https://github.com/{{{gitRepoId}}}/{{{gitUserId}}}" @@ -34,3 +34,4 @@ flake8 = ">=6.0.0" [build-system] requires = ["setuptools"] build-backend = "setuptools.build_meta" + diff --git a/samples/client/echo_api/python-nextgen/pyproject.toml b/samples/client/echo_api/python-nextgen/pyproject.toml index a1ad217c190..d0b1274a98a 100644 --- a/samples/client/echo_api/python-nextgen/pyproject.toml +++ b/samples/client/echo_api/python-nextgen/pyproject.toml @@ -2,7 +2,7 @@ name = "openapi_client" version = "1.0.0" description = "Echo Server API" -authors = ["team@openapitools.org"] +authors = ["OpenAPI Generator Community "] license = "Apache 2.0" readme = "README.md" repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID" @@ -24,3 +24,4 @@ flake8 = ">=6.0.0" [build-system] requires = ["setuptools"] build-backend = "setuptools.build_meta" + diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml index 3c1002a8445..447122c7486 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml @@ -2,7 +2,7 @@ name = "petstore_api" version = "1.0.0" description = "OpenAPI Petstore" -authors = ["team@openapitools.org"] +authors = ["OpenAPI Generator Community "] license = "Apache-2.0" readme = "README.md" repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID" @@ -27,3 +27,4 @@ flake8 = ">=6.0.0" [build-system] requires = ["setuptools"] build-backend = "setuptools.build_meta" + diff --git a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml index d70b472207c..3ba7360599a 100644 --- a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml +++ b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml @@ -2,7 +2,7 @@ name = "petstore_api" version = "1.0.0" description = "OpenAPI Petstore" -authors = ["team@openapitools.org"] +authors = ["OpenAPI Generator Community "] license = "Apache-2.0" readme = "README.md" repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID" @@ -26,3 +26,4 @@ flake8 = ">=6.0.0" [build-system] requires = ["setuptools"] build-backend = "setuptools.build_meta" + From a4f5a74d5b29e2bc1da628f6b7aa8c63a14f05cc Mon Sep 17 00:00:00 2001 From: Tushar Date: Mon, 10 Apr 2023 08:01:53 +0530 Subject: [PATCH 117/131] fix(python-nextgen): dependency incompatiblity (#15167) Downgrade tox and flake8. Alternateively, we can increase minimum python version to 3.8.1 --- .../src/main/resources/python-nextgen/pyproject.mustache | 4 ++-- samples/client/echo_api/python-nextgen/pyproject.toml | 4 ++-- .../client/petstore/python-nextgen-aiohttp/pyproject.toml | 4 ++-- .../openapi3/client/petstore/python-nextgen/pyproject.toml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache index 2371b4975b6..ce0db200000 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache @@ -28,8 +28,8 @@ aenum = ">=3.1.11" [tool.poetry.dev-dependencies] pytest = ">=7.2.1" -tox = ">=4.4.6" -flake8 = ">=6.0.0" +tox = ">=3.9.0" +flake8 = ">=4.0.0" [build-system] requires = ["setuptools"] diff --git a/samples/client/echo_api/python-nextgen/pyproject.toml b/samples/client/echo_api/python-nextgen/pyproject.toml index d0b1274a98a..954dc0de05a 100644 --- a/samples/client/echo_api/python-nextgen/pyproject.toml +++ b/samples/client/echo_api/python-nextgen/pyproject.toml @@ -18,8 +18,8 @@ aenum = ">=3.1.11" [tool.poetry.dev-dependencies] pytest = ">=7.2.1" -tox = ">=4.4.6" -flake8 = ">=6.0.0" +tox = ">=3.9.0" +flake8 = ">=4.0.0" [build-system] requires = ["setuptools"] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml index 447122c7486..981eebf3c59 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml @@ -21,8 +21,8 @@ aenum = ">=3.1.11" [tool.poetry.dev-dependencies] pytest = ">=7.2.1" -tox = ">=4.4.6" -flake8 = ">=6.0.0" +tox = ">=3.9.0" +flake8 = ">=4.0.0" [build-system] requires = ["setuptools"] diff --git a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml index 3ba7360599a..82e111dd60f 100644 --- a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml +++ b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml @@ -20,8 +20,8 @@ aenum = ">=3.1.11" [tool.poetry.dev-dependencies] pytest = ">=7.2.1" -tox = ">=4.4.6" -flake8 = ">=6.0.0" +tox = ">=3.9.0" +flake8 = ">=4.0.0" [build-system] requires = ["setuptools"] From 5e3bb7e33eda18dddbdaaedbacd69b8b2840ab79 Mon Sep 17 00:00:00 2001 From: Takeshi Masaki <83743223+tksmasaki@users.noreply.github.com> Date: Mon, 10 Apr 2023 11:44:28 +0900 Subject: [PATCH 118/131] [Ruby] fix RSpec documentation URL (#15164) --- .../resources/ruby-client/api_test.mustache | 2 +- .../resources/ruby-client/model_test.mustache | 4 +- .../spec/api/another_fake_api_spec.rb | 2 +- .../spec/api/default_api_spec.rb | 2 +- .../ruby-autoload/spec/api/fake_api_spec.rb | 64 +++++++++---------- .../api/fake_classname_tags123_api_spec.rb | 2 +- .../ruby-autoload/spec/api/pet_api_spec.rb | 32 +++++----- .../ruby-autoload/spec/api/store_api_spec.rb | 10 +-- .../ruby-autoload/spec/api/user_api_spec.rb | 26 ++++---- .../additional_properties_class_spec.rb | 4 +- .../models/all_of_with_single_ref_spec.rb | 4 +- .../ruby-autoload/spec/models/animal_spec.rb | 4 +- .../spec/models/api_response_spec.rb | 6 +- .../array_of_array_of_number_only_spec.rb | 2 +- .../spec/models/array_of_number_only_spec.rb | 2 +- .../spec/models/array_test_spec.rb | 6 +- .../spec/models/capitalization_spec.rb | 12 ++-- .../spec/models/cat_all_of_spec.rb | 2 +- .../ruby-autoload/spec/models/cat_spec.rb | 2 +- .../spec/models/category_spec.rb | 4 +- .../spec/models/class_model_spec.rb | 2 +- .../ruby-autoload/spec/models/client_spec.rb | 2 +- .../spec/models/deprecated_object_spec.rb | 2 +- .../spec/models/dog_all_of_spec.rb | 2 +- .../ruby-autoload/spec/models/dog_spec.rb | 2 +- .../spec/models/enum_arrays_spec.rb | 4 +- .../spec/models/enum_test_spec.rb | 16 ++--- .../models/file_schema_test_class_spec.rb | 4 +- .../ruby-autoload/spec/models/file_spec.rb | 2 +- .../models/foo_get_default_response_spec.rb | 2 +- .../ruby-autoload/spec/models/foo_spec.rb | 2 +- .../spec/models/format_test_spec.rb | 32 +++++----- .../spec/models/has_only_read_only_spec.rb | 4 +- .../spec/models/health_check_result_spec.rb | 2 +- .../ruby-autoload/spec/models/list_spec.rb | 2 +- .../spec/models/map_test_spec.rb | 8 +-- ...es_and_additional_properties_class_spec.rb | 6 +- .../spec/models/model200_response_spec.rb | 4 +- .../spec/models/model_return_spec.rb | 2 +- .../ruby-autoload/spec/models/name_spec.rb | 8 +-- .../spec/models/nullable_class_spec.rb | 24 +++---- .../spec/models/number_only_spec.rb | 2 +- .../object_with_deprecated_fields_spec.rb | 8 +-- .../ruby-autoload/spec/models/order_spec.rb | 12 ++-- .../spec/models/outer_composite_spec.rb | 6 +- .../outer_object_with_enum_property_spec.rb | 2 +- .../ruby-autoload/spec/models/pet_spec.rb | 12 ++-- .../spec/models/read_only_first_spec.rb | 4 +- .../spec/models/special_model_name_spec.rb | 2 +- .../ruby-autoload/spec/models/tag_spec.rb | 4 +- .../ruby-autoload/spec/models/user_spec.rb | 16 ++--- .../spec/api/another_fake_api_spec.rb | 2 +- .../ruby-faraday/spec/api/default_api_spec.rb | 2 +- .../ruby-faraday/spec/api/fake_api_spec.rb | 50 +++++++-------- .../api/fake_classname_tags123_api_spec.rb | 2 +- .../ruby-faraday/spec/api/pet_api_spec.rb | 20 +++--- .../ruby-faraday/spec/api/store_api_spec.rb | 8 +-- .../ruby-faraday/spec/api/user_api_spec.rb | 16 ++--- .../additional_properties_class_spec.rb | 4 +- .../models/all_of_with_single_ref_spec.rb | 4 +- .../ruby-faraday/spec/models/animal_spec.rb | 4 +- .../spec/models/api_response_spec.rb | 6 +- .../array_of_array_of_number_only_spec.rb | 2 +- .../spec/models/array_of_number_only_spec.rb | 2 +- .../spec/models/array_test_spec.rb | 6 +- .../spec/models/capitalization_spec.rb | 12 ++-- .../spec/models/cat_all_of_spec.rb | 2 +- .../ruby-faraday/spec/models/cat_spec.rb | 2 +- .../ruby-faraday/spec/models/category_spec.rb | 4 +- .../spec/models/class_model_spec.rb | 2 +- .../ruby-faraday/spec/models/client_spec.rb | 2 +- .../spec/models/deprecated_object_spec.rb | 2 +- .../spec/models/dog_all_of_spec.rb | 2 +- .../ruby-faraday/spec/models/dog_spec.rb | 2 +- .../spec/models/enum_arrays_spec.rb | 4 +- .../spec/models/enum_test_spec.rb | 16 ++--- .../models/file_schema_test_class_spec.rb | 4 +- .../ruby-faraday/spec/models/file_spec.rb | 2 +- .../models/foo_get_default_response_spec.rb | 2 +- .../ruby-faraday/spec/models/foo_spec.rb | 2 +- .../spec/models/format_test_spec.rb | 30 ++++----- .../spec/models/has_only_read_only_spec.rb | 4 +- .../spec/models/health_check_result_spec.rb | 2 +- .../ruby-faraday/spec/models/list_spec.rb | 2 +- .../ruby-faraday/spec/models/map_test_spec.rb | 8 +-- ...es_and_additional_properties_class_spec.rb | 6 +- .../spec/models/model200_response_spec.rb | 4 +- .../spec/models/model_return_spec.rb | 2 +- .../ruby-faraday/spec/models/name_spec.rb | 8 +-- .../spec/models/nullable_class_spec.rb | 24 +++---- .../spec/models/number_only_spec.rb | 2 +- .../object_with_deprecated_fields_spec.rb | 8 +-- .../ruby-faraday/spec/models/order_spec.rb | 12 ++-- .../spec/models/outer_composite_spec.rb | 6 +- .../outer_object_with_enum_property_spec.rb | 2 +- .../ruby-faraday/spec/models/pet_spec.rb | 12 ++-- .../spec/models/read_only_first_spec.rb | 4 +- .../spec/models/special_model_name_spec.rb | 2 +- .../ruby-faraday/spec/models/tag_spec.rb | 4 +- .../ruby-faraday/spec/models/user_spec.rb | 16 ++--- .../ruby/spec/api/another_fake_api_spec.rb | 2 +- .../ruby/spec/api/default_api_spec.rb | 2 +- .../petstore/ruby/spec/api/fake_api_spec.rb | 50 +++++++-------- .../api/fake_classname_tags123_api_spec.rb | 2 +- .../petstore/ruby/spec/api/pet_api_spec.rb | 20 +++--- .../petstore/ruby/spec/api/store_api_spec.rb | 8 +-- .../petstore/ruby/spec/api/user_api_spec.rb | 16 ++--- .../additional_properties_class_spec.rb | 4 +- .../models/all_of_with_single_ref_spec.rb | 4 +- .../petstore/ruby/spec/models/animal_spec.rb | 4 +- .../ruby/spec/models/api_response_spec.rb | 6 +- .../array_of_array_of_number_only_spec.rb | 2 +- .../spec/models/array_of_number_only_spec.rb | 2 +- .../ruby/spec/models/array_test_spec.rb | 6 +- .../ruby/spec/models/capitalization_spec.rb | 12 ++-- .../ruby/spec/models/cat_all_of_spec.rb | 2 +- .../petstore/ruby/spec/models/cat_spec.rb | 2 +- .../ruby/spec/models/category_spec.rb | 4 +- .../ruby/spec/models/class_model_spec.rb | 2 +- .../petstore/ruby/spec/models/client_spec.rb | 2 +- .../spec/models/deprecated_object_spec.rb | 2 +- .../ruby/spec/models/dog_all_of_spec.rb | 2 +- .../petstore/ruby/spec/models/dog_spec.rb | 2 +- .../ruby/spec/models/enum_arrays_spec.rb | 4 +- .../ruby/spec/models/enum_test_spec.rb | 16 ++--- .../models/file_schema_test_class_spec.rb | 4 +- .../petstore/ruby/spec/models/file_spec.rb | 2 +- .../models/foo_get_default_response_spec.rb | 2 +- .../petstore/ruby/spec/models/foo_spec.rb | 2 +- .../ruby/spec/models/format_test_spec.rb | 30 ++++----- .../spec/models/has_only_read_only_spec.rb | 4 +- .../spec/models/health_check_result_spec.rb | 2 +- .../petstore/ruby/spec/models/list_spec.rb | 2 +- .../ruby/spec/models/map_test_spec.rb | 8 +-- ...es_and_additional_properties_class_spec.rb | 6 +- .../spec/models/model200_response_spec.rb | 4 +- .../ruby/spec/models/model_return_spec.rb | 2 +- .../petstore/ruby/spec/models/name_spec.rb | 8 +-- .../ruby/spec/models/nullable_class_spec.rb | 24 +++---- .../ruby/spec/models/number_only_spec.rb | 2 +- .../object_with_deprecated_fields_spec.rb | 8 +-- .../petstore/ruby/spec/models/order_spec.rb | 12 ++-- .../ruby/spec/models/outer_composite_spec.rb | 6 +- .../outer_object_with_enum_property_spec.rb | 2 +- .../petstore/ruby/spec/models/pet_spec.rb | 12 ++-- .../ruby/spec/models/read_only_first_spec.rb | 4 +- .../spec/models/special_model_name_spec.rb | 2 +- .../petstore/ruby/spec/models/tag_spec.rb | 4 +- .../petstore/ruby/spec/models/user_spec.rb | 16 ++--- .../ruby-client/spec/api/usage_api_spec.rb | 8 +-- .../ruby/spec/api/usage_api_spec.rb | 4 +- .../ruby-client/spec/api/usage_api_spec.rb | 8 +-- 152 files changed, 552 insertions(+), 552 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api_test.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api_test.mustache index 2ab6515a9b9..7079f97e770 100644 --- a/modules/openapi-generator/src/main/resources/ruby-client/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-client/api_test.mustache @@ -38,7 +38,7 @@ require 'json' {{/required}}{{/allParams}} # @return [{{{returnType}}}{{^returnType}}nil{{/returnType}}] describe '{{operationId}} test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/modules/openapi-generator/src/main/resources/ruby-client/model_test.mustache b/modules/openapi-generator/src/main/resources/ruby-client/model_test.mustache index 86e5438d61a..99148c770a1 100644 --- a/modules/openapi-generator/src/main/resources/ruby-client/model_test.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-client/model_test.mustache @@ -24,14 +24,14 @@ describe {{moduleName}}::{{classname}} do describe 'test attribute "{{{name}}}"' do it 'should work' do {{#isEnum}} - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('{{{dataType}}}', [{{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]) # validator.allowable_values.each do |value| # expect { instance.{{name}} = value }.not_to raise_error # end {{/isEnum}} {{^isEnum}} - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ {{/isEnum}} end end diff --git a/samples/client/petstore/ruby-autoload/spec/api/another_fake_api_spec.rb b/samples/client/petstore/ruby-autoload/spec/api/another_fake_api_spec.rb index 523b4b9fc49..1343b2a9cc6 100644 --- a/samples/client/petstore/ruby-autoload/spec/api/another_fake_api_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api/another_fake_api_spec.rb @@ -40,7 +40,7 @@ describe 'AnotherFakeApi' do # @return [Client] describe 'call_123_test_special_tags test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/api/default_api_spec.rb b/samples/client/petstore/ruby-autoload/spec/api/default_api_spec.rb index 4c860076c0f..f453852b8c0 100644 --- a/samples/client/petstore/ruby-autoload/spec/api/default_api_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api/default_api_spec.rb @@ -37,7 +37,7 @@ describe 'DefaultApi' do # @return [FooGetDefaultResponse] describe 'foo_get test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/api/fake_api_spec.rb b/samples/client/petstore/ruby-autoload/spec/api/fake_api_spec.rb index dc56a801e61..45df141292b 100644 --- a/samples/client/petstore/ruby-autoload/spec/api/fake_api_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api/fake_api_spec.rb @@ -38,7 +38,7 @@ describe 'FakeApi' do # @return [HealthCheckResult] describe 'fake_health_get test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -51,7 +51,7 @@ describe 'FakeApi' do # @return [nil] describe 'fake_http_signature_test test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -62,7 +62,7 @@ describe 'FakeApi' do # @return [Boolean] describe 'fake_outer_boolean_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -73,7 +73,7 @@ describe 'FakeApi' do # @return [OuterComposite] describe 'fake_outer_composite_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -84,7 +84,7 @@ describe 'FakeApi' do # @return [Float] describe 'fake_outer_number_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -95,7 +95,7 @@ describe 'FakeApi' do # @return [String] describe 'fake_outer_string_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -106,7 +106,7 @@ describe 'FakeApi' do # @return [OuterObjectWithEnumProperty] describe 'fake_property_enum_integer_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -117,29 +117,29 @@ describe 'FakeApi' do # @return [nil] describe 'test_body_with_binary test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_body_with_file_schema # For this test, the body for this request must reference a schema named `File`. - # @param file_schema_test_class + # @param file_schema_test_class # @param [Hash] opts the optional parameters # @return [nil] describe 'test_body_with_file_schema test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_body_with_query_params - # @param query - # @param user + # @param query + # @param user # @param [Hash] opts the optional parameters # @return [nil] describe 'test_body_with_query_params test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -151,13 +151,13 @@ describe 'FakeApi' do # @return [Client] describe 'test_client_model test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_endpoint_parameters - # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # @param number None # @param double None # @param pattern_without_delimiter None @@ -176,7 +176,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_endpoint_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -190,13 +190,13 @@ describe 'FakeApi' do # @option opts [String] :enum_query_string Query parameter enum test (string) # @option opts [Integer] :enum_query_integer Query parameter enum test (double) # @option opts [Float] :enum_query_double Query parameter enum test (double) - # @option opts [Array] :enum_query_model_array + # @option opts [Array] :enum_query_model_array # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) # @option opts [String] :enum_form_string Form parameter enum test (string) # @return [nil] describe 'test_enum_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -213,49 +213,49 @@ describe 'FakeApi' do # @return [nil] describe 'test_group_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_inline_additional_properties # test inline additionalProperties - # + # # @param request_body request body # @param [Hash] opts the optional parameters # @return [nil] describe 'test_inline_additional_properties test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_json_form_data # test json serialization of form data - # + # # @param param field1 # @param param2 field2 # @param [Hash] opts the optional parameters # @return [nil] describe 'test_json_form_data test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_query_parameter_collection_format # To test the collection format in query parameters - # @param pipe - # @param ioutil - # @param http - # @param url - # @param context - # @param allow_empty + # @param pipe + # @param ioutil + # @param http + # @param url + # @param context + # @param allow_empty # @param [Hash] opts the optional parameters - # @option opts [Hash] :language + # @option opts [Hash] :language # @return [nil] describe 'test_query_parameter_collection_format test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/api/fake_classname_tags123_api_spec.rb b/samples/client/petstore/ruby-autoload/spec/api/fake_classname_tags123_api_spec.rb index 1f0665451e1..8daabe80f4e 100644 --- a/samples/client/petstore/ruby-autoload/spec/api/fake_classname_tags123_api_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api/fake_classname_tags123_api_spec.rb @@ -40,7 +40,7 @@ describe 'FakeClassnameTags123Api' do # @return [Client] describe 'test_classname test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/api/pet_api_spec.rb b/samples/client/petstore/ruby-autoload/spec/api/pet_api_spec.rb index b4747708710..ab4a3e7122f 100644 --- a/samples/client/petstore/ruby-autoload/spec/api/pet_api_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api/pet_api_spec.rb @@ -34,26 +34,26 @@ describe 'PetApi' do # unit tests for add_pet # Add a new pet to the store - # + # # @param pet Pet object that needs to be added to the store # @param [Hash] opts the optional parameters # @return [nil] describe 'add_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for delete_pet # Deletes a pet - # + # # @param pet_id Pet id to delete # @param [Hash] opts the optional parameters - # @option opts [String] :api_key + # @option opts [String] :api_key # @return [nil] describe 'delete_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -65,7 +65,7 @@ describe 'PetApi' do # @return [Array] describe 'find_pets_by_status test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -77,7 +77,7 @@ describe 'PetApi' do # @return [Array] describe 'find_pets_by_tags test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -89,25 +89,25 @@ describe 'PetApi' do # @return [Pet] describe 'get_pet_by_id test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for update_pet # Update an existing pet - # + # # @param pet Pet object that needs to be added to the store # @param [Hash] opts the optional parameters # @return [nil] describe 'update_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for update_pet_with_form # Updates a pet in the store with form data - # + # # @param pet_id ID of pet that needs to be updated # @param [Hash] opts the optional parameters # @option opts [String] :name Updated name of the pet @@ -115,13 +115,13 @@ describe 'PetApi' do # @return [nil] describe 'update_pet_with_form test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for upload_file # uploads an image - # + # # @param pet_id ID of pet to update # @param [Hash] opts the optional parameters # @option opts [String] :additional_metadata Additional data to pass to server @@ -129,13 +129,13 @@ describe 'PetApi' do # @return [ApiResponse] describe 'upload_file test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for upload_file_with_required_file # uploads an image (required) - # + # # @param pet_id ID of pet to update # @param required_file file to upload # @param [Hash] opts the optional parameters @@ -143,7 +143,7 @@ describe 'PetApi' do # @return [ApiResponse] describe 'upload_file_with_required_file test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/api/store_api_spec.rb b/samples/client/petstore/ruby-autoload/spec/api/store_api_spec.rb index bc9e4b294ce..5c06e5ca102 100644 --- a/samples/client/petstore/ruby-autoload/spec/api/store_api_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api/store_api_spec.rb @@ -40,7 +40,7 @@ describe 'StoreApi' do # @return [nil] describe 'delete_order test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -51,7 +51,7 @@ describe 'StoreApi' do # @return [Hash] describe 'get_inventory test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -63,19 +63,19 @@ describe 'StoreApi' do # @return [Order] describe 'get_order_by_id test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for place_order # Place an order for a pet - # + # # @param order order placed for purchasing the pet # @param [Hash] opts the optional parameters # @return [Order] describe 'place_order test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/api/user_api_spec.rb b/samples/client/petstore/ruby-autoload/spec/api/user_api_spec.rb index e3eae5db7d2..52d89014771 100644 --- a/samples/client/petstore/ruby-autoload/spec/api/user_api_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/api/user_api_spec.rb @@ -40,31 +40,31 @@ describe 'UserApi' do # @return [nil] describe 'create_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for create_users_with_array_input # Creates list of users with given input array - # + # # @param user List of user object # @param [Hash] opts the optional parameters # @return [nil] describe 'create_users_with_array_input test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for create_users_with_list_input # Creates list of users with given input array - # + # # @param user List of user object # @param [Hash] opts the optional parameters # @return [nil] describe 'create_users_with_list_input test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -76,43 +76,43 @@ describe 'UserApi' do # @return [nil] describe 'delete_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for get_user_by_name # Get user by user name - # + # # @param username The name that needs to be fetched. Use user1 for testing. # @param [Hash] opts the optional parameters # @return [User] describe 'get_user_by_name test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for login_user # Logs user into the system - # + # # @param username The user name for login # @param password The password for login in clear text # @param [Hash] opts the optional parameters # @return [String] describe 'login_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for logout_user # Logs out current logged in user session - # + # # @param [Hash] opts the optional parameters # @return [nil] describe 'logout_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -125,7 +125,7 @@ describe 'UserApi' do # @return [nil] describe 'update_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/additional_properties_class_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/additional_properties_class_spec.rb index 0daa2686986..d3438441833 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/additional_properties_class_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/additional_properties_class_spec.rb @@ -27,13 +27,13 @@ describe Petstore::AdditionalPropertiesClass do end describe 'test attribute "map_property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map_of_map_property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/all_of_with_single_ref_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/all_of_with_single_ref_spec.rb index 3b52a10b6a7..6d4e3c88bfa 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/all_of_with_single_ref_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/all_of_with_single_ref_spec.rb @@ -27,13 +27,13 @@ describe Petstore::AllOfWithSingleRef do end describe 'test attribute "username"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "single_ref_type"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/animal_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/animal_spec.rb index ef60372f48d..ae94f3ac820 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/animal_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/animal_spec.rb @@ -27,13 +27,13 @@ describe Petstore::Animal do end describe 'test attribute "class_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "color"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/api_response_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/api_response_spec.rb index 3b9a30ae8ab..bd991b2ae5f 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/api_response_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/api_response_spec.rb @@ -27,19 +27,19 @@ describe Petstore::ApiResponse do end describe 'test attribute "code"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "type"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "message"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/array_of_array_of_number_only_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/array_of_array_of_number_only_spec.rb index c99f7a21caf..ea3a61f3b81 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/array_of_array_of_number_only_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/array_of_array_of_number_only_spec.rb @@ -27,7 +27,7 @@ describe Petstore::ArrayOfArrayOfNumberOnly do end describe 'test attribute "array_array_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/array_of_number_only_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/array_of_number_only_spec.rb index cbc701d20dc..da9a4775f14 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/array_of_number_only_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/array_of_number_only_spec.rb @@ -27,7 +27,7 @@ describe Petstore::ArrayOfNumberOnly do end describe 'test attribute "array_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/array_test_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/array_test_spec.rb index adfd4d8fb42..9d443b1cade 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/array_test_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/array_test_spec.rb @@ -27,19 +27,19 @@ describe Petstore::ArrayTest do end describe 'test attribute "array_of_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_array_of_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_array_of_model"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/capitalization_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/capitalization_spec.rb index d3ff44c566e..0fd4c21411f 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/capitalization_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/capitalization_spec.rb @@ -27,37 +27,37 @@ describe Petstore::Capitalization do end describe 'test attribute "small_camel"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "capital_camel"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "small_snake"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "capital_snake"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "sca_eth_flow_points"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "att_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/cat_all_of_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/cat_all_of_spec.rb index a073f30b28d..bfc0b0284fc 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/cat_all_of_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/cat_all_of_spec.rb @@ -27,7 +27,7 @@ describe Petstore::CatAllOf do end describe 'test attribute "declawed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/cat_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/cat_spec.rb index 6a51da1376b..06dc81c184c 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/cat_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/cat_spec.rb @@ -27,7 +27,7 @@ describe Petstore::Cat do end describe 'test attribute "declawed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/category_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/category_spec.rb index 3016883fe28..d701e19b29e 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/category_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/category_spec.rb @@ -27,13 +27,13 @@ describe Petstore::Category do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/class_model_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/class_model_spec.rb index 1f8377d2845..415895ec06c 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/class_model_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/class_model_spec.rb @@ -27,7 +27,7 @@ describe Petstore::ClassModel do end describe 'test attribute "_class"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/client_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/client_spec.rb index f16856f2402..09abf9c08ba 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/client_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/client_spec.rb @@ -27,7 +27,7 @@ describe Petstore::Client do end describe 'test attribute "client"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/deprecated_object_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/deprecated_object_spec.rb index 27fba88874a..ba3b7d46fe8 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/deprecated_object_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/deprecated_object_spec.rb @@ -27,7 +27,7 @@ describe Petstore::DeprecatedObject do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/dog_all_of_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/dog_all_of_spec.rb index f4324654b53..f04c14afe5f 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/dog_all_of_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/dog_all_of_spec.rb @@ -27,7 +27,7 @@ describe Petstore::DogAllOf do end describe 'test attribute "breed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/dog_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/dog_spec.rb index 9c335f7cc29..782e471b0a3 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/dog_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/dog_spec.rb @@ -27,7 +27,7 @@ describe Petstore::Dog do end describe 'test attribute "breed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/enum_arrays_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/enum_arrays_spec.rb index 77dfa197024..badee6e1398 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/enum_arrays_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/enum_arrays_spec.rb @@ -27,7 +27,7 @@ describe Petstore::EnumArrays do end describe 'test attribute "just_symbol"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', [">=", "$"]) # validator.allowable_values.each do |value| # expect { instance.just_symbol = value }.not_to raise_error @@ -37,7 +37,7 @@ describe Petstore::EnumArrays do describe 'test attribute "array_enum"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Array', ["fish", "crab"]) # validator.allowable_values.each do |value| # expect { instance.array_enum = value }.not_to raise_error diff --git a/samples/client/petstore/ruby-autoload/spec/models/enum_test_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/enum_test_spec.rb index 67553e59b3e..4872de907ad 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/enum_test_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/enum_test_spec.rb @@ -27,7 +27,7 @@ describe Petstore::EnumTest do end describe 'test attribute "enum_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["UPPER", "lower", ""]) # validator.allowable_values.each do |value| # expect { instance.enum_string = value }.not_to raise_error @@ -37,7 +37,7 @@ describe Petstore::EnumTest do describe 'test attribute "enum_string_required"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["UPPER", "lower", ""]) # validator.allowable_values.each do |value| # expect { instance.enum_string_required = value }.not_to raise_error @@ -47,7 +47,7 @@ describe Petstore::EnumTest do describe 'test attribute "enum_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Integer', [1, -1]) # validator.allowable_values.each do |value| # expect { instance.enum_integer = value }.not_to raise_error @@ -57,7 +57,7 @@ describe Petstore::EnumTest do describe 'test attribute "enum_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Float', [1.1, -1.2]) # validator.allowable_values.each do |value| # expect { instance.enum_number = value }.not_to raise_error @@ -67,25 +67,25 @@ describe Petstore::EnumTest do describe 'test attribute "outer_enum"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_default_value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_integer_default_value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/file_schema_test_class_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/file_schema_test_class_spec.rb index c8a0f8800a9..38c34f9c50c 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/file_schema_test_class_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/file_schema_test_class_spec.rb @@ -27,13 +27,13 @@ describe Petstore::FileSchemaTestClass do end describe 'test attribute "file"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "files"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/file_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/file_spec.rb index 688c38eb449..7d857e0f835 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/file_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/file_spec.rb @@ -27,7 +27,7 @@ describe Petstore::File do end describe 'test attribute "source_uri"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/foo_get_default_response_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/foo_get_default_response_spec.rb index b5b0355778f..d6f85f77b51 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/foo_get_default_response_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/foo_get_default_response_spec.rb @@ -27,7 +27,7 @@ describe Petstore::FooGetDefaultResponse do end describe 'test attribute "string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/foo_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/foo_spec.rb index c2b4a79654c..a6021d760b4 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/foo_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/foo_spec.rb @@ -27,7 +27,7 @@ describe Petstore::Foo do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/format_test_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/format_test_spec.rb index cebdbafff35..f1c2847da93 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/format_test_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/format_test_spec.rb @@ -27,97 +27,97 @@ describe Petstore::FormatTest do end describe 'test attribute "integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "int32"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "int64"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "float"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "double"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "decimal"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "byte"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "binary"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_time"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "password"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pattern_with_digits"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pattern_with_digits_and_delimiter"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/has_only_read_only_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/has_only_read_only_spec.rb index eb5e2feb64d..0a0abcf5047 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/has_only_read_only_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/has_only_read_only_spec.rb @@ -27,13 +27,13 @@ describe Petstore::HasOnlyReadOnly do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "foo"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/health_check_result_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/health_check_result_spec.rb index 7b8436db22d..6145f63bef8 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/health_check_result_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/health_check_result_spec.rb @@ -27,7 +27,7 @@ describe Petstore::HealthCheckResult do end describe 'test attribute "nullable_message"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/list_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/list_spec.rb index 3571c832e2e..7c8d0e30b9f 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/list_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/list_spec.rb @@ -27,7 +27,7 @@ describe Petstore::List do end describe 'test attribute "_123_list"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/map_test_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/map_test_spec.rb index e4b2bcc242e..3fa64927bc8 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/map_test_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/map_test_spec.rb @@ -27,13 +27,13 @@ describe Petstore::MapTest do end describe 'test attribute "map_map_of_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map_of_enum_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Hash', ["UPPER", "lower"]) # validator.allowable_values.each do |value| # expect { instance.map_of_enum_string = value }.not_to raise_error @@ -43,13 +43,13 @@ describe Petstore::MapTest do describe 'test attribute "direct_map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "indirect_map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/mixed_properties_and_additional_properties_class_spec.rb index 2bf4ef5f9db..b9286126813 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/mixed_properties_and_additional_properties_class_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/mixed_properties_and_additional_properties_class_spec.rb @@ -27,19 +27,19 @@ describe Petstore::MixedPropertiesAndAdditionalPropertiesClass do end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_time"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/model200_response_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/model200_response_spec.rb index 7c9a78a286e..b8ca5a4d37a 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/model200_response_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/model200_response_spec.rb @@ -27,13 +27,13 @@ describe Petstore::Model200Response do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "_class"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/model_return_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/model_return_spec.rb index 7cd06ed6928..0c02c25d336 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/model_return_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/model_return_spec.rb @@ -27,7 +27,7 @@ describe Petstore::ModelReturn do end describe 'test attribute "_return"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/name_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/name_spec.rb index 946443e9792..d7c62387e6b 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/name_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/name_spec.rb @@ -27,25 +27,25 @@ describe Petstore::Name do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "snake_case"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "_123_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/nullable_class_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/nullable_class_spec.rb index 8c0d004a668..5fb93182e06 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/nullable_class_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/nullable_class_spec.rb @@ -27,73 +27,73 @@ describe Petstore::NullableClass do end describe 'test attribute "integer_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "number_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "boolean_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "string_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "datetime_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_and_items_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_items_nullable"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_and_items_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_items_nullable"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/number_only_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/number_only_spec.rb index f4354dd575e..7c98ce3f404 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/number_only_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/number_only_spec.rb @@ -27,7 +27,7 @@ describe Petstore::NumberOnly do end describe 'test attribute "just_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/object_with_deprecated_fields_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/object_with_deprecated_fields_spec.rb index ffd1a0ae4c3..ea6fa4915b5 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/object_with_deprecated_fields_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/object_with_deprecated_fields_spec.rb @@ -27,25 +27,25 @@ describe Petstore::ObjectWithDeprecatedFields do end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "deprecated_ref"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "bars"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/order_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/order_spec.rb index 99084704e42..6de4d11801d 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/order_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/order_spec.rb @@ -27,31 +27,31 @@ describe Petstore::Order do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pet_id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "quantity"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "ship_date"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["placed", "approved", "delivered"]) # validator.allowable_values.each do |value| # expect { instance.status = value }.not_to raise_error @@ -61,7 +61,7 @@ describe Petstore::Order do describe 'test attribute "complete"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/outer_composite_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/outer_composite_spec.rb index 766ca57e636..eda7fd2942f 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/outer_composite_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/outer_composite_spec.rb @@ -27,19 +27,19 @@ describe Petstore::OuterComposite do end describe 'test attribute "my_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "my_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "my_boolean"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/outer_object_with_enum_property_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/outer_object_with_enum_property_spec.rb index 0f88c5a547d..a2ee31a7fd7 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/outer_object_with_enum_property_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/outer_object_with_enum_property_spec.rb @@ -27,7 +27,7 @@ describe Petstore::OuterObjectWithEnumProperty do end describe 'test attribute "value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/pet_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/pet_spec.rb index fb948ec3ec0..930130c85c4 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/pet_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/pet_spec.rb @@ -27,37 +27,37 @@ describe Petstore::Pet do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "category"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "photo_urls"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "tags"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["available", "pending", "sold"]) # validator.allowable_values.each do |value| # expect { instance.status = value }.not_to raise_error diff --git a/samples/client/petstore/ruby-autoload/spec/models/read_only_first_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/read_only_first_spec.rb index 657a2b695aa..6f24ff8b8a3 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/read_only_first_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/read_only_first_spec.rb @@ -27,13 +27,13 @@ describe Petstore::ReadOnlyFirst do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "baz"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/special_model_name_spec.rb index 38542aef0e2..a3bedaa162d 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/special_model_name_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/special_model_name_spec.rb @@ -27,7 +27,7 @@ describe Petstore::SpecialModelName do end describe 'test attribute "special_property_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/tag_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/tag_spec.rb index c73c1fbab18..4da8e4d48f7 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/tag_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/tag_spec.rb @@ -27,13 +27,13 @@ describe Petstore::Tag do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-autoload/spec/models/user_spec.rb b/samples/client/petstore/ruby-autoload/spec/models/user_spec.rb index 8eb9cd582ae..ec6864f1c8c 100644 --- a/samples/client/petstore/ruby-autoload/spec/models/user_spec.rb +++ b/samples/client/petstore/ruby-autoload/spec/models/user_spec.rb @@ -27,49 +27,49 @@ describe Petstore::User do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "username"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "first_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "last_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "email"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "password"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "phone"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "user_status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb b/samples/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb index bf187f0971f..c4ae33b8e94 100644 --- a/samples/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb @@ -40,7 +40,7 @@ describe 'AnotherFakeApi' do # @return [Client] describe 'call_123_test_special_tags test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/api/default_api_spec.rb b/samples/client/petstore/ruby-faraday/spec/api/default_api_spec.rb index fd58eaa21a6..a4c4123b2f4 100644 --- a/samples/client/petstore/ruby-faraday/spec/api/default_api_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api/default_api_spec.rb @@ -37,7 +37,7 @@ describe 'DefaultApi' do # @return [InlineResponseDefault] describe 'foo_get test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb b/samples/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb index 7374568eaf0..659c054e04d 100644 --- a/samples/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb @@ -38,7 +38,7 @@ describe 'FakeApi' do # @return [HealthCheckResult] describe 'fake_health_get test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -51,7 +51,7 @@ describe 'FakeApi' do # @return [nil] describe 'fake_http_signature_test test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -62,7 +62,7 @@ describe 'FakeApi' do # @return [Boolean] describe 'fake_outer_boolean_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -73,7 +73,7 @@ describe 'FakeApi' do # @return [OuterComposite] describe 'fake_outer_composite_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -84,7 +84,7 @@ describe 'FakeApi' do # @return [Float] describe 'fake_outer_number_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -95,29 +95,29 @@ describe 'FakeApi' do # @return [String] describe 'fake_outer_string_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_body_with_file_schema # For this test, the body for this request much reference a schema named `File`. - # @param file_schema_test_class + # @param file_schema_test_class # @param [Hash] opts the optional parameters # @return [nil] describe 'test_body_with_file_schema test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_body_with_query_params - # @param query - # @param user + # @param query + # @param user # @param [Hash] opts the optional parameters # @return [nil] describe 'test_body_with_query_params test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -129,13 +129,13 @@ describe 'FakeApi' do # @return [Client] describe 'test_client_model test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_endpoint_parameters - # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # @param number None # @param double None # @param pattern_without_delimiter None @@ -154,7 +154,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_endpoint_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -173,7 +173,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_enum_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -190,7 +190,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_group_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -201,7 +201,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_inline_additional_properties test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -213,22 +213,22 @@ describe 'FakeApi' do # @return [nil] describe 'test_json_form_data test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_query_parameter_collection_format # To test the collection format in query parameters - # @param pipe - # @param ioutil - # @param http - # @param url - # @param context + # @param pipe + # @param ioutil + # @param http + # @param url + # @param context # @param [Hash] opts the optional parameters # @return [nil] describe 'test_query_parameter_collection_format test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb b/samples/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb index 1db2b3c9ef5..e102683e57e 100644 --- a/samples/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb @@ -40,7 +40,7 @@ describe 'FakeClassnameTags123Api' do # @return [Client] describe 'test_classname test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb b/samples/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb index 26ca32b2f75..f20fc2c623b 100644 --- a/samples/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb @@ -39,7 +39,7 @@ describe 'PetApi' do # @return [nil] describe 'add_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -47,11 +47,11 @@ describe 'PetApi' do # Deletes a pet # @param pet_id Pet id to delete # @param [Hash] opts the optional parameters - # @option opts [String] :api_key + # @option opts [String] :api_key # @return [nil] describe 'delete_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -63,7 +63,7 @@ describe 'PetApi' do # @return [Array] describe 'find_pets_by_status test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -75,7 +75,7 @@ describe 'PetApi' do # @return [Array] describe 'find_pets_by_tags test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -87,7 +87,7 @@ describe 'PetApi' do # @return [Pet] describe 'get_pet_by_id test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -98,7 +98,7 @@ describe 'PetApi' do # @return [nil] describe 'update_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -111,7 +111,7 @@ describe 'PetApi' do # @return [nil] describe 'update_pet_with_form test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -124,7 +124,7 @@ describe 'PetApi' do # @return [ApiResponse] describe 'upload_file test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -137,7 +137,7 @@ describe 'PetApi' do # @return [ApiResponse] describe 'upload_file_with_required_file test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/api/store_api_spec.rb b/samples/client/petstore/ruby-faraday/spec/api/store_api_spec.rb index 97c3d704de0..7ef3b058dd7 100644 --- a/samples/client/petstore/ruby-faraday/spec/api/store_api_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api/store_api_spec.rb @@ -40,7 +40,7 @@ describe 'StoreApi' do # @return [nil] describe 'delete_order test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -51,7 +51,7 @@ describe 'StoreApi' do # @return [Hash] describe 'get_inventory test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -63,7 +63,7 @@ describe 'StoreApi' do # @return [Order] describe 'get_order_by_id test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -74,7 +74,7 @@ describe 'StoreApi' do # @return [Order] describe 'place_order test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/api/user_api_spec.rb b/samples/client/petstore/ruby-faraday/spec/api/user_api_spec.rb index 39178c5a5ac..d534f519861 100644 --- a/samples/client/petstore/ruby-faraday/spec/api/user_api_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api/user_api_spec.rb @@ -40,7 +40,7 @@ describe 'UserApi' do # @return [nil] describe 'create_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -51,7 +51,7 @@ describe 'UserApi' do # @return [nil] describe 'create_users_with_array_input test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -62,7 +62,7 @@ describe 'UserApi' do # @return [nil] describe 'create_users_with_list_input test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -74,7 +74,7 @@ describe 'UserApi' do # @return [nil] describe 'delete_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -85,7 +85,7 @@ describe 'UserApi' do # @return [User] describe 'get_user_by_name test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -97,7 +97,7 @@ describe 'UserApi' do # @return [String] describe 'login_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -107,7 +107,7 @@ describe 'UserApi' do # @return [nil] describe 'logout_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -120,7 +120,7 @@ describe 'UserApi' do # @return [nil] describe 'update_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb index 93a5b0d5fb4..2cfb6c67149 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb @@ -34,13 +34,13 @@ describe 'AdditionalPropertiesClass' do end describe 'test attribute "map_property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map_of_map_property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/all_of_with_single_ref_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/all_of_with_single_ref_spec.rb index 61fe40343c7..532fe2f6a92 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/all_of_with_single_ref_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/all_of_with_single_ref_spec.rb @@ -27,13 +27,13 @@ describe Petstore::AllOfWithSingleRef do end describe 'test attribute "username"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "single_ref_type"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/animal_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/animal_spec.rb index 8b3e9adc537..2bb034b310f 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/animal_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/animal_spec.rb @@ -34,13 +34,13 @@ describe 'Animal' do end describe 'test attribute "class_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "color"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/api_response_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/api_response_spec.rb index 628f1c4d7c1..267301460d9 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/api_response_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/api_response_spec.rb @@ -34,19 +34,19 @@ describe 'ApiResponse' do end describe 'test attribute "code"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "type"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "message"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb index ea41c9a4b38..78f4a08761a 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb @@ -34,7 +34,7 @@ describe 'ArrayOfArrayOfNumberOnly' do end describe 'test attribute "array_array_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb index ba90932a797..3e2ea611eca 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb @@ -34,7 +34,7 @@ describe 'ArrayOfNumberOnly' do end describe 'test attribute "array_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/array_test_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/array_test_spec.rb index 6ff7397ad43..4633c0d8f3d 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/array_test_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/array_test_spec.rb @@ -34,19 +34,19 @@ describe 'ArrayTest' do end describe 'test attribute "array_of_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_array_of_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_array_of_model"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb index 451c59af970..025a0c5b09c 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb @@ -34,37 +34,37 @@ describe 'Capitalization' do end describe 'test attribute "small_camel"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "capital_camel"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "small_snake"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "capital_snake"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "sca_eth_flow_points"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "att_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb index 926ce8a2a37..9530b974cbd 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb @@ -34,7 +34,7 @@ describe 'CatAllOf' do end describe 'test attribute "declawed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/cat_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/cat_spec.rb index 3efb677ce64..3007a05924f 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/cat_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/cat_spec.rb @@ -34,7 +34,7 @@ describe 'Cat' do end describe 'test attribute "declawed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/category_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/category_spec.rb index 82ecd78d966..aa9fb18d97f 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/category_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/category_spec.rb @@ -34,13 +34,13 @@ describe 'Category' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/class_model_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/class_model_spec.rb index 761e8933127..e5cadd24dad 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/class_model_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/class_model_spec.rb @@ -34,7 +34,7 @@ describe 'ClassModel' do end describe 'test attribute "_class"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/client_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/client_spec.rb index 4bf1ce0622b..ef798f27dad 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/client_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/client_spec.rb @@ -34,7 +34,7 @@ describe 'Client' do end describe 'test attribute "client"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/deprecated_object_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/deprecated_object_spec.rb index 46f40e5c270..244cae37464 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/deprecated_object_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/deprecated_object_spec.rb @@ -27,7 +27,7 @@ describe Petstore::DeprecatedObject do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb index 5596927d423..fe263db11c0 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb @@ -34,7 +34,7 @@ describe 'DogAllOf' do end describe 'test attribute "breed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/dog_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/dog_spec.rb index b82df3e9d72..4263bda06f1 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/dog_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/dog_spec.rb @@ -34,7 +34,7 @@ describe 'Dog' do end describe 'test attribute "breed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb index ac75c92581d..a839505446d 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb @@ -34,7 +34,7 @@ describe 'EnumArrays' do end describe 'test attribute "just_symbol"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', [">=", "$"]) # validator.allowable_values.each do |value| # expect { @instance.just_symbol = value }.not_to raise_error @@ -44,7 +44,7 @@ describe 'EnumArrays' do describe 'test attribute "array_enum"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Array', ["fish", "crab"]) # validator.allowable_values.each do |value| # expect { @instance.array_enum = value }.not_to raise_error diff --git a/samples/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb index 7f4c9c97e87..0235c261aa4 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb @@ -34,7 +34,7 @@ describe 'EnumTest' do end describe 'test attribute "enum_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["UPPER", "lower", ""]) # validator.allowable_values.each do |value| # expect { @instance.enum_string = value }.not_to raise_error @@ -44,7 +44,7 @@ describe 'EnumTest' do describe 'test attribute "enum_string_required"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["UPPER", "lower", ""]) # validator.allowable_values.each do |value| # expect { @instance.enum_string_required = value }.not_to raise_error @@ -54,7 +54,7 @@ describe 'EnumTest' do describe 'test attribute "enum_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Integer', [1, -1]) # validator.allowable_values.each do |value| # expect { @instance.enum_integer = value }.not_to raise_error @@ -64,7 +64,7 @@ describe 'EnumTest' do describe 'test attribute "enum_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Float', [1.1, -1.2]) # validator.allowable_values.each do |value| # expect { @instance.enum_number = value }.not_to raise_error @@ -74,25 +74,25 @@ describe 'EnumTest' do describe 'test attribute "outer_enum"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_default_value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_integer_default_value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb index 8a8d92658c9..4c8d3f9d80a 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb @@ -34,13 +34,13 @@ describe 'FileSchemaTestClass' do end describe 'test attribute "file"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "files"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/file_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/file_spec.rb index b9d1499766e..0afb47c7a96 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/file_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/file_spec.rb @@ -34,7 +34,7 @@ describe 'File' do end describe 'test attribute "source_uri"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/foo_get_default_response_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/foo_get_default_response_spec.rb index 98a41243fe1..3ce38971bc3 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/foo_get_default_response_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/foo_get_default_response_spec.rb @@ -27,7 +27,7 @@ describe Petstore::FooGetDefaultResponse do end describe 'test attribute "string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/foo_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/foo_spec.rb index 46f8aa8a1d9..fc54b3ac92f 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/foo_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/foo_spec.rb @@ -34,7 +34,7 @@ describe 'Foo' do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/format_test_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/format_test_spec.rb index 72fe239f298..a2cda082f02 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/format_test_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/format_test_spec.rb @@ -34,91 +34,91 @@ describe 'FormatTest' do end describe 'test attribute "integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "int32"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "int64"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "float"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "double"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "byte"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "binary"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_time"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "password"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pattern_with_digits"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pattern_with_digits_and_delimiter"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb index 9efa03a22fe..5630b1cf97d 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb @@ -34,13 +34,13 @@ describe 'HasOnlyReadOnly' do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "foo"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb index e90a77ec8a7..797ee9704d3 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb @@ -34,7 +34,7 @@ describe 'HealthCheckResult' do end describe 'test attribute "nullable_message"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/list_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/list_spec.rb index db397aa108f..88716e86942 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/list_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/list_spec.rb @@ -34,7 +34,7 @@ describe 'List' do end describe 'test attribute "_123_list"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/map_test_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/map_test_spec.rb index f7ff6788b09..012b9cc251f 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/map_test_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/map_test_spec.rb @@ -34,13 +34,13 @@ describe 'MapTest' do end describe 'test attribute "map_map_of_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map_of_enum_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Hash', ["UPPER", "lower"]) # validator.allowable_values.each do |value| # expect { @instance.map_of_enum_string = value }.not_to raise_error @@ -50,13 +50,13 @@ describe 'MapTest' do describe 'test attribute "direct_map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "indirect_map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb index 0e88f472524..f58460e50e0 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb @@ -34,19 +34,19 @@ describe 'MixedPropertiesAndAdditionalPropertiesClass' do end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_time"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb index 133f6b94c14..245390ee6c0 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb @@ -34,13 +34,13 @@ describe 'Model200Response' do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "_class"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/model_return_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/model_return_spec.rb index 57d400eb116..5881f54839a 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/model_return_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/model_return_spec.rb @@ -34,7 +34,7 @@ describe 'ModelReturn' do end describe 'test attribute "_return"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/name_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/name_spec.rb index c882db4f221..1edec1a9463 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/name_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/name_spec.rb @@ -34,25 +34,25 @@ describe 'Name' do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "snake_case"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "_123_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb index f1301d0a83d..5507799a0aa 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb @@ -34,73 +34,73 @@ describe 'NullableClass' do end describe 'test attribute "integer_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "number_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "boolean_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "string_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "datetime_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_and_items_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_items_nullable"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_and_items_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_items_nullable"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/number_only_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/number_only_spec.rb index 0963591fcc1..2ecc4260dda 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/number_only_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/number_only_spec.rb @@ -34,7 +34,7 @@ describe 'NumberOnly' do end describe 'test attribute "just_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/object_with_deprecated_fields_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/object_with_deprecated_fields_spec.rb index 5647b98bdc2..d6372aa68b5 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/object_with_deprecated_fields_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/object_with_deprecated_fields_spec.rb @@ -27,25 +27,25 @@ describe Petstore::ObjectWithDeprecatedFields do end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "deprecated_ref"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "bars"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/order_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/order_spec.rb index 3f1d973b275..e7a9dea74da 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/order_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/order_spec.rb @@ -34,31 +34,31 @@ describe 'Order' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pet_id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "quantity"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "ship_date"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["placed", "approved", "delivered"]) # validator.allowable_values.each do |value| # expect { @instance.status = value }.not_to raise_error @@ -68,7 +68,7 @@ describe 'Order' do describe 'test attribute "complete"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb index bb36f488959..ad4053e2c4a 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb @@ -34,19 +34,19 @@ describe 'OuterComposite' do end describe 'test attribute "my_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "my_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "my_boolean"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/outer_object_with_enum_property_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/outer_object_with_enum_property_spec.rb index 561ef7172b8..1a590a78b29 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/outer_object_with_enum_property_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/outer_object_with_enum_property_spec.rb @@ -27,7 +27,7 @@ describe Petstore::OuterObjectWithEnumProperty do end describe 'test attribute "value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/pet_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/pet_spec.rb index dc0a0898c9f..f8a46865240 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/pet_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/pet_spec.rb @@ -34,37 +34,37 @@ describe 'Pet' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "category"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "photo_urls"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "tags"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["available", "pending", "sold"]) # validator.allowable_values.each do |value| # expect { @instance.status = value }.not_to raise_error diff --git a/samples/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb index 8d60e443313..036dd5581ee 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb @@ -34,13 +34,13 @@ describe 'ReadOnlyFirst' do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "baz"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb index b548f7f0951..78555f967cc 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb @@ -34,7 +34,7 @@ describe 'SpecialModelName' do end describe 'test attribute "special_property_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/tag_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/tag_spec.rb index 3a745439040..e791cb35e14 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/tag_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/tag_spec.rb @@ -34,13 +34,13 @@ describe 'Tag' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby-faraday/spec/models/user_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/user_spec.rb index 2eb31e993a0..9d162c5d999 100644 --- a/samples/client/petstore/ruby-faraday/spec/models/user_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/models/user_spec.rb @@ -34,49 +34,49 @@ describe 'User' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "username"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "first_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "last_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "email"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "password"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "phone"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "user_status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb b/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb index bf187f0971f..c4ae33b8e94 100644 --- a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb @@ -40,7 +40,7 @@ describe 'AnotherFakeApi' do # @return [Client] describe 'call_123_test_special_tags test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/api/default_api_spec.rb b/samples/client/petstore/ruby/spec/api/default_api_spec.rb index fd58eaa21a6..a4c4123b2f4 100644 --- a/samples/client/petstore/ruby/spec/api/default_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/default_api_spec.rb @@ -37,7 +37,7 @@ describe 'DefaultApi' do # @return [InlineResponseDefault] describe 'foo_get test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb index 7374568eaf0..659c054e04d 100644 --- a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb @@ -38,7 +38,7 @@ describe 'FakeApi' do # @return [HealthCheckResult] describe 'fake_health_get test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -51,7 +51,7 @@ describe 'FakeApi' do # @return [nil] describe 'fake_http_signature_test test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -62,7 +62,7 @@ describe 'FakeApi' do # @return [Boolean] describe 'fake_outer_boolean_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -73,7 +73,7 @@ describe 'FakeApi' do # @return [OuterComposite] describe 'fake_outer_composite_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -84,7 +84,7 @@ describe 'FakeApi' do # @return [Float] describe 'fake_outer_number_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -95,29 +95,29 @@ describe 'FakeApi' do # @return [String] describe 'fake_outer_string_serialize test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_body_with_file_schema # For this test, the body for this request much reference a schema named `File`. - # @param file_schema_test_class + # @param file_schema_test_class # @param [Hash] opts the optional parameters # @return [nil] describe 'test_body_with_file_schema test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_body_with_query_params - # @param query - # @param user + # @param query + # @param user # @param [Hash] opts the optional parameters # @return [nil] describe 'test_body_with_query_params test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -129,13 +129,13 @@ describe 'FakeApi' do # @return [Client] describe 'test_client_model test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_endpoint_parameters - # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 + # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # @param number None # @param double None # @param pattern_without_delimiter None @@ -154,7 +154,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_endpoint_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -173,7 +173,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_enum_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -190,7 +190,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_group_parameters test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -201,7 +201,7 @@ describe 'FakeApi' do # @return [nil] describe 'test_inline_additional_properties test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -213,22 +213,22 @@ describe 'FakeApi' do # @return [nil] describe 'test_json_form_data test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end # unit tests for test_query_parameter_collection_format # To test the collection format in query parameters - # @param pipe - # @param ioutil - # @param http - # @param url - # @param context + # @param pipe + # @param ioutil + # @param http + # @param url + # @param context # @param [Hash] opts the optional parameters # @return [nil] describe 'test_query_parameter_collection_format test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb b/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb index 1db2b3c9ef5..e102683e57e 100644 --- a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb @@ -40,7 +40,7 @@ describe 'FakeClassnameTags123Api' do # @return [Client] describe 'test_classname test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb index 26ca32b2f75..f20fc2c623b 100644 --- a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb @@ -39,7 +39,7 @@ describe 'PetApi' do # @return [nil] describe 'add_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -47,11 +47,11 @@ describe 'PetApi' do # Deletes a pet # @param pet_id Pet id to delete # @param [Hash] opts the optional parameters - # @option opts [String] :api_key + # @option opts [String] :api_key # @return [nil] describe 'delete_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -63,7 +63,7 @@ describe 'PetApi' do # @return [Array] describe 'find_pets_by_status test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -75,7 +75,7 @@ describe 'PetApi' do # @return [Array] describe 'find_pets_by_tags test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -87,7 +87,7 @@ describe 'PetApi' do # @return [Pet] describe 'get_pet_by_id test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -98,7 +98,7 @@ describe 'PetApi' do # @return [nil] describe 'update_pet test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -111,7 +111,7 @@ describe 'PetApi' do # @return [nil] describe 'update_pet_with_form test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -124,7 +124,7 @@ describe 'PetApi' do # @return [ApiResponse] describe 'upload_file test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -137,7 +137,7 @@ describe 'PetApi' do # @return [ApiResponse] describe 'upload_file_with_required_file test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/client/petstore/ruby/spec/api/store_api_spec.rb index 97c3d704de0..7ef3b058dd7 100644 --- a/samples/client/petstore/ruby/spec/api/store_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/store_api_spec.rb @@ -40,7 +40,7 @@ describe 'StoreApi' do # @return [nil] describe 'delete_order test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -51,7 +51,7 @@ describe 'StoreApi' do # @return [Hash] describe 'get_inventory test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -63,7 +63,7 @@ describe 'StoreApi' do # @return [Order] describe 'get_order_by_id test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -74,7 +74,7 @@ describe 'StoreApi' do # @return [Order] describe 'place_order test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/client/petstore/ruby/spec/api/user_api_spec.rb index 39178c5a5ac..d534f519861 100644 --- a/samples/client/petstore/ruby/spec/api/user_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/user_api_spec.rb @@ -40,7 +40,7 @@ describe 'UserApi' do # @return [nil] describe 'create_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -51,7 +51,7 @@ describe 'UserApi' do # @return [nil] describe 'create_users_with_array_input test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -62,7 +62,7 @@ describe 'UserApi' do # @return [nil] describe 'create_users_with_list_input test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -74,7 +74,7 @@ describe 'UserApi' do # @return [nil] describe 'delete_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -85,7 +85,7 @@ describe 'UserApi' do # @return [User] describe 'get_user_by_name test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -97,7 +97,7 @@ describe 'UserApi' do # @return [String] describe 'login_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -107,7 +107,7 @@ describe 'UserApi' do # @return [nil] describe 'logout_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -120,7 +120,7 @@ describe 'UserApi' do # @return [nil] describe 'update_user test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb index 93a5b0d5fb4..2cfb6c67149 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb @@ -34,13 +34,13 @@ describe 'AdditionalPropertiesClass' do end describe 'test attribute "map_property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map_of_map_property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/all_of_with_single_ref_spec.rb b/samples/client/petstore/ruby/spec/models/all_of_with_single_ref_spec.rb index 61fe40343c7..532fe2f6a92 100644 --- a/samples/client/petstore/ruby/spec/models/all_of_with_single_ref_spec.rb +++ b/samples/client/petstore/ruby/spec/models/all_of_with_single_ref_spec.rb @@ -27,13 +27,13 @@ describe Petstore::AllOfWithSingleRef do end describe 'test attribute "username"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "single_ref_type"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/animal_spec.rb b/samples/client/petstore/ruby/spec/models/animal_spec.rb index 8b3e9adc537..2bb034b310f 100644 --- a/samples/client/petstore/ruby/spec/models/animal_spec.rb +++ b/samples/client/petstore/ruby/spec/models/animal_spec.rb @@ -34,13 +34,13 @@ describe 'Animal' do end describe 'test attribute "class_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "color"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/client/petstore/ruby/spec/models/api_response_spec.rb index 628f1c4d7c1..267301460d9 100644 --- a/samples/client/petstore/ruby/spec/models/api_response_spec.rb +++ b/samples/client/petstore/ruby/spec/models/api_response_spec.rb @@ -34,19 +34,19 @@ describe 'ApiResponse' do end describe 'test attribute "code"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "type"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "message"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb b/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb index ea41c9a4b38..78f4a08761a 100644 --- a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb +++ b/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb @@ -34,7 +34,7 @@ describe 'ArrayOfArrayOfNumberOnly' do end describe 'test attribute "array_array_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb b/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb index ba90932a797..3e2ea611eca 100644 --- a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb +++ b/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb @@ -34,7 +34,7 @@ describe 'ArrayOfNumberOnly' do end describe 'test attribute "array_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/array_test_spec.rb b/samples/client/petstore/ruby/spec/models/array_test_spec.rb index 6ff7397ad43..4633c0d8f3d 100644 --- a/samples/client/petstore/ruby/spec/models/array_test_spec.rb +++ b/samples/client/petstore/ruby/spec/models/array_test_spec.rb @@ -34,19 +34,19 @@ describe 'ArrayTest' do end describe 'test attribute "array_of_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_array_of_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_array_of_model"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb index 451c59af970..025a0c5b09c 100644 --- a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb +++ b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb @@ -34,37 +34,37 @@ describe 'Capitalization' do end describe 'test attribute "small_camel"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "capital_camel"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "small_snake"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "capital_snake"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "sca_eth_flow_points"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "att_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb index 926ce8a2a37..9530b974cbd 100644 --- a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb +++ b/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb @@ -34,7 +34,7 @@ describe 'CatAllOf' do end describe 'test attribute "declawed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/cat_spec.rb b/samples/client/petstore/ruby/spec/models/cat_spec.rb index 3efb677ce64..3007a05924f 100644 --- a/samples/client/petstore/ruby/spec/models/cat_spec.rb +++ b/samples/client/petstore/ruby/spec/models/cat_spec.rb @@ -34,7 +34,7 @@ describe 'Cat' do end describe 'test attribute "declawed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/category_spec.rb b/samples/client/petstore/ruby/spec/models/category_spec.rb index 82ecd78d966..aa9fb18d97f 100644 --- a/samples/client/petstore/ruby/spec/models/category_spec.rb +++ b/samples/client/petstore/ruby/spec/models/category_spec.rb @@ -34,13 +34,13 @@ describe 'Category' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/class_model_spec.rb b/samples/client/petstore/ruby/spec/models/class_model_spec.rb index 761e8933127..e5cadd24dad 100644 --- a/samples/client/petstore/ruby/spec/models/class_model_spec.rb +++ b/samples/client/petstore/ruby/spec/models/class_model_spec.rb @@ -34,7 +34,7 @@ describe 'ClassModel' do end describe 'test attribute "_class"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/client_spec.rb b/samples/client/petstore/ruby/spec/models/client_spec.rb index 4bf1ce0622b..ef798f27dad 100644 --- a/samples/client/petstore/ruby/spec/models/client_spec.rb +++ b/samples/client/petstore/ruby/spec/models/client_spec.rb @@ -34,7 +34,7 @@ describe 'Client' do end describe 'test attribute "client"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/deprecated_object_spec.rb b/samples/client/petstore/ruby/spec/models/deprecated_object_spec.rb index 46f40e5c270..244cae37464 100644 --- a/samples/client/petstore/ruby/spec/models/deprecated_object_spec.rb +++ b/samples/client/petstore/ruby/spec/models/deprecated_object_spec.rb @@ -27,7 +27,7 @@ describe Petstore::DeprecatedObject do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb index 5596927d423..fe263db11c0 100644 --- a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb +++ b/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb @@ -34,7 +34,7 @@ describe 'DogAllOf' do end describe 'test attribute "breed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/dog_spec.rb b/samples/client/petstore/ruby/spec/models/dog_spec.rb index b82df3e9d72..4263bda06f1 100644 --- a/samples/client/petstore/ruby/spec/models/dog_spec.rb +++ b/samples/client/petstore/ruby/spec/models/dog_spec.rb @@ -34,7 +34,7 @@ describe 'Dog' do end describe 'test attribute "breed"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb index ac75c92581d..a839505446d 100644 --- a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb +++ b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb @@ -34,7 +34,7 @@ describe 'EnumArrays' do end describe 'test attribute "just_symbol"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', [">=", "$"]) # validator.allowable_values.each do |value| # expect { @instance.just_symbol = value }.not_to raise_error @@ -44,7 +44,7 @@ describe 'EnumArrays' do describe 'test attribute "array_enum"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Array', ["fish", "crab"]) # validator.allowable_values.each do |value| # expect { @instance.array_enum = value }.not_to raise_error diff --git a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb index 7f4c9c97e87..0235c261aa4 100644 --- a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb +++ b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb @@ -34,7 +34,7 @@ describe 'EnumTest' do end describe 'test attribute "enum_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["UPPER", "lower", ""]) # validator.allowable_values.each do |value| # expect { @instance.enum_string = value }.not_to raise_error @@ -44,7 +44,7 @@ describe 'EnumTest' do describe 'test attribute "enum_string_required"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["UPPER", "lower", ""]) # validator.allowable_values.each do |value| # expect { @instance.enum_string_required = value }.not_to raise_error @@ -54,7 +54,7 @@ describe 'EnumTest' do describe 'test attribute "enum_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Integer', [1, -1]) # validator.allowable_values.each do |value| # expect { @instance.enum_integer = value }.not_to raise_error @@ -64,7 +64,7 @@ describe 'EnumTest' do describe 'test attribute "enum_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Float', [1.1, -1.2]) # validator.allowable_values.each do |value| # expect { @instance.enum_number = value }.not_to raise_error @@ -74,25 +74,25 @@ describe 'EnumTest' do describe 'test attribute "outer_enum"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_default_value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "outer_enum_integer_default_value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb b/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb index 8a8d92658c9..4c8d3f9d80a 100644 --- a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb +++ b/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb @@ -34,13 +34,13 @@ describe 'FileSchemaTestClass' do end describe 'test attribute "file"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "files"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/file_spec.rb b/samples/client/petstore/ruby/spec/models/file_spec.rb index b9d1499766e..0afb47c7a96 100644 --- a/samples/client/petstore/ruby/spec/models/file_spec.rb +++ b/samples/client/petstore/ruby/spec/models/file_spec.rb @@ -34,7 +34,7 @@ describe 'File' do end describe 'test attribute "source_uri"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/foo_get_default_response_spec.rb b/samples/client/petstore/ruby/spec/models/foo_get_default_response_spec.rb index 98a41243fe1..3ce38971bc3 100644 --- a/samples/client/petstore/ruby/spec/models/foo_get_default_response_spec.rb +++ b/samples/client/petstore/ruby/spec/models/foo_get_default_response_spec.rb @@ -27,7 +27,7 @@ describe Petstore::FooGetDefaultResponse do end describe 'test attribute "string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/foo_spec.rb b/samples/client/petstore/ruby/spec/models/foo_spec.rb index 46f8aa8a1d9..fc54b3ac92f 100644 --- a/samples/client/petstore/ruby/spec/models/foo_spec.rb +++ b/samples/client/petstore/ruby/spec/models/foo_spec.rb @@ -34,7 +34,7 @@ describe 'Foo' do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/client/petstore/ruby/spec/models/format_test_spec.rb index 72fe239f298..a2cda082f02 100644 --- a/samples/client/petstore/ruby/spec/models/format_test_spec.rb +++ b/samples/client/petstore/ruby/spec/models/format_test_spec.rb @@ -34,91 +34,91 @@ describe 'FormatTest' do end describe 'test attribute "integer"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "int32"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "int64"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "float"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "double"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "byte"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "binary"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_time"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "password"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pattern_with_digits"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pattern_with_digits_and_delimiter"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb b/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb index 9efa03a22fe..5630b1cf97d 100644 --- a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb +++ b/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb @@ -34,13 +34,13 @@ describe 'HasOnlyReadOnly' do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "foo"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/health_check_result_spec.rb b/samples/client/petstore/ruby/spec/models/health_check_result_spec.rb index e90a77ec8a7..797ee9704d3 100644 --- a/samples/client/petstore/ruby/spec/models/health_check_result_spec.rb +++ b/samples/client/petstore/ruby/spec/models/health_check_result_spec.rb @@ -34,7 +34,7 @@ describe 'HealthCheckResult' do end describe 'test attribute "nullable_message"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/list_spec.rb b/samples/client/petstore/ruby/spec/models/list_spec.rb index db397aa108f..88716e86942 100644 --- a/samples/client/petstore/ruby/spec/models/list_spec.rb +++ b/samples/client/petstore/ruby/spec/models/list_spec.rb @@ -34,7 +34,7 @@ describe 'List' do end describe 'test attribute "_123_list"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/map_test_spec.rb b/samples/client/petstore/ruby/spec/models/map_test_spec.rb index f7ff6788b09..012b9cc251f 100644 --- a/samples/client/petstore/ruby/spec/models/map_test_spec.rb +++ b/samples/client/petstore/ruby/spec/models/map_test_spec.rb @@ -34,13 +34,13 @@ describe 'MapTest' do end describe 'test attribute "map_map_of_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map_of_enum_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('Hash', ["UPPER", "lower"]) # validator.allowable_values.each do |value| # expect { @instance.map_of_enum_string = value }.not_to raise_error @@ -50,13 +50,13 @@ describe 'MapTest' do describe 'test attribute "direct_map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "indirect_map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb index 0e88f472524..f58460e50e0 100644 --- a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb +++ b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb @@ -34,19 +34,19 @@ describe 'MixedPropertiesAndAdditionalPropertiesClass' do end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_time"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "map"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb index 133f6b94c14..245390ee6c0 100644 --- a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb +++ b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb @@ -34,13 +34,13 @@ describe 'Model200Response' do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "_class"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/client/petstore/ruby/spec/models/model_return_spec.rb index 57d400eb116..5881f54839a 100644 --- a/samples/client/petstore/ruby/spec/models/model_return_spec.rb +++ b/samples/client/petstore/ruby/spec/models/model_return_spec.rb @@ -34,7 +34,7 @@ describe 'ModelReturn' do end describe 'test attribute "_return"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/name_spec.rb b/samples/client/petstore/ruby/spec/models/name_spec.rb index c882db4f221..1edec1a9463 100644 --- a/samples/client/petstore/ruby/spec/models/name_spec.rb +++ b/samples/client/petstore/ruby/spec/models/name_spec.rb @@ -34,25 +34,25 @@ describe 'Name' do end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "snake_case"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "property"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "_123_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/nullable_class_spec.rb b/samples/client/petstore/ruby/spec/models/nullable_class_spec.rb index f1301d0a83d..5507799a0aa 100644 --- a/samples/client/petstore/ruby/spec/models/nullable_class_spec.rb +++ b/samples/client/petstore/ruby/spec/models/nullable_class_spec.rb @@ -34,73 +34,73 @@ describe 'NullableClass' do end describe 'test attribute "integer_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "number_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "boolean_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "string_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "date_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "datetime_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_and_items_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "array_items_nullable"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_and_items_nullable_prop"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "object_items_nullable"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/number_only_spec.rb b/samples/client/petstore/ruby/spec/models/number_only_spec.rb index 0963591fcc1..2ecc4260dda 100644 --- a/samples/client/petstore/ruby/spec/models/number_only_spec.rb +++ b/samples/client/petstore/ruby/spec/models/number_only_spec.rb @@ -34,7 +34,7 @@ describe 'NumberOnly' do end describe 'test attribute "just_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/object_with_deprecated_fields_spec.rb b/samples/client/petstore/ruby/spec/models/object_with_deprecated_fields_spec.rb index 5647b98bdc2..d6372aa68b5 100644 --- a/samples/client/petstore/ruby/spec/models/object_with_deprecated_fields_spec.rb +++ b/samples/client/petstore/ruby/spec/models/object_with_deprecated_fields_spec.rb @@ -27,25 +27,25 @@ describe Petstore::ObjectWithDeprecatedFields do end describe 'test attribute "uuid"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "deprecated_ref"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "bars"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/order_spec.rb b/samples/client/petstore/ruby/spec/models/order_spec.rb index 3f1d973b275..e7a9dea74da 100644 --- a/samples/client/petstore/ruby/spec/models/order_spec.rb +++ b/samples/client/petstore/ruby/spec/models/order_spec.rb @@ -34,31 +34,31 @@ describe 'Order' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "pet_id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "quantity"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "ship_date"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["placed", "approved", "delivered"]) # validator.allowable_values.each do |value| # expect { @instance.status = value }.not_to raise_error @@ -68,7 +68,7 @@ describe 'Order' do describe 'test attribute "complete"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb index bb36f488959..ad4053e2c4a 100644 --- a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb +++ b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb @@ -34,19 +34,19 @@ describe 'OuterComposite' do end describe 'test attribute "my_number"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "my_string"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "my_boolean"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/outer_object_with_enum_property_spec.rb b/samples/client/petstore/ruby/spec/models/outer_object_with_enum_property_spec.rb index 561ef7172b8..1a590a78b29 100644 --- a/samples/client/petstore/ruby/spec/models/outer_object_with_enum_property_spec.rb +++ b/samples/client/petstore/ruby/spec/models/outer_object_with_enum_property_spec.rb @@ -27,7 +27,7 @@ describe Petstore::OuterObjectWithEnumProperty do end describe 'test attribute "value"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/pet_spec.rb b/samples/client/petstore/ruby/spec/models/pet_spec.rb index dc0a0898c9f..f8a46865240 100644 --- a/samples/client/petstore/ruby/spec/models/pet_spec.rb +++ b/samples/client/petstore/ruby/spec/models/pet_spec.rb @@ -34,37 +34,37 @@ describe 'Pet' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "category"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "photo_urls"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "tags"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ # validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["available", "pending", "sold"]) # validator.allowable_values.each do |value| # expect { @instance.status = value }.not_to raise_error diff --git a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb index 8d60e443313..036dd5581ee 100644 --- a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb +++ b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb @@ -34,13 +34,13 @@ describe 'ReadOnlyFirst' do end describe 'test attribute "bar"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "baz"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb index b548f7f0951..78555f967cc 100644 --- a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb +++ b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb @@ -34,7 +34,7 @@ describe 'SpecialModelName' do end describe 'test attribute "special_property_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/tag_spec.rb b/samples/client/petstore/ruby/spec/models/tag_spec.rb index 3a745439040..e791cb35e14 100644 --- a/samples/client/petstore/ruby/spec/models/tag_spec.rb +++ b/samples/client/petstore/ruby/spec/models/tag_spec.rb @@ -34,13 +34,13 @@ describe 'Tag' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/client/petstore/ruby/spec/models/user_spec.rb b/samples/client/petstore/ruby/spec/models/user_spec.rb index 2eb31e993a0..9d162c5d999 100644 --- a/samples/client/petstore/ruby/spec/models/user_spec.rb +++ b/samples/client/petstore/ruby/spec/models/user_spec.rb @@ -34,49 +34,49 @@ describe 'User' do end describe 'test attribute "id"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "username"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "first_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "last_name"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "email"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "password"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "phone"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end describe 'test attribute "user_status"' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api/usage_api_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api/usage_api_spec.rb index 03e3ed32596..ab8053f3662 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api/usage_api_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api/usage_api_spec.rb @@ -39,7 +39,7 @@ describe 'UsageApi' do # @return [Object] describe 'any_key test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -50,7 +50,7 @@ describe 'UsageApi' do # @return [Object] describe 'both_keys test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -61,7 +61,7 @@ describe 'UsageApi' do # @return [Object] describe 'key_in_header test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -72,7 +72,7 @@ describe 'UsageApi' do # @return [Object] describe 'key_in_query test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api/usage_api_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api/usage_api_spec.rb index 4a88b4e41c0..efb2b641fe6 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api/usage_api_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api/usage_api_spec.rb @@ -39,7 +39,7 @@ describe 'UsageApi' do # @return [Object] describe 'custom_server test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -50,7 +50,7 @@ describe 'UsageApi' do # @return [Object] describe 'default_server test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api/usage_api_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api/usage_api_spec.rb index 66607732925..1c84555f390 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api/usage_api_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api/usage_api_spec.rb @@ -36,11 +36,11 @@ describe 'UsageApi' do # Use alias to array # Use alias to array # @param [Hash] opts the optional parameters - # @option opts [ArrayAlias] :array_alias + # @option opts [ArrayAlias] :array_alias # @return [Object] describe 'array test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end @@ -48,11 +48,11 @@ describe 'UsageApi' do # Use alias to map # Use alias to map # @param [Hash] opts the optional parameters - # @option opts [MapAlias] :map_alias + # @option opts [MapAlias] :map_alias # @return [Object] describe 'map test' do it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/ end end From 1e2f16ed69f862a09e21a566ce2d114452e4c6e9 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sun, 9 Apr 2023 23:20:48 -0400 Subject: [PATCH 119/131] [csharp-netcore] Explicitly implement IValidatableObject (#15160) * explicit interface implementation * minor spacing change --- .../libraries/generichost/modelGeneric.mustache | 1 + .../src/main/resources/csharp-netcore/validatable.mustache | 4 ++-- .../src/Org.OpenAPITools/Model/MultipartArrayRequest.cs | 2 +- .../src/Org.OpenAPITools/Model/MultipartMixedRequest.cs | 2 +- .../src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs | 2 +- .../src/Org.OpenAPITools/Model/MultipartSingleRequest.cs | 2 +- .../src/Org.OpenAPITools/Model/Activity.cs | 2 +- .../Model/ActivityOutputElementRepresentation.cs | 2 +- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/Apple.cs | 2 +- .../src/Org.OpenAPITools/Model/AppleReq.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 2 +- .../src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../src/Org.OpenAPITools/Model/BasquePig.cs | 2 +- .../src/Org.OpenAPITools/Model/Capitalization.cs | 2 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 2 +- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/DanishPig.cs | 2 +- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Drawing.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 2 +- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/File.cs | 2 +- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 2 +- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 2 +- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/List.cs | 2 +- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 2 +- .../src/Org.OpenAPITools/Model/MapTest.cs | 2 +- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/ModelClient.cs | 2 +- .../src/Org.OpenAPITools/Model/Name.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 2 +- .../src/Org.OpenAPITools/Model/Order.cs | 2 +- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 2 +- .../src/Org.OpenAPITools/Model/Return.cs | 2 +- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 2 +- .../src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../Model/TestCollectionEndingWithWordList.cs | 2 +- .../Model/TestCollectionEndingWithWordListObject.cs | 2 +- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/User.cs | 2 +- .../src/Org.OpenAPITools/Model/Whale.cs | 2 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 2 +- .../src/Org.OpenAPITools/Model/Activity.cs | 3 ++- .../Model/ActivityOutputElementRepresentation.cs | 3 ++- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Animal.cs | 3 ++- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 3 ++- .../src/Org.OpenAPITools/Model/Apple.cs | 3 ++- .../src/Org.OpenAPITools/Model/AppleReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/Banana.cs | 3 ++- .../src/Org.OpenAPITools/Model/BananaReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/BasquePig.cs | 3 ++- .../src/Org.OpenAPITools/Model/Capitalization.cs | 3 ++- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/Category.cs | 3 ++- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/ClassModel.cs | 3 ++- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/DanishPig.cs | 3 ++- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 3 ++- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/Drawing.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/File.cs | 3 ++- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Foo.cs | 3 ++- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 3 ++- .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/Fruit.cs | 3 ++- .../src/Org.OpenAPITools/Model/FruitReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/GmFruit.cs | 3 ++- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 3 ++- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 3 ++- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/List.cs | 3 ++- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Mammal.cs | 3 ++- .../src/Org.OpenAPITools/Model/MapTest.cs | 3 ++- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Model200Response.cs | 3 ++- .../src/Org.OpenAPITools/Model/ModelClient.cs | 3 ++- .../src/Org.OpenAPITools/Model/Name.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableShape.cs | 3 ++- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 3 ++- .../src/Org.OpenAPITools/Model/Order.cs | 3 ++- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 3 ++- .../src/Org.OpenAPITools/Model/Pet.cs | 3 ++- .../src/Org.OpenAPITools/Model/Pig.cs | 3 ++- .../src/Org.OpenAPITools/Model/PolymorphicProperty.cs | 3 ++- .../src/Org.OpenAPITools/Model/Quadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 3 ++- .../src/Org.OpenAPITools/Model/Return.cs | 3 ++- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/Shape.cs | 3 ++- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 3 ++- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 3 ++- .../src/Org.OpenAPITools/Model/Tag.cs | 3 ++- .../Model/TestCollectionEndingWithWordList.cs | 3 ++- .../Model/TestCollectionEndingWithWordListObject.cs | 3 ++- .../src/Org.OpenAPITools/Model/Triangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/User.cs | 3 ++- .../src/Org.OpenAPITools/Model/Whale.cs | 3 ++- .../src/Org.OpenAPITools/Model/Zebra.cs | 3 ++- .../src/Org.OpenAPITools/Model/Activity.cs | 3 ++- .../Model/ActivityOutputElementRepresentation.cs | 3 ++- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Animal.cs | 3 ++- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 3 ++- .../src/Org.OpenAPITools/Model/Apple.cs | 3 ++- .../src/Org.OpenAPITools/Model/AppleReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/Banana.cs | 3 ++- .../src/Org.OpenAPITools/Model/BananaReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/BasquePig.cs | 3 ++- .../src/Org.OpenAPITools/Model/Capitalization.cs | 3 ++- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/Category.cs | 3 ++- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/ClassModel.cs | 3 ++- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/DanishPig.cs | 3 ++- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 3 ++- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/Drawing.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/File.cs | 3 ++- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Foo.cs | 3 ++- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 3 ++- .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/Fruit.cs | 3 ++- .../src/Org.OpenAPITools/Model/FruitReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/GmFruit.cs | 3 ++- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 3 ++- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 3 ++- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/List.cs | 3 ++- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Mammal.cs | 3 ++- .../src/Org.OpenAPITools/Model/MapTest.cs | 3 ++- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Model200Response.cs | 3 ++- .../src/Org.OpenAPITools/Model/ModelClient.cs | 3 ++- .../src/Org.OpenAPITools/Model/Name.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableShape.cs | 3 ++- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 3 ++- .../src/Org.OpenAPITools/Model/Order.cs | 3 ++- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 3 ++- .../src/Org.OpenAPITools/Model/Pet.cs | 3 ++- .../src/Org.OpenAPITools/Model/Pig.cs | 3 ++- .../src/Org.OpenAPITools/Model/PolymorphicProperty.cs | 3 ++- .../src/Org.OpenAPITools/Model/Quadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 3 ++- .../src/Org.OpenAPITools/Model/Return.cs | 3 ++- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/Shape.cs | 3 ++- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 3 ++- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 3 ++- .../src/Org.OpenAPITools/Model/Tag.cs | 3 ++- .../Model/TestCollectionEndingWithWordList.cs | 3 ++- .../Model/TestCollectionEndingWithWordListObject.cs | 3 ++- .../src/Org.OpenAPITools/Model/Triangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/User.cs | 3 ++- .../src/Org.OpenAPITools/Model/Whale.cs | 3 ++- .../src/Org.OpenAPITools/Model/Zebra.cs | 3 ++- .../src/Org.OpenAPITools/Model/AdultAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/ChildAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/Person.cs | 3 ++- .../src/Org.OpenAPITools/Model/Apple.cs | 3 ++- .../src/Org.OpenAPITools/Model/Banana.cs | 3 ++- .../src/Org.OpenAPITools/Model/Fruit.cs | 3 ++- .../src/Org.OpenAPITools/Model/Apple.cs | 3 ++- .../src/Org.OpenAPITools/Model/Banana.cs | 3 ++- .../src/Org.OpenAPITools/Model/Fruit.cs | 3 ++- .../src/Org.OpenAPITools/Model/Activity.cs | 3 ++- .../Model/ActivityOutputElementRepresentation.cs | 3 ++- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Animal.cs | 3 ++- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 3 ++- .../src/Org.OpenAPITools/Model/Apple.cs | 3 ++- .../src/Org.OpenAPITools/Model/AppleReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/Banana.cs | 3 ++- .../src/Org.OpenAPITools/Model/BananaReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/BasquePig.cs | 3 ++- .../src/Org.OpenAPITools/Model/Capitalization.cs | 3 ++- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/Category.cs | 3 ++- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/ClassModel.cs | 3 ++- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/DanishPig.cs | 3 ++- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 3 ++- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 3 ++- .../src/Org.OpenAPITools/Model/Drawing.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/File.cs | 3 ++- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Foo.cs | 3 ++- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 3 ++- .../src/Org.OpenAPITools/Model/FormatTest.cs | 3 ++- .../src/Org.OpenAPITools/Model/Fruit.cs | 3 ++- .../src/Org.OpenAPITools/Model/FruitReq.cs | 3 ++- .../src/Org.OpenAPITools/Model/GmFruit.cs | 3 ++- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 3 ++- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 3 ++- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/List.cs | 3 ++- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Mammal.cs | 3 ++- .../src/Org.OpenAPITools/Model/MapTest.cs | 3 ++- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/Model200Response.cs | 3 ++- .../src/Org.OpenAPITools/Model/ModelClient.cs | 3 ++- .../src/Org.OpenAPITools/Model/Name.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 3 ++- .../src/Org.OpenAPITools/Model/NullableShape.cs | 3 ++- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 3 ++- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 3 ++- .../src/Org.OpenAPITools/Model/Order.cs | 3 ++- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 3 ++- .../src/Org.OpenAPITools/Model/Pet.cs | 3 ++- .../src/Org.OpenAPITools/Model/Pig.cs | 3 ++- .../src/Org.OpenAPITools/Model/PolymorphicProperty.cs | 3 ++- .../src/Org.OpenAPITools/Model/Quadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 3 ++- .../src/Org.OpenAPITools/Model/Return.cs | 3 ++- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/Shape.cs | 3 ++- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 3 ++- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 3 ++- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 3 ++- .../src/Org.OpenAPITools/Model/Tag.cs | 3 ++- .../Model/TestCollectionEndingWithWordList.cs | 3 ++- .../Model/TestCollectionEndingWithWordListObject.cs | 3 ++- .../src/Org.OpenAPITools/Model/Triangle.cs | 3 ++- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 3 ++- .../src/Org.OpenAPITools/Model/User.cs | 3 ++- .../src/Org.OpenAPITools/Model/Whale.cs | 3 ++- .../src/Org.OpenAPITools/Model/Zebra.cs | 3 ++- .../src/Org.OpenAPITools/Model/Activity.cs | 2 +- .../Model/ActivityOutputElementRepresentation.cs | 2 +- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/Apple.cs | 2 +- .../src/Org.OpenAPITools/Model/AppleReq.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 2 +- .../src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../src/Org.OpenAPITools/Model/BasquePig.cs | 2 +- .../src/Org.OpenAPITools/Model/Capitalization.cs | 2 +- .../src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 2 +- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/DanishPig.cs | 2 +- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 2 +- .../src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Drawing.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 2 +- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/File.cs | 2 +- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 2 +- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 2 +- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/List.cs | 2 +- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 2 +- .../src/Org.OpenAPITools/Model/MapTest.cs | 2 +- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/ModelClient.cs | 2 +- .../src/Org.OpenAPITools/Model/Name.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 2 +- .../src/Org.OpenAPITools/Model/Order.cs | 2 +- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 2 +- .../src/Org.OpenAPITools/Model/Return.cs | 2 +- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 2 +- .../src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../Model/TestCollectionEndingWithWordList.cs | 2 +- .../Model/TestCollectionEndingWithWordListObject.cs | 2 +- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/User.cs | 2 +- .../src/Org.OpenAPITools/Model/Whale.cs | 2 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 2 +- .../src/Org.OpenAPITools/Model/Activity.cs | 2 +- .../Model/ActivityOutputElementRepresentation.cs | 2 +- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs | 2 +- .../src/Org.OpenAPITools/Model/AppleReq.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../src/Org.OpenAPITools/Model/BasquePig.cs | 2 +- .../src/Org.OpenAPITools/Model/Capitalization.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 2 +- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/DanishPig.cs | 2 +- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 2 +- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs | 2 +- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 2 +- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 2 +- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs | 2 +- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs | 2 +- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/ModelClient.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs | 2 +- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs | 2 +- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../Model/TestCollectionEndingWithWordList.cs | 2 +- .../Model/TestCollectionEndingWithWordListObject.cs | 2 +- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs | 2 +- .../OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs | 2 +- .../src/Org.OpenAPITools/Model/Activity.cs | 2 +- .../Model/ActivityOutputElementRepresentation.cs | 2 +- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs | 2 +- .../src/Org.OpenAPITools/Model/AppleReq.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../src/Org.OpenAPITools/Model/BasquePig.cs | 2 +- .../src/Org.OpenAPITools/Model/Capitalization.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 2 +- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/DanishPig.cs | 2 +- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 2 +- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs | 2 +- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 2 +- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 2 +- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs | 2 +- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs | 2 +- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/ModelClient.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs | 2 +- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs | 2 +- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../Model/TestCollectionEndingWithWordList.cs | 2 +- .../Model/TestCollectionEndingWithWordListObject.cs | 2 +- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs | 2 +- .../OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs | 2 +- .../src/Org.OpenAPITools/Model/Activity.cs | 2 +- .../Model/ActivityOutputElementRepresentation.cs | 2 +- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs | 2 +- .../src/Org.OpenAPITools/Model/AppleReq.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayTest.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../src/Org.OpenAPITools/Model/BasquePig.cs | 2 +- .../src/Org.OpenAPITools/Model/Capitalization.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../src/Org.OpenAPITools/Model/CatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 2 +- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/DanishPig.cs | 2 +- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../src/Org.OpenAPITools/Model/DogAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/Drawing.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 2 +- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs | 2 +- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 2 +- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 2 +- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs | 2 +- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 2 +- .../src/Org.OpenAPITools/Model/MapTest.cs | 2 +- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/ModelClient.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs | 2 +- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs | 2 +- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../Model/TestCollectionEndingWithWordList.cs | 2 +- .../Model/TestCollectionEndingWithWordListObject.cs | 2 +- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs | 2 +- .../OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs | 2 +- .../Model/ActivityOutputElementRepresentation.cs | 2 +- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs | 2 +- .../src/Org.OpenAPITools/Model/Capitalization.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs | 2 +- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs | 2 +- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/File.cs | 2 +- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 2 +- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 2 +- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/List.cs | 2 +- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs | 2 +- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Model200Response.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs | 2 +- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs | 2 +- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../Model/TestCollectionEndingWithWordList.cs | 2 +- .../Model/TestCollectionEndingWithWordListObject.cs | 2 +- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/User.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs | 2 +- .../Model/ActivityOutputElementRepresentation.cs | 2 +- .../src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs | 2 +- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs | 2 +- .../src/Org.OpenAPITools/Model/Capitalization.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs | 2 +- .../src/Org.OpenAPITools/Model/ChildCatAllOf.cs | 2 +- .../src/Org.OpenAPITools/Model/ClassModel.cs | 2 +- .../src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs | 2 +- .../src/Org.OpenAPITools/Model/DateOnlyClass.cs | 2 +- .../src/Org.OpenAPITools/Model/DeprecatedObject.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs | 2 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs | 2 +- .../src/Org.OpenAPITools/Model/EquilateralTriangle.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs | 2 +- .../src/Org.OpenAPITools/Model/FileSchemaTestClass.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs | 2 +- .../src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/FormatTest.cs | 2 +- .../src/Org.OpenAPITools/Model/GrandparentAnimal.cs | 2 +- .../src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/HealthCheckResult.cs | 2 +- .../src/Org.OpenAPITools/Model/IsoscelesTriangle.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs | 2 +- .../src/Org.OpenAPITools/Model/LiteralStringClass.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs | 2 +- .../Model/MixedPropertiesAndAdditionalPropertiesClass.cs | 2 +- .../src/Org.OpenAPITools/Model/Model200Response.cs | 2 +- .../src/Org.OpenAPITools/Model/ModelClient.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NullableGuidClass.cs | 2 +- .../src/Org.OpenAPITools/Model/NumberOnly.cs | 2 +- .../src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs | 2 +- .../src/Org.OpenAPITools/Model/OuterComposite.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/QuadrilateralInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/ReadOnlyFirst.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs | 2 +- .../src/Org.OpenAPITools/Model/ScaleneTriangle.cs | 2 +- .../src/Org.OpenAPITools/Model/ShapeInterface.cs | 2 +- .../src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs | 2 +- .../src/Org.OpenAPITools/Model/SpecialModelName.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../Model/TestCollectionEndingWithWordList.cs | 2 +- .../Model/TestCollectionEndingWithWordListObject.cs | 2 +- .../src/Org.OpenAPITools/Model/TriangleInterface.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs | 2 +- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs | 2 +- .../src/Org.OpenAPITools/Model/ApiResponse.cs | 2 +- .../src/Org.OpenAPITools/Model/Category.cs | 2 +- .../src/Org.OpenAPITools/Model/Order.cs | 2 +- .../src/Org.OpenAPITools/Model/Pet.cs | 2 +- .../src/Org.OpenAPITools/Model/Tag.cs | 2 +- .../src/Org.OpenAPITools/Model/User.cs | 2 +- 722 files changed, 957 insertions(+), 722 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache index bf8ddee6d65..e638741779b 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache @@ -310,6 +310,7 @@ {{/readOnlyVars}} {{#validatable}} {{^parentModel}} + {{>validatable}} {{/parentModel}} {{/validatable}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache index 2799fca039b..7ec9e987055 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache @@ -4,7 +4,7 @@ /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } @@ -23,7 +23,7 @@ /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { {{/discriminator}} {{#parent}} diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs index 60083edbb16..faccc14b6b4 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs @@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs index 4e51e950886..c30d95968d9 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs @@ -158,7 +158,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs index 8e708aa76d5..05fd815de56 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs index 76f7baae15e..c7872d5b83e 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs +++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs @@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs index 62b70440f67..637dce49d4c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 7395af5fbf1..e1920e20d8a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -180,7 +180,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 4c371eb457b..b005c28e326 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -391,7 +391,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs index 1089897a9c0..652a0df9259 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs @@ -188,7 +188,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs index 5b0f3df7b73..e1f52990262 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -212,7 +212,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs index da13eb8e763..d89f2a65e76 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs @@ -180,7 +180,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs index f856ba9072c..b94dcf102a9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs @@ -171,7 +171,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 7ad65647a78..193c10bb3f8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 4c42444cc8c..f8dad465958 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs index 6914c6b657a..75497d4a83f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -215,7 +215,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs index 48f7f67df9f..cb351f94bb2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs index 084e55f92a0..e5c63d320e9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs @@ -163,7 +163,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs index 8262f21f86c..8dcb3eb95cb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs index dbf1d37b035..c9711efcee0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs @@ -321,7 +321,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs index 6ce34d4b957..6619281fd6c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs @@ -155,7 +155,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/CatAllOf.cs index d97b2bc88a5..5b5f9e03d73 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs index babb18e4c04..ffe96e0f991 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs @@ -186,7 +186,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs index c7201b1c4ae..43796f651f4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs @@ -191,7 +191,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index 81bcbec5a90..a6ebaf37143 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -188,7 +188,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs index f5c0e910e73..acfee052180 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 21713f5742a..c280a8974d5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs index c4b7fbf1410..d3c569e876a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 19c7f906b9c..1d394e4a98c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 2e0a59ec8e2..2fc41119de4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs index 450f8c3a0a4..f360181923f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs @@ -158,7 +158,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DogAllOf.cs index e462064842a..f6e4e068c9b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs index b0a657793d9..f52bb31aab2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs @@ -239,7 +239,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs index e63ee79f3ea..67d6845f5e4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -219,7 +219,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs index 6d8fb03b7f5..7470b9876ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs @@ -526,7 +526,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index 153f0fff2bd..72beac2a696 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs index 6f16bbf6964..28c03a1168e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 333c81d6505..eea3c2b0d8c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -180,7 +180,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs index 1380ddea88a..05dbdea1c07 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 121fba3414f..93db2191545 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs index 40e08c968d8..bd57007c09a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs @@ -721,7 +721,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Integer (int) maximum if (this.Integer > (int)100) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 4b26f24f31c..e188accf045 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -158,7 +158,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 52099a7095e..2d4a1cd404f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs index 57cfec9a09d..be78dcda54e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index d20bedcd923..9506ad4eeb4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -175,7 +175,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs index 872d8d8b8fd..355b11be2d0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 60124dbf916..ddfb8b005d2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -170,7 +170,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs index 7e7093e3d0f..a511fb8d51d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs @@ -270,7 +270,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index b856a6fc2da..219e8b48501 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -250,7 +250,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs index 1491add2e7b..e878c99d745 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs @@ -177,7 +177,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs index 50543b26323..354d9791fc4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs index bfda0b00520..aec6d2cbb30 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs @@ -213,7 +213,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs index 25779b92e2d..fb4d4412478 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs @@ -520,7 +520,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs index c37ee6768e5..158ba22ebd8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs index 585e3eadb7f..961b7abff84 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index de9baa3fe2f..4b0cb91fae1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -250,7 +250,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs index a4f277b3431..e01f5fe1ec0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs @@ -331,7 +331,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs index cf4ea1fc9b6..aa9774cb4db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -209,7 +209,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs index 7e2a820d32c..769c3612f3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs index b8efe609ab8..dcb61fb9d47 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs @@ -355,7 +355,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index 2b8f0a9cd3f..e0b72eab7ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index f5f1b145160..384dd874ec1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -164,7 +164,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs index 709c50b9351..8ebfb712680 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 0577d1ddf73..ca4361588ff 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs index 9f5c4295bf3..10ec59fceb6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 318daa0c8aa..8902d281127 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs index 9a4d9fc482a..92fa55597f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -177,7 +177,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs index cb9f2aa96f5..7e585a09d97 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs @@ -177,7 +177,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index 238328da587..649c68cec4a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index e7654fb69e1..ae18b47cd80 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs index d26983a6d97..9032c9cdbb0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs index 5eb84346ec8..72b23434c90 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs @@ -529,7 +529,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs index d844993eb20..91d3f6b6c87 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs @@ -218,7 +218,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs index 615d245b478..160aefdde05 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs @@ -215,7 +215,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs index 4ccbf78f2f2..15d4250d9d0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 3a0ef7b95db..40a36583b66 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 1b449ebd461..3a2dfec5141 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -129,12 +129,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs index 1337f2e6e9e..a2d20ac42f2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs index a5db00f6532..6afa4417f37 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -83,12 +83,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs index fb804227a4a..f084f92dbf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs index 6da56e2d8be..1abcf6887a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs @@ -67,12 +67,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 83007a0f90c..8700ec16e3d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 275b951171f..9a906125a67 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs index ff835c24a7f..a607deec738 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -83,12 +83,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs index 41c562b5e49..bcade3d067b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs index 179c0d2b914..68e1f8b576c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs @@ -67,12 +67,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs index ec0eb684ac8..55402711a4d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs index b251591842f..9633267213b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs @@ -111,12 +111,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs index 6126f92444b..88a9b2164cf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs index 7e8cde62ae7..3a7ed4397ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index 79130f0abb6..b9f826f1d53 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -113,12 +113,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs index 56408a7c672..576db4b59c3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index b2bb1ac0d87..9619880abf8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -70,12 +70,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs index 63b6ed469bc..e33b6275984 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs index c4fa59e6ba0..391564594c4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -66,12 +66,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 9d1cfaaf735..858fdcc62b0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs index 155413dde4d..c31395c91b8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs index 95f7f9b8ac1..361f3dd8399 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs @@ -86,12 +86,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs index 344a7a03cfd..ec7849c2894 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -174,12 +174,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs index 8c69fead57a..9634aceecd2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs @@ -397,12 +397,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index 1e4a0880df5..f7ec9ae58ea 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -70,12 +70,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs index 3b548b37ee2..7cc77e435e6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs @@ -66,12 +66,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 2badda85d70..9e311213aec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs index 037f719500a..77935ec9156 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index b8721365867..75c745b984d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs index cef3da2565d..591888d3b5d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs @@ -223,12 +223,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // DoubleProperty (double) maximum if (this.DoubleProperty > (double)123.4) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs index a9c0d304226..83d7de4996d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs @@ -82,12 +82,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs index 7d78927ea48..548f7216c26 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs @@ -71,12 +71,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs index a13a2e0adb2..d93e9095ca4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 2cac3db230e..6a6d2c5a391 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 3670afacd1c..3bc1499a353 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -111,12 +111,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs index 2d2b6314b50..1dd69331d4b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index 3692266e079..e7419bb25ae 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs index a63c52384ab..7257bb6701c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 0c942dc6894..3b3aa42307c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs index a82b0031660..c2f3de4b89d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs @@ -93,12 +93,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs index fe8046b10af..efe466ed493 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs @@ -142,12 +142,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 3d8c9eaa03c..743d37e3fc1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -92,12 +92,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs index ef10cdff222..4ad661c7f9c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs index 244a3231efd..4825671d0d7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs index 02d1207dee2..180373aa04e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs @@ -129,12 +129,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs index db356cc9f89..27dce406fad 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs @@ -158,12 +158,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs index e591e719a08..2947e0d39af 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -66,12 +66,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs index 0612b3b159c..d573815d25a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs @@ -78,12 +78,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs index 10261ecbdce..25488750734 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 6c03acde0ba..65d03480f73 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -95,12 +95,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs index 6e4cd12bd12..06f3c4f14e8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs @@ -174,12 +174,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs index b3233c21a79..1356ba2a303 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -83,12 +83,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs index a91d16705b9..feb6a20fea8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs @@ -174,12 +174,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs index e04bd5f5ea8..611277e0082 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs @@ -78,12 +78,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index d317218e963..c501445a45f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -108,12 +108,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs index c07d22c60c2..f2889fe5c63 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -78,12 +78,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index e9d705d584f..0b4a9afa6aa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index e4e41e2caee..cfe9707d7d4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -110,12 +110,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs index 39152c59e57..8e5ee672542 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index d8c8a860262..1263e739c65 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -70,12 +70,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs index 27eef9ebccd..4ed8771c21c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs @@ -89,12 +89,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs index 899ba8fa5de..5c67fb1aaa0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs index 4e0151c6c6b..659af58ce0d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -89,12 +89,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 1f3b67d63b5..4f9a98be8f7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -70,12 +70,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs index b52b9d5f1ff..58d3e9d0c5a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs index de8d3635790..68dc9a5166a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs @@ -74,12 +74,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index 4c77a059bea..9c25311fbf9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index 263dafcca2c..0c05bd9df70 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs index e2403790908..d500aa8ed2d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs @@ -119,12 +119,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs index d58c53ec372..e5005d3c845 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs index 68c1bb6ea9b..e784cf602ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs @@ -169,12 +169,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs index 00aa2f3c594..26063e06a11 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs @@ -83,12 +83,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs index 75fae4222b7..08e85d8ed9a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs @@ -136,12 +136,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs index f1c04211b9d..33362f78e17 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 961f370130f..345e7af1c8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 41ebb7e8a39..81aa51108de 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -127,12 +127,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs index 0061eef68ee..679cec79c20 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs index 12c5484c2ff..7343f916f89 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -81,12 +81,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs index 2dfef8c50f9..f480b93afa0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs index fbfcd9efaf1..c66103ef9a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index a6e92aaf78e..e5b37af5db4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 1f8c17cac78..d108d6b142b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs index 85e928be6d1..1d211adb467 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -81,12 +81,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs index a60328badff..cf67cd3dfdb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs index aa109bf1e8e..f49b6502d8a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs index 08f9a36fe77..9370e427dca 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs index ef305b42a8e..9727c077679 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs @@ -109,12 +109,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs index 09e87f9513d..ae49286460d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs index 719a929f6e4..b3500dbfa01 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index 6f3308eb346..2bd9eecb33e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -111,12 +111,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs index 8b8b59299ee..4944bb2e113 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 00b7b9977e8..7b28f72a4b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -68,12 +68,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs index 34d5e4a5688..eee848c075c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 9564eba0df5..262c168d6a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -64,12 +64,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs index b6ed51029a7..e9015dfa6b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs index c31bd1d9d68..c1339c65b5e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs index 5767c9f5e53..d0ef8cb3bb4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs @@ -84,12 +84,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 131618bf7d9..5d43a6e312a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -172,12 +172,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs index ccc7a9a7a2f..3904f1f39b6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -395,12 +395,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index f9ccd27de59..ffcc56e02ac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -68,12 +68,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs index 5192d0685c9..6590517a86d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs @@ -64,12 +64,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 8c19ca974b7..30f69094f53 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs index 6b389a8547a..f1340fbe613 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 1924a97861d..c1e336dbb78 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs index d5ee0dad1d7..9c63adbde8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -221,12 +221,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // DoubleProperty (double) maximum if (this.DoubleProperty > (double)123.4) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs index 98d483b16b5..1897c29368b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -80,12 +80,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs index e3c2dde4faa..1f3cebfc712 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -69,12 +69,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs index c3786405daa..e8a5ee705d9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -70,12 +70,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 090466a47a9..5eb944b1344 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 71fe06569db..783d3552c2b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -109,12 +109,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs index 6db340e73bb..d7f78eef1f4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index 119216e42a3..2c987e36594 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -61,12 +61,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs index 7026233cc1d..4553f4f3a29 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 6247b0187ac..28084cc3a8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs index 0751201e466..6a39a41063a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -91,12 +91,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs index b19072ebd10..57630f7d8ed 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs @@ -140,12 +140,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index f3ffa051767..a4b87545f05 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -90,12 +90,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs index a868300ace6..25b0862bbc0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs index 9f00e8ebd0f..f3ffbd3a822 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs index 73bae313bcd..9ead9323c34 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs @@ -127,12 +127,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs index b8901c35e81..34aeea6c10a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -156,12 +156,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index f9d39dda3c4..494beaa0c0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -64,12 +64,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs index c07b44d5ebc..86c3ef2b52f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -76,12 +76,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs index 271cdaa329e..9a61acfc177 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 8213572e4d9..c72cefc32ea 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -93,12 +93,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs index 3947538474d..8ebcf3cd50a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs @@ -172,12 +172,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 502082fdc5b..fd2a96d97ec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -81,12 +81,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs index cf7e9b68dc7..fdc59f593c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs @@ -172,12 +172,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs index 358f8cdbe31..85ab6251f50 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs @@ -76,12 +76,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 9cb8277290b..3c4e3ea5639 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -106,12 +106,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index 34f1549087f..c2d44ceb5b1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -76,12 +76,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index d1afcde6550..12f1df4e2fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index 7279ed0e9ae..a627d781b7c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -108,12 +108,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs index bdec82a2f93..1e456507b90 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index ee156811143..0588ff50679 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -68,12 +68,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs index 06578837b71..0fe8f6619dc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs @@ -87,12 +87,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs index caa324aacd4..c0693b6831f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index ccfb5800519..0eb8b07b368 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -87,12 +87,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 219c6c795f7..32ec4152f7f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -68,12 +68,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 66ec0c1d1f9..d460df8625c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs index 7978d6c1a55..25683998ebb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index f3f2789d5d1..555b289c82f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index 91ddee2d53c..0e4dbfd8406 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs index 6abfb59ba99..46e762901b3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -117,12 +117,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs index f44b2b08854..2926c5cd546 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs index 72c193106d6..b78692934cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs @@ -167,12 +167,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs index 8c9df6a8fe2..0296c2082fc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs @@ -81,12 +81,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs index 3523212644c..40970ba5b0b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs @@ -134,12 +134,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs index 6a8399a9f7e..be4aa03e933 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs index c7a6bef63fb..6d4c1550e1c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs index 428b89644b8..671722a5fc3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs @@ -83,12 +83,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs index c057e1b9620..15df56a84c9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs index e8dd6a5192a..350ba8a2d0d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs index 19a07cfd5c4..358fa203856 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -79,12 +79,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs index c057e1b9620..15df56a84c9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs index e8dd6a5192a..350ba8a2d0d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs index a579b15d1fa..d5d8417d370 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -89,12 +89,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs index f1c04211b9d..33362f78e17 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 961f370130f..345e7af1c8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 41ebb7e8a39..81aa51108de 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -127,12 +127,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs index 0061eef68ee..679cec79c20 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs index 12c5484c2ff..7343f916f89 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -81,12 +81,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs index 2dfef8c50f9..f480b93afa0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs index fbfcd9efaf1..c66103ef9a3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index a6e92aaf78e..e5b37af5db4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 1f8c17cac78..d108d6b142b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs index 85e928be6d1..1d211adb467 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -81,12 +81,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs index a60328badff..cf67cd3dfdb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs index aa109bf1e8e..f49b6502d8a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -65,12 +65,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs index 08f9a36fe77..9370e427dca 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs index ef305b42a8e..9727c077679 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs @@ -109,12 +109,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs index 09e87f9513d..ae49286460d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs index 719a929f6e4..b3500dbfa01 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index 6f3308eb346..2bd9eecb33e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -111,12 +111,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs index 8b8b59299ee..4944bb2e113 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 00b7b9977e8..7b28f72a4b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -68,12 +68,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs index 34d5e4a5688..eee848c075c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 9564eba0df5..262c168d6a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -64,12 +64,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs index b6ed51029a7..e9015dfa6b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs index c31bd1d9d68..c1339c65b5e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs index 5767c9f5e53..d0ef8cb3bb4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs @@ -84,12 +84,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 131618bf7d9..5d43a6e312a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -172,12 +172,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs index ccc7a9a7a2f..3904f1f39b6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -395,12 +395,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index f9ccd27de59..ffcc56e02ac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -68,12 +68,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs index 5192d0685c9..6590517a86d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs @@ -64,12 +64,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 8c19ca974b7..30f69094f53 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs index 6b389a8547a..f1340fbe613 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 1924a97861d..c1e336dbb78 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs index d5ee0dad1d7..9c63adbde8e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -221,12 +221,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // DoubleProperty (double) maximum if (this.DoubleProperty > (double)123.4) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs index 98d483b16b5..1897c29368b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs @@ -80,12 +80,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs index e3c2dde4faa..1f3cebfc712 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -69,12 +69,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs index c3786405daa..e8a5ee705d9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs @@ -70,12 +70,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 090466a47a9..5eb944b1344 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 71fe06569db..783d3552c2b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -109,12 +109,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs index 6db340e73bb..d7f78eef1f4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index 119216e42a3..2c987e36594 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -61,12 +61,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs index 7026233cc1d..4553f4f3a29 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 6247b0187ac..28084cc3a8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs index 0751201e466..6a39a41063a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs @@ -91,12 +91,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs index b19072ebd10..57630f7d8ed 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs @@ -140,12 +140,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index f3ffa051767..a4b87545f05 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -90,12 +90,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs index a868300ace6..25b0862bbc0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs index 9f00e8ebd0f..f3ffbd3a822 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs index 73bae313bcd..9ead9323c34 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs @@ -127,12 +127,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs index b8901c35e81..34aeea6c10a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -156,12 +156,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index f9d39dda3c4..494beaa0c0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -64,12 +64,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs index c07b44d5ebc..86c3ef2b52f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs @@ -76,12 +76,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs index 271cdaa329e..9a61acfc177 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 8213572e4d9..c72cefc32ea 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -93,12 +93,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs index 3947538474d..8ebcf3cd50a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs @@ -172,12 +172,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 502082fdc5b..fd2a96d97ec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -81,12 +81,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs index cf7e9b68dc7..fdc59f593c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs @@ -172,12 +172,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs index 358f8cdbe31..85ab6251f50 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs @@ -76,12 +76,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 9cb8277290b..3c4e3ea5639 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -106,12 +106,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs index 34f1549087f..c2d44ceb5b1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -76,12 +76,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index d1afcde6550..12f1df4e2fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index 7279ed0e9ae..a627d781b7c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -108,12 +108,13 @@ namespace Org.OpenAPITools.Model return hashCode; } } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs index bdec82a2f93..1e456507b90 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index ee156811143..0588ff50679 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -68,12 +68,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs index 06578837b71..0fe8f6619dc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs @@ -87,12 +87,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs index caa324aacd4..c0693b6831f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs index ccfb5800519..0eb8b07b368 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -87,12 +87,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 219c6c795f7..32ec4152f7f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -68,12 +68,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 66ec0c1d1f9..d460df8625c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs index 7978d6c1a55..25683998ebb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs @@ -72,12 +72,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index f3f2789d5d1..555b289c82f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index 91ddee2d53c..0e4dbfd8406 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs index 6abfb59ba99..46e762901b3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs @@ -117,12 +117,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs index f44b2b08854..2926c5cd546 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -63,12 +63,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs index 72c193106d6..b78692934cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs @@ -167,12 +167,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs index 8c9df6a8fe2..0296c2082fc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs @@ -81,12 +81,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs index 3523212644c..40970ba5b0b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs @@ -134,12 +134,13 @@ namespace Org.OpenAPITools.Model sb.Append("}\n"); return sb.ToString(); } + /// /// To validate all properties of the instance /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs index a883381f9c7..f80ff387681 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 065c023d0a5..383824e58c7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index fb0eca6557b..78209b634de 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -216,7 +216,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs index 7300b6da74e..b770a965366 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs @@ -155,7 +155,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs index 0bf23edced7..78d6bab5e0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs index b8cf5d357d3..d410331bf57 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs index d0a4bdb172a..ba8e82f6561 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs @@ -132,7 +132,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 3de85f7f649..df188f37a56 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 8fad145c570..81c92eaa9e3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs index 7c9c235507a..8a23557a185 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs index 8b340fae031..451d86897cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs index 382f8f954fa..56437177c9b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs index 8e890c68788..715b02a0cb5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs index 463d63a939f..39630f97eee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs index d2f07b2e063..29f8e087632 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs @@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs index d126477f736..038506f5d04 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs index f8ceed16884..92158e22999 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs index 4a7f278731c..b4cfff038b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs @@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index f2ae1bcb054..d4f4abb0d22 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs index 66db9245d6b..376386e55f7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 2a964cfe403..15f0ce0a64f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -155,7 +155,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs index 6449d058967..e10104c287d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 30acdf43d8f..6c50d6900df 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -126,7 +126,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs index afd96916888..3e364cc0c6f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs index f8432044266..79791c62e40 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs index 7d6c49788a0..d8d2c3c4da6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs index 7610f5c3bc1..ae441f94c69 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs @@ -152,7 +152,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs index 5f374bada4a..5469bad8be9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -174,7 +174,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs index fc83b2c83ca..c97d7df08b2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs @@ -315,7 +315,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index d5fe6f8caa6..0220beeae23 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -155,7 +155,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs index 36418ba1676..089499517dc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs @@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 13d9f45e3f2..ff5e44d98a4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs index d7a83d189b8..0622c6e23b5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs @@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 7cb14a9934b..17b4937d0cc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs index bf8985d265c..b905f6c9526 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -342,7 +342,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Integer (int) maximum if (this.Integer > (int)100) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 4936fff7607..fcbed17b423 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -141,7 +141,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 18b30851956..79815e1812e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs index 0764cab0edf..c65fbeef844 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index 2028dbe7227..efdc5b988c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs index 9610ab8c272..0b82ae2a68f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 2694ca6bba3..eaa4c72410f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs index 9685a3a04da..a75de13c487 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs @@ -183,7 +183,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index f38683669af..8d0985961a8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -163,7 +163,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs index 1f636909766..8a418ebc73f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs @@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs index 564fedf5ae4..e9371830487 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs index 22cd8a4dccb..0b13d4f392f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs @@ -174,7 +174,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs index 0b61fdc69e6..e0973555e3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs @@ -257,7 +257,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs index f93cdd00748..393c9fd8d14 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs index e4f90a8e77b..8b4bd992e77 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index c313e46180f..34c6090d7fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -163,7 +163,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs index 37791e8867a..befa21e3211 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs @@ -203,7 +203,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs index 2351bbd1e53..2950ad95a56 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -144,7 +144,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs index 5a74e4fd34f..9f866c87f8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs index 94e63c364b8..203a102be55 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs @@ -230,7 +230,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index 649ca6451cf..f198bec3257 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index 81adfe7489b..89f41da2fbe 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -143,7 +143,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs index b08ff811705..5c2685ac2a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 5cb4a808c80..3d10531a27b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -155,7 +155,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs index 780b249dbc6..096d9e7b33c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 051e10685d3..811b72e4cdd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -155,7 +155,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs index d35b2d2d298..7894796d308 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs index 3323ce57e28..de31cf796c3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs @@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index accec5dd29e..e2d620fa1c5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index 9b4f0566691..36ebfc80f52 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs index 2c21c7de838..be6a19dd7a7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs index d099e469095..1185416ea8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs @@ -266,7 +266,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs index a4d2c9e820c..27581a3e514 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs @@ -157,7 +157,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs index 533d9487bba..f5e625bf80a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs @@ -174,7 +174,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs index 38f1573adb2..3c5a860dd89 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 59a301721b2..0640bc68500 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index b3ddad35a07..ddec6a58568 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -215,7 +215,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs index bcfe3744a9d..78077d2bed4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs index 79873f4ddfe..6d70e97a51c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs index 5e83de8a154..c8ffe52a70a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs index 9e09e2da8ce..16df556db5d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs @@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 30bf57ef0f5..06e930e774c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 8a215aad133..da8a65b26f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs index 1a879a1d9ca..3e823100067 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs index 97939597ede..70aeea02471 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs index 3edb9a1b6dc..6a4edb3394d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs index f65f049cfd9..838f5741cf6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs index be68a50a116..bd317ad8747 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs @@ -189,7 +189,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs index 0a48e9411bc..49a0dc8ada3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs index 3a960e9925e..8fcdcaf5342 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs index 380112546ce..2313431e4d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs index 2aa81264fad..8ba9f729c01 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index a353ad7ffd7..efff1d70557 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs index 7177e9bf0b6..59c85f3e79b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 353ea1d081e..4c1b999c7f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs index d86ff21df9b..3c1138fe977 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 83e889c49ba..c30936b9684 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 1928b236bf6..1a6841a713c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs index 610859341db..32f2bbd7fa7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs index 7b026acbf1e..e82743a7151 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs index d8cd2a70ef6..0a759b37b3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs @@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs index 69568d6c87d..08214dd22b2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs index 7386cffd37d..02e7580cdcf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs @@ -314,7 +314,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index 773eba5b0a2..ab16133fe4b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs index e77d15e06bc..cf3b18a81c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 6808978c49f..ae9d8e1c05a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs index 2c74cfce99f..570e3de7f65 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 259e5e626df..70554062020 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs index caa163075e7..c3fa57791cf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs @@ -341,7 +341,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Integer (int) maximum if (this.Integer > (int)100) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 28e7729a175..8ca8d20eb0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 52099a7095e..2d4a1cd404f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs index e8cbb68e2e4..77ad8860aec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index ea18925f87e..3d5a1ff7ad8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs index 00814d11069..8933b19e210 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 51815067591..3efdf123845 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs index b2aeedc33ce..424a81efceb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs @@ -182,7 +182,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 0a0750f14cc..01215c65971 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -162,7 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs index 79a49ef91d2..72383f9de33 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs index 1995ec4b169..d9a94592395 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs index 1d4e7605066..515b498cb5b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs index 57555c37678..f2d06d7f2a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs @@ -256,7 +256,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs index aaac7b6665a..b8bb2b7bcf3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs index 0331e1c8db8..d25f420362e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 86ea32998f8..14022ef06ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -162,7 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs index 5b8c83a181d..3f5b1d5f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs @@ -202,7 +202,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs index 3209f6d6244..42ddbc5c56f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -143,7 +143,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs index 7e2a820d32c..769c3612f3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs index f70048fff04..9e624788f76 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs @@ -229,7 +229,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index d5be5ea3c92..9f2f3d60b1f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index ad59ca83286..233a10492f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs index e702e015703..c6edbea2f71 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 236020031e6..f50d01492be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs index c9294b0b4e5..c03107d52ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 59397bf30fc..f589c821c40 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs index 7800467822e..fd741fa9e1a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs index 3df2c02e2ce..ec78b91f125 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index d205e86eacf..b89ff43ced7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index dc34d9582dc..54d4db6cf28 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs index cdf2bd1f0f9..1c85da68ec7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs index 5f2a3020c3d..8744ceac5ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs @@ -265,7 +265,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs index 62ae66415f1..c4ae8981958 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs @@ -156,7 +156,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs index 8a3c713fe6b..2cd7c3f946d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs index 38f1573adb2..3c5a860dd89 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 59a301721b2..0640bc68500 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index b3ddad35a07..ddec6a58568 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -215,7 +215,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs index bcfe3744a9d..78077d2bed4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs index 79873f4ddfe..6d70e97a51c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs index 5e83de8a154..c8ffe52a70a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs index 9e09e2da8ce..16df556db5d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs @@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 30bf57ef0f5..06e930e774c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 8a215aad133..da8a65b26f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs index 1a879a1d9ca..3e823100067 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs index 97939597ede..70aeea02471 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs index 3edb9a1b6dc..6a4edb3394d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs index f65f049cfd9..838f5741cf6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs index be68a50a116..bd317ad8747 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs @@ -189,7 +189,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs index 0a48e9411bc..49a0dc8ada3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs index 3a960e9925e..8fcdcaf5342 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs index 380112546ce..2313431e4d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs index 2aa81264fad..8ba9f729c01 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index a353ad7ffd7..efff1d70557 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs index 7177e9bf0b6..59c85f3e79b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 353ea1d081e..4c1b999c7f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs index d86ff21df9b..3c1138fe977 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 83e889c49ba..c30936b9684 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 1928b236bf6..1a6841a713c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs index 610859341db..32f2bbd7fa7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs index 7b026acbf1e..e82743a7151 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs index d8cd2a70ef6..0a759b37b3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs @@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs index 69568d6c87d..08214dd22b2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs index 7386cffd37d..02e7580cdcf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs @@ -314,7 +314,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index 773eba5b0a2..ab16133fe4b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs index e77d15e06bc..cf3b18a81c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 6808978c49f..ae9d8e1c05a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs index 2c74cfce99f..570e3de7f65 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 259e5e626df..70554062020 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs index caa163075e7..c3fa57791cf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs @@ -341,7 +341,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Integer (int) maximum if (this.Integer > (int)100) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 28e7729a175..8ca8d20eb0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 52099a7095e..2d4a1cd404f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs index e8cbb68e2e4..77ad8860aec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index ea18925f87e..3d5a1ff7ad8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs index 00814d11069..8933b19e210 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 51815067591..3efdf123845 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs index b2aeedc33ce..424a81efceb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs @@ -182,7 +182,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 0a0750f14cc..01215c65971 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -162,7 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs index 79a49ef91d2..72383f9de33 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs index 1995ec4b169..d9a94592395 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs index 1d4e7605066..515b498cb5b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs index 57555c37678..f2d06d7f2a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs @@ -256,7 +256,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs index aaac7b6665a..b8bb2b7bcf3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs index 0331e1c8db8..d25f420362e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 86ea32998f8..14022ef06ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -162,7 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs index 5b8c83a181d..3f5b1d5f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs @@ -202,7 +202,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs index 3209f6d6244..42ddbc5c56f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -143,7 +143,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs index 7e2a820d32c..769c3612f3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs index f70048fff04..9e624788f76 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs @@ -229,7 +229,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index d5be5ea3c92..9f2f3d60b1f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index ad59ca83286..233a10492f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs index e702e015703..c6edbea2f71 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 236020031e6..f50d01492be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs index c9294b0b4e5..c03107d52ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 59397bf30fc..f589c821c40 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs index 7800467822e..fd741fa9e1a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs index 3df2c02e2ce..ec78b91f125 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index d205e86eacf..b89ff43ced7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index dc34d9582dc..54d4db6cf28 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs index cdf2bd1f0f9..1c85da68ec7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs index 5f2a3020c3d..8744ceac5ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs @@ -265,7 +265,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs index 62ae66415f1..c4ae8981958 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs @@ -156,7 +156,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs index 8a3c713fe6b..2cd7c3f946d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs index 38f1573adb2..3c5a860dd89 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 59a301721b2..0640bc68500 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index b3ddad35a07..ddec6a58568 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -215,7 +215,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs index bcfe3744a9d..78077d2bed4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs index 79873f4ddfe..6d70e97a51c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs index 5e83de8a154..c8ffe52a70a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs index 9e09e2da8ce..16df556db5d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs @@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 30bf57ef0f5..06e930e774c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 8a215aad133..da8a65b26f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs index 1a879a1d9ca..3e823100067 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs index 97939597ede..70aeea02471 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs index 3edb9a1b6dc..6a4edb3394d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs index f65f049cfd9..838f5741cf6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs index be68a50a116..bd317ad8747 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs @@ -189,7 +189,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs index 0a48e9411bc..49a0dc8ada3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs index 3a960e9925e..8fcdcaf5342 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs index 380112546ce..2313431e4d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs index 2aa81264fad..8ba9f729c01 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index a353ad7ffd7..efff1d70557 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs index 7177e9bf0b6..59c85f3e79b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 353ea1d081e..4c1b999c7f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs index d86ff21df9b..3c1138fe977 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 83e889c49ba..c30936b9684 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 1928b236bf6..1a6841a713c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs index 610859341db..32f2bbd7fa7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs index 7b026acbf1e..e82743a7151 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs index d8cd2a70ef6..0a759b37b3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs @@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs index 69568d6c87d..08214dd22b2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs index 7386cffd37d..02e7580cdcf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs @@ -314,7 +314,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index 773eba5b0a2..ab16133fe4b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs index e77d15e06bc..cf3b18a81c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 6808978c49f..ae9d8e1c05a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs index 2c74cfce99f..570e3de7f65 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 259e5e626df..70554062020 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs index caa163075e7..c3fa57791cf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs @@ -341,7 +341,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Integer (int) maximum if (this.Integer > (int)100) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 28e7729a175..8ca8d20eb0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 52099a7095e..2d4a1cd404f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs index e8cbb68e2e4..77ad8860aec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index ea18925f87e..3d5a1ff7ad8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs index 00814d11069..8933b19e210 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 51815067591..3efdf123845 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs index b2aeedc33ce..424a81efceb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs @@ -182,7 +182,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 0a0750f14cc..01215c65971 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -162,7 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs index 79a49ef91d2..72383f9de33 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs index 1995ec4b169..d9a94592395 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs index 1d4e7605066..515b498cb5b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs index 57555c37678..f2d06d7f2a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs @@ -256,7 +256,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs index aaac7b6665a..b8bb2b7bcf3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs index 0331e1c8db8..d25f420362e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 86ea32998f8..14022ef06ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -162,7 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs index 5b8c83a181d..3f5b1d5f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs @@ -202,7 +202,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs index 3209f6d6244..42ddbc5c56f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -143,7 +143,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs index 7e2a820d32c..769c3612f3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs index f70048fff04..9e624788f76 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs @@ -229,7 +229,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index d5be5ea3c92..9f2f3d60b1f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index ad59ca83286..233a10492f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs index e702e015703..c6edbea2f71 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 236020031e6..f50d01492be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs index c9294b0b4e5..c03107d52ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 59397bf30fc..f589c821c40 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs index 7800467822e..fd741fa9e1a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs index 3df2c02e2ce..ec78b91f125 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index d205e86eacf..b89ff43ced7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index dc34d9582dc..54d4db6cf28 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs index cdf2bd1f0f9..1c85da68ec7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs index 5f2a3020c3d..8744ceac5ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs @@ -265,7 +265,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs index 62ae66415f1..c4ae8981958 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs @@ -156,7 +156,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs index 8a3c713fe6b..2cd7c3f946d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs index 38f1573adb2..3c5a860dd89 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 59a301721b2..0640bc68500 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index b3ddad35a07..ddec6a58568 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -215,7 +215,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs index bcfe3744a9d..78077d2bed4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs index 79873f4ddfe..6d70e97a51c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs index 5e83de8a154..c8ffe52a70a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs index 9e09e2da8ce..16df556db5d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs @@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 30bf57ef0f5..06e930e774c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 8a215aad133..da8a65b26f5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs index 1a879a1d9ca..3e823100067 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs index 97939597ede..70aeea02471 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs index 3edb9a1b6dc..6a4edb3394d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs index f65f049cfd9..838f5741cf6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs index be68a50a116..bd317ad8747 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs @@ -189,7 +189,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs index 0a48e9411bc..49a0dc8ada3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs index 3a960e9925e..8fcdcaf5342 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs index 380112546ce..2313431e4d6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs index 2aa81264fad..8ba9f729c01 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index a353ad7ffd7..efff1d70557 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs index 7177e9bf0b6..59c85f3e79b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 353ea1d081e..4c1b999c7f1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs index d86ff21df9b..3c1138fe977 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 83e889c49ba..c30936b9684 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 1928b236bf6..1a6841a713c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs index 610859341db..32f2bbd7fa7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs index 7b026acbf1e..e82743a7151 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs index d8cd2a70ef6..0a759b37b3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs @@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs index 69568d6c87d..08214dd22b2 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs index 7386cffd37d..02e7580cdcf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs @@ -314,7 +314,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index 773eba5b0a2..ab16133fe4b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs index e77d15e06bc..cf3b18a81c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 6808978c49f..ae9d8e1c05a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs index 2c74cfce99f..570e3de7f65 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 259e5e626df..70554062020 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs index caa163075e7..c3fa57791cf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs @@ -341,7 +341,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Integer (int) maximum if (this.Integer > (int)100) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 28e7729a175..8ca8d20eb0e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 52099a7095e..2d4a1cd404f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -149,7 +149,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs index e8cbb68e2e4..77ad8860aec 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index ea18925f87e..3d5a1ff7ad8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs index 00814d11069..8933b19e210 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 51815067591..3efdf123845 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs index b2aeedc33ce..424a81efceb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs @@ -182,7 +182,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 0a0750f14cc..01215c65971 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -162,7 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs index 79a49ef91d2..72383f9de33 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs index 1995ec4b169..d9a94592395 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs index 1d4e7605066..515b498cb5b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs index 57555c37678..f2d06d7f2a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs @@ -256,7 +256,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs index aaac7b6665a..b8bb2b7bcf3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs index 0331e1c8db8..d25f420362e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 86ea32998f8..14022ef06ef 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -162,7 +162,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs index 5b8c83a181d..3f5b1d5f4c6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs @@ -202,7 +202,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs index 3209f6d6244..42ddbc5c56f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -143,7 +143,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs index 7e2a820d32c..769c3612f3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs index f70048fff04..9e624788f76 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs @@ -229,7 +229,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index d5be5ea3c92..9f2f3d60b1f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index ad59ca83286..233a10492f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -142,7 +142,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs index e702e015703..c6edbea2f71 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs @@ -120,7 +120,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 236020031e6..f50d01492be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs index c9294b0b4e5..c03107d52ee 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 59397bf30fc..f589c821c40 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -154,7 +154,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs index 7800467822e..fd741fa9e1a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs index 3df2c02e2ce..ec78b91f125 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs @@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index d205e86eacf..b89ff43ced7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index dc34d9582dc..54d4db6cf28 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs index cdf2bd1f0f9..1c85da68ec7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -136,7 +136,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs index 5f2a3020c3d..8744ceac5ba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs @@ -265,7 +265,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs index 62ae66415f1..c4ae8981958 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs @@ -156,7 +156,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs index 8a3c713fe6b..2cd7c3f946d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs index 625d71bfff7..8541bd1bcaa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs index 677b79cc20d..ff72bd6fa13 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index d7f64e083d9..1c79d469e91 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -203,7 +203,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs index 478ade5f172..c2d35120baa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs index b29884509c0..57b0b557c53 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs index 7c02585ec3f..d5b2f61f085 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Cultivar (string) pattern Regex regexCultivar = new Regex("^[a-zA-Z\\s]*$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs index 9e09e2da8ce..16df556db5d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs @@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 7bb75ee4dd7..5769a9d7ed1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 1ea6f5248b2..bf45340005d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs index 9564cd48483..a6592af0db6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs index d0053dbae2d..c9e64f85434 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs @@ -108,7 +108,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs index 3edb9a1b6dc..6a4edb3394d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs @@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs index 2971e12965e..c8f4b3d1f30 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs index 2f53c995da9..290a87a828c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs @@ -177,7 +177,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs index f348fbe855d..40d854f191e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs @@ -118,7 +118,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs index 607c2c650ed..edc61ef4f65 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -108,7 +108,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs index dff20c6266c..72048b10c7e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs @@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs index f665258c5c0..2919af9b738 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs @@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs index 58d2cec42cc..4ced8d9f535 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs @@ -135,7 +135,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs index 5ead2b7fbfa..1598cc3f2c1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs index 25aa6457216..c2b743d09c1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs index 2f877b7d389..6f9f7cf853c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs index 2a7ee6cb7b3..870008a73b0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs @@ -113,7 +113,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs index 2c3722a6b4a..c112dd03a8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs index 570047bd2e0..9a84f0354c3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs index 036f993e64a..e748e261c47 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs index d8cd2a70ef6..0a759b37b3b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs @@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs index 59f55d253de..16ebb0059fd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -161,7 +161,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs index e6b89b9b560..eed464ffac0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -299,7 +299,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs index f17be2330fd..8985aa619d4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs index 7010f9a6103..ea4c623b45b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs @@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 077da6361a9..1ee36c96866 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -124,7 +124,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs index 567bd4f778d..7d665273f1d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs @@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs index 4766548c4a5..064f7071056 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs index 58000bcfd12..f70aacdccba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs @@ -326,7 +326,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Integer (int) maximum if (this.Integer > (int)100) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs index 46de6e7e45e..eb781c032e4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs @@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 498c8226fc1..952e3eac26e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -137,7 +137,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs index 520aa05bac4..c047628a77b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs index ea18925f87e..3d5a1ff7ad8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs index 33b69997a74..091121dedc8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs index 3523c8d1644..eb7c8d83ab6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs @@ -126,7 +126,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs index 3c07f00331a..191f5cca5dd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs @@ -170,7 +170,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 392d7bc7596..b656f39cb32 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // UuidWithPattern (Guid) pattern Regex regexUuidWithPattern = new Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs index 938ffce9d00..5bb6f1e6606 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs index a6746a6136c..bb48bdd33fd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs index a620425b08e..637460dc1bf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs @@ -158,7 +158,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs index 57555c37678..f2d06d7f2a5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs @@ -256,7 +256,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs index 966a05464d1..69d866f4ec4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs @@ -112,7 +112,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs index d7ad1d2e3e6..696be60a644 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs index 308018f5d23..1b8f6f32e25 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs @@ -150,7 +150,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs index 6076f0dc9a1..c3f2e16950a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs index 53d71534985..c09babfd818 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs index 87d2eca09ae..805eb998332 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs @@ -108,7 +108,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { return this.BaseValidate(validationContext); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs index 7265694c21d..972280675fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs @@ -214,7 +214,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs index 842b87ce4b4..57d3ee6cb81 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index 1bf6cf2fdf5..b37143a767b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -130,7 +130,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs index 250852d067c..2a1b829259a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs @@ -108,7 +108,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs index 516766fc2d5..5b9c3e44188 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs index c2b7c540baa..964b8694dfa 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs index 00db6ae40fb..33370c48f51 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs @@ -139,7 +139,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs index 8c202780cc1..3dcf2168d5e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs index a40a78f7267..c234b5281e5 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs index f0d809f2153..f0ef7c92d2e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs index efc3cca8006..4a611063e1c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs @@ -111,7 +111,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs index 0f384e7452c..c920365754d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs index 874421d4655..5d0ea337223 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs @@ -253,7 +253,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs index b050792c062..6658f0098dc 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs @@ -141,7 +141,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs index 8a3c713fe6b..2cd7c3f946d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs @@ -173,7 +173,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs index cc3ceb025cb..5fabc42ec82 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs index 0a47bedfd72..7d870f6d86d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { // Name (string) pattern Regex regexName = new Regex("^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$", RegexOptions.CultureInvariant); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs index df6c3d1d138..a5757597084 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs @@ -189,7 +189,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs index cc48e919cb1..249ccf70ff0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs @@ -215,7 +215,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs index d0042987aae..4f4f4949eb1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs @@ -121,7 +121,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs index 8b03a001b07..ba02e3d2f79 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs @@ -197,7 +197,7 @@ namespace Org.OpenAPITools.Model /// /// Validation context /// Validation Result - public IEnumerable Validate(ValidationContext validationContext) + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { yield break; } From 5d490d742ae93afcd79dad9df83fd43f2cac449d Mon Sep 17 00:00:00 2001 From: Amrith Nayak Date: Mon, 10 Apr 2023 14:44:25 +0530 Subject: [PATCH 120/131] Add Flipkart as a company using OpenAPI Generator (#15175) * Adding Flipkart as a openapi generator user * chore: added flipkart company logo static asset * fix: fixed typo in users --- website/src/dynamic/users.yml | 5 +++++ website/static/img/companies/flipkart.png | Bin 0 -> 63391 bytes 2 files changed, 5 insertions(+) create mode 100644 website/static/img/companies/flipkart.png diff --git a/website/src/dynamic/users.yml b/website/src/dynamic/users.yml index 5a0d7bbf44c..8803682da6c 100644 --- a/website/src/dynamic/users.yml +++ b/website/src/dynamic/users.yml @@ -203,6 +203,11 @@ image: "img/companies/fenergo.png" infoLink: "https://www.fenergo.com/" pinned: false +- + caption: "Flipkart" + image: "img/companies/flipkart.png" + infoLink: "https://www.flipkart.com/" + pinned: false - caption: FiNC Technologies image: "img/companies/finc-technologies.png" diff --git a/website/static/img/companies/flipkart.png b/website/static/img/companies/flipkart.png new file mode 100644 index 0000000000000000000000000000000000000000..30801a6be38261845734462a0b77567f76fd131e GIT binary patch literal 63391 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 K(p7Ja1OFdImE?l} literal 0 HcmV?d00001 From e9e0f50ab6335c925a3991e192d7031669c55f1a Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Mon, 10 Apr 2023 11:16:19 +0200 Subject: [PATCH 121/131] Update customization.md (#15172) Clarify which OpenAPI Generator version exactly introduced [Set skipFormModel to true by default](https://github.com/OpenAPITools/openapi-generator/pull/8125). --- docs/customization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/customization.md b/docs/customization.md index 4b5815efed9..e79cb471e63 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -216,7 +216,7 @@ These options default to true and don't limit the generation of the feature opti When using selective generation, _only_ the templates needed for the specific generation will be used. -To skip models defined as the form parameters in "requestBody", please use `skipFormModel` (default to `true`) (this option is introduced at v3.2.2 and `true` by default starting from v5.x). +To skip models defined as the form parameters in "requestBody", please use `skipFormModel` (default to `true`) (this option is introduced at v3.2.2 and `true` by default starting from v5.0.0). ```sh --global-property skipFormModel=true From a17bb590979780c91ba75847359e879e6a4fe57d Mon Sep 17 00:00:00 2001 From: leonluc-dev Date: Mon, 10 Apr 2023 12:21:32 +0200 Subject: [PATCH 122/131] Added useSwashBuckle condition (#15157) Added useSwashBuckle condition to Swashbuckle attributes in models --- .../src/main/resources/aspnetcore/3.0/model.mustache | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache index 6f8f976f231..888955ed4bb 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache @@ -11,7 +11,9 @@ using Newtonsoft.Json; {{#model}} {{#discriminator}} using JsonSubTypes; +{{#useSwashbuckle}} using Swashbuckle.AspNetCore.Annotations; +{{/useSwashbuckle}} {{/discriminator}} {{/model}} {{/models}} @@ -27,10 +29,14 @@ namespace {{modelPackage}} [DataContract] {{#discriminator}} [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")] + {{#useSwashbuckle}} [SwaggerDiscriminator("{{{discriminatorName}}}")] + {{/useSwashbuckle}} {{#mappedModels}} [JsonSubtypes.KnownSubType(typeof({{{modelName}}}), "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")] + {{#useSwashbuckle}} [SwaggerSubType(typeof({{{modelName}}}), DiscriminatorValue = "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")] + {{/useSwashbuckle}} {{/mappedModels}} {{/discriminator}} public {{#modelClassModifier}}{{.}} {{/modelClassModifier}}class {{classname}} {{#parent}}: {{{.}}}{{^pocoModels}}, {{/pocoModels}}{{/parent}}{{^pocoModels}}{{^parent}}: {{/parent}}IEquatable<{{classname}}>{{/pocoModels}} From 2b796d5c61c996915ae929822a76b07208925436 Mon Sep 17 00:00:00 2001 From: Beppe Catanese <1771700+gcatanese@users.noreply.github.com> Date: Tue, 11 Apr 2023 08:39:08 +0200 Subject: [PATCH 123/131] [Go] Format error message only when Kind is Struct (#15154) * Check if Kind is Struct * Commit regenerated files * Tabs indentation instead of 4-space * Commit regenerated files --- .../src/main/resources/go/client.mustache | 19 ++++++++++--------- .../client/petstore/go/go-petstore/client.go | 19 ++++++++++--------- .../x-auth-id-alias/go-experimental/client.go | 19 ++++++++++--------- .../client/petstore/go/go-petstore/client.go | 19 ++++++++++--------- 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache index eeb1197939d..80fc15bfc2c 100644 --- a/modules/openapi-generator/src/main/resources/go/client.mustache +++ b/modules/openapi-generator/src/main/resources/go/client.mustache @@ -725,16 +725,17 @@ func formatErrorMessage(status string, v interface{}) string { str := "" metaValue := reflect.ValueOf(v).Elem() - field := metaValue.FieldByName("Title") - if field != (reflect.Value{}) { - str = fmt.Sprintf("%s", field.Interface()) + if metaValue.Kind() == reflect.Struct { + field := metaValue.FieldByName("Title") + if field != (reflect.Value{}) { + str = fmt.Sprintf("%s", field.Interface()) + } + + field = metaValue.FieldByName("Detail") + if field != (reflect.Value{}) { + str = fmt.Sprintf("%s (%s)", str, field.Interface()) + } } - field = metaValue.FieldByName("Detail") - if field != (reflect.Value{}) { - str = fmt.Sprintf("%s (%s)", str, field.Interface()) - } - - // status title (detail) return strings.TrimSpace(fmt.Sprintf("%s %s", status, str)) } diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go index bf4e180c44f..3209cfd0181 100644 --- a/samples/client/petstore/go/go-petstore/client.go +++ b/samples/client/petstore/go/go-petstore/client.go @@ -672,16 +672,17 @@ func formatErrorMessage(status string, v interface{}) string { str := "" metaValue := reflect.ValueOf(v).Elem() - field := metaValue.FieldByName("Title") - if field != (reflect.Value{}) { - str = fmt.Sprintf("%s", field.Interface()) + if metaValue.Kind() == reflect.Struct { + field := metaValue.FieldByName("Title") + if field != (reflect.Value{}) { + str = fmt.Sprintf("%s", field.Interface()) + } + + field = metaValue.FieldByName("Detail") + if field != (reflect.Value{}) { + str = fmt.Sprintf("%s (%s)", str, field.Interface()) + } } - field = metaValue.FieldByName("Detail") - if field != (reflect.Value{}) { - str = fmt.Sprintf("%s (%s)", str, field.Interface()) - } - - // status title (detail) return strings.TrimSpace(fmt.Sprintf("%s %s", status, str)) } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go index ed42e1f1b88..1b13ffceee0 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go @@ -640,16 +640,17 @@ func formatErrorMessage(status string, v interface{}) string { str := "" metaValue := reflect.ValueOf(v).Elem() - field := metaValue.FieldByName("Title") - if field != (reflect.Value{}) { - str = fmt.Sprintf("%s", field.Interface()) + if metaValue.Kind() == reflect.Struct { + field := metaValue.FieldByName("Title") + if field != (reflect.Value{}) { + str = fmt.Sprintf("%s", field.Interface()) + } + + field = metaValue.FieldByName("Detail") + if field != (reflect.Value{}) { + str = fmt.Sprintf("%s (%s)", str, field.Interface()) + } } - field = metaValue.FieldByName("Detail") - if field != (reflect.Value{}) { - str = fmt.Sprintf("%s (%s)", str, field.Interface()) - } - - // status title (detail) return strings.TrimSpace(fmt.Sprintf("%s %s", status, str)) } diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go index 77a8b5f0386..3df7e6b46e8 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore/client.go @@ -690,16 +690,17 @@ func formatErrorMessage(status string, v interface{}) string { str := "" metaValue := reflect.ValueOf(v).Elem() - field := metaValue.FieldByName("Title") - if field != (reflect.Value{}) { - str = fmt.Sprintf("%s", field.Interface()) + if metaValue.Kind() == reflect.Struct { + field := metaValue.FieldByName("Title") + if field != (reflect.Value{}) { + str = fmt.Sprintf("%s", field.Interface()) + } + + field = metaValue.FieldByName("Detail") + if field != (reflect.Value{}) { + str = fmt.Sprintf("%s (%s)", str, field.Interface()) + } } - field = metaValue.FieldByName("Detail") - if field != (reflect.Value{}) { - str = fmt.Sprintf("%s (%s)", str, field.Interface()) - } - - // status title (detail) return strings.TrimSpace(fmt.Sprintf("%s %s", status, str)) } From 8ce990d3d7fe484619bd91ef45907fe026751dde Mon Sep 17 00:00:00 2001 From: Ween Jiann <16207788+lwj5@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:38:58 +0800 Subject: [PATCH 124/131] [go-server] Add ability to handle parameters of `number` type (#15079) * Add ability to handle parameters of number type * Generate samples * Add handling for number without format * Regenerate samples * Fix indentation --- .../go-server/controller-api.mustache | 84 ++++++++++++++- .../main/resources/go-server/routers.mustache | 100 +++++++++++++++--- .../petstore/go-api-server/go/api_pet.go | 4 - .../petstore/go-api-server/go/api_store.go | 2 - .../petstore/go-api-server/go/api_user.go | 3 - .../petstore/go-api-server/go/routers.go | 100 +++++++++++++++--- .../petstore/go-chi-server/go/api_pet.go | 4 - .../petstore/go-chi-server/go/api_store.go | 2 - .../petstore/go-chi-server/go/api_user.go | 3 - .../petstore/go-chi-server/go/routers.go | 100 +++++++++++++++--- .../petstore/go-server-required/go/api_pet.go | 4 - .../go-server-required/go/api_store.go | 2 - .../go-server-required/go/api_user.go | 3 - .../petstore/go-server-required/go/routers.go | 100 +++++++++++++++--- 14 files changed, 415 insertions(+), 96 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache index 9fb35bb4ecd..0aebe5dca7a 100644 --- a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache @@ -89,6 +89,27 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{/hasQueryParams}} {{#allParams}} {{#isPathParam}} + {{#isNumber}} + {{paramName}}Param, err := parseFloat32Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/isNumber}} + {{#isFloat}} + {{paramName}}Param, err := parseFloat32Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/isFloat}} + {{#isDouble}} + {{paramName}}Param, err := parseFloat64Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/isDouble}} {{#isLong}} {{paramName}}Param, err := parseInt64Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}}) if err != nil { @@ -103,12 +124,40 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re return } {{/isInteger}} + {{^isNumber}} + {{^isFloat}} + {{^isDouble}} {{^isLong}} {{^isInteger}} {{paramName}}Param := {{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}} - {{/isInteger}}{{/isLong}} + {{/isInteger}} + {{/isLong}} + {{/isDouble}} + {{/isFloat}} + {{/isNumber}} {{/isPathParam}} {{#isQueryParam}} + {{#isNumber}} + {{paramName}}Param, err := parseFloat32Parameter(query.Get("{{baseName}}"), {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/isNumber}} + {{#isFloat}} + {{paramName}}Param, err := parseFloat32Parameter(query.Get("{{baseName}}"), {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/isFloat}} + {{#isDouble}} + {{paramName}}Param, err := parseFloat64Parameter(query.Get("{{baseName}}"), {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/isDouble}} {{#isLong}} {{paramName}}Param, err := parseInt64Parameter(query.Get("{{baseName}}"), {{required}}) if err != nil { @@ -131,6 +180,27 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re } {{/isBoolean}} {{#isArray}} + {{#items.isNumber}} + {{paramName}}Param, err := parseFloat32ArrayParameter(query.Get("{{baseName}}"), {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/items.isNumber}} + {{#items.isFloat}} + {{paramName}}Param, err := parseFloat32ArrayParameter(query.Get("{{baseName}}"), {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/items.isFloat}} + {{#items.isDouble}} + {{paramName}}Param, err := parseFloat64ArrayParameter(query.Get("{{baseName}}"), {{required}}) + if err != nil { + c.errorHandler(w, r, &ParsingError{Err: err}, nil) + return + } + {{/items.isDouble}} {{#items.isLong}} {{paramName}}Param, err := parseInt64ArrayParameter(query.Get("{{baseName}}"), ",", {{required}}) if err != nil { @@ -145,12 +215,21 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re return } {{/items.isInteger}} + {{^items.isNumber}} + {{^items.isFloat}} + {{^items.isDouble}} {{^items.isLong}} {{^items.isInteger}} {{paramName}}Param := strings.Split(query.Get("{{baseName}}"), ",") {{/items.isInteger}} {{/items.isLong}} + {{/items.isDouble}} + {{/items.isFloat}} + {{/items.isNumber}} {{/isArray}} + {{^isNumber}} + {{^isFloat}} + {{^isDouble}} {{^isLong}} {{^isInteger}} {{^isBoolean}} @@ -160,6 +239,9 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re {{/isBoolean}} {{/isInteger}} {{/isLong}} + {{/isDouble}} + {{/isFloat}} + {{/isNumber}} {{/isQueryParam}} {{#isFormParam}} {{#isFile}}{{#isArray}} diff --git a/modules/openapi-generator/src/main/resources/go-server/routers.mustache b/modules/openapi-generator/src/main/resources/go-server/routers.mustache index 27ba6151a50..4cd2dfc7b4d 100644 --- a/modules/openapi-generator/src/main/resources/go-server/routers.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/routers.mustache @@ -171,8 +171,8 @@ func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error return file, nil } -// parseInt64Parameter parses a string parameter to an int64. -func parseInt64Parameter(param string, required bool) (int64, error) { +// parseFloatParameter parses a string parameter to an int64. +func parseFloatParameter(param string, bitSize int, required bool) (float64, error) { if param == "" { if required { return 0, errors.New(errMsgRequiredMissing) @@ -181,25 +181,42 @@ func parseInt64Parameter(param string, required bool) (int64, error) { return 0, nil } - return strconv.ParseInt(param, 10, 64) + return strconv.ParseFloat(param, bitSize) +} + +// parseFloat64Parameter parses a string parameter to an float64. +func parseFloat64Parameter(param string, required bool) (float64, error) { + return parseFloatParameter(param, 64, required) +} + +// parseFloat32Parameter parses a string parameter to an float32. +func parseFloat32Parameter(param string, required bool) (float32, error) { + val, err := parseFloatParameter(param, 32, required) + return float32(val), err +} + +// parseIntParameter parses a string parameter to an int64. +func parseIntParameter(param string, bitSize int, required bool) (int64, error) { + if param == "" { + if required { + return 0, errors.New(errMsgRequiredMissing) + } + + return 0, nil + } + + return strconv.ParseInt(param, 10, bitSize) +} + +// parseInt64Parameter parses a string parameter to an int64. +func parseInt64Parameter(param string, required bool) (int64, error) { + return parseIntParameter(param, 64, required) } // parseInt32Parameter parses a string parameter to an int32. func parseInt32Parameter(param string, required bool) (int32, error) { - if param == "" { - if required { - return 0, errors.New(errMsgRequiredMissing) - } - - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - if err != nil { - return -1, err - } - - return int32(val), nil + val, err := parseIntParameter(param, 32, required) + return int32(val), err } // parseBoolParameter parses a string parameter to a bool @@ -220,6 +237,55 @@ func parseBoolParameter(param string, required bool) (bool, error) { return bool(val), nil } +// parseFloat64ArrayParameter parses a string parameter containing array of values to []Float64. +func parseFloat64ArrayParameter(param, delim string, required bool) ([]float64, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + floats := make([]float64, len(str)) + + for i, s := range str { + if v, err := strconv.ParseFloat(s, 64); err != nil { + return nil, err + } else { + floats[i] = v + } + } + + return floats, nil +} + +// parseFloat32ArrayParameter parses a string parameter containing array of values to []float32. +func parseFloat32ArrayParameter(param, delim string, required bool) ([]float32, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + floats := make([]float32, len(str)) + + for i, s := range str { + if v, err := strconv.ParseFloat(s, 32); err != nil { + return nil, err + } else { + floats[i] = float32(v) + } + } + + return floats, nil +} + + // parseInt64ArrayParameter parses a string parameter containing array of values to []int64. func parseInt64ArrayParameter(param, delim string, required bool) ([]int64, error) { if param == "" { diff --git a/samples/server/petstore/go-api-server/go/api_pet.go b/samples/server/petstore/go-api-server/go/api_pet.go index fb8041ee730..53d99f9a3d8 100644 --- a/samples/server/petstore/go-api-server/go/api_pet.go +++ b/samples/server/petstore/go-api-server/go/api_pet.go @@ -133,7 +133,6 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - apiKeyParam := r.Header.Get("api_key") result, err := c.service.DeletePet(r.Context(), petIdParam, apiKeyParam) // If an error occurred, encode the error with the status code @@ -185,7 +184,6 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.GetPetById(r.Context(), petIdParam) // If an error occurred, encode the error with the status code if err != nil { @@ -233,7 +231,6 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - nameParam := r.FormValue("name") statusParam := r.FormValue("status") result, err := c.service.UpdatePetWithForm(r.Context(), petIdParam, nameParam, statusParam) @@ -259,7 +256,6 @@ func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - additionalMetadataParam := r.FormValue("additionalMetadata") fileParam, err := ReadFormFileToTempFile(r, "file") diff --git a/samples/server/petstore/go-api-server/go/api_store.go b/samples/server/petstore/go-api-server/go/api_store.go index b0df49b92d3..a433e5273c2 100644 --- a/samples/server/petstore/go-api-server/go/api_store.go +++ b/samples/server/petstore/go-api-server/go/api_store.go @@ -81,7 +81,6 @@ func (c *StoreApiController) Routes() Routes { func (c *StoreApiController) DeleteOrder(w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) orderIdParam := params["orderId"] - result, err := c.service.DeleteOrder(r.Context(), orderIdParam) // If an error occurred, encode the error with the status code if err != nil { @@ -114,7 +113,6 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.GetOrderById(r.Context(), orderIdParam) // If an error occurred, encode the error with the status code if err != nil { diff --git a/samples/server/petstore/go-api-server/go/api_user.go b/samples/server/petstore/go-api-server/go/api_user.go index 5eb1f57d4be..de6f0d9e245 100644 --- a/samples/server/petstore/go-api-server/go/api_user.go +++ b/samples/server/petstore/go-api-server/go/api_user.go @@ -181,7 +181,6 @@ func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *h func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) usernameParam := params["username"] - result, err := c.service.DeleteUser(r.Context(), usernameParam) // If an error occurred, encode the error with the status code if err != nil { @@ -197,7 +196,6 @@ func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { func (c *UserApiController) GetUserByName(w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) usernameParam := params["username"] - result, err := c.service.GetUserByName(r.Context(), usernameParam) // If an error occurred, encode the error with the status code if err != nil { @@ -242,7 +240,6 @@ func (c *UserApiController) LogoutUser(w http.ResponseWriter, r *http.Request) { func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) usernameParam := params["username"] - userParam := User{} d := json.NewDecoder(r.Body) d.DisallowUnknownFields() diff --git a/samples/server/petstore/go-api-server/go/routers.go b/samples/server/petstore/go-api-server/go/routers.go index 6d4416f5654..5d63d0863a6 100644 --- a/samples/server/petstore/go-api-server/go/routers.go +++ b/samples/server/petstore/go-api-server/go/routers.go @@ -139,8 +139,8 @@ func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error return file, nil } -// parseInt64Parameter parses a string parameter to an int64. -func parseInt64Parameter(param string, required bool) (int64, error) { +// parseFloatParameter parses a string parameter to an int64. +func parseFloatParameter(param string, bitSize int, required bool) (float64, error) { if param == "" { if required { return 0, errors.New(errMsgRequiredMissing) @@ -149,25 +149,42 @@ func parseInt64Parameter(param string, required bool) (int64, error) { return 0, nil } - return strconv.ParseInt(param, 10, 64) + return strconv.ParseFloat(param, bitSize) +} + +// parseFloat64Parameter parses a string parameter to an float64. +func parseFloat64Parameter(param string, required bool) (float64, error) { + return parseFloatParameter(param, 64, required) +} + +// parseFloat32Parameter parses a string parameter to an float32. +func parseFloat32Parameter(param string, required bool) (float32, error) { + val, err := parseFloatParameter(param, 32, required) + return float32(val), err +} + +// parseIntParameter parses a string parameter to an int64. +func parseIntParameter(param string, bitSize int, required bool) (int64, error) { + if param == "" { + if required { + return 0, errors.New(errMsgRequiredMissing) + } + + return 0, nil + } + + return strconv.ParseInt(param, 10, bitSize) +} + +// parseInt64Parameter parses a string parameter to an int64. +func parseInt64Parameter(param string, required bool) (int64, error) { + return parseIntParameter(param, 64, required) } // parseInt32Parameter parses a string parameter to an int32. func parseInt32Parameter(param string, required bool) (int32, error) { - if param == "" { - if required { - return 0, errors.New(errMsgRequiredMissing) - } - - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - if err != nil { - return -1, err - } - - return int32(val), nil + val, err := parseIntParameter(param, 32, required) + return int32(val), err } // parseBoolParameter parses a string parameter to a bool @@ -188,6 +205,55 @@ func parseBoolParameter(param string, required bool) (bool, error) { return bool(val), nil } +// parseFloat64ArrayParameter parses a string parameter containing array of values to []Float64. +func parseFloat64ArrayParameter(param, delim string, required bool) ([]float64, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + floats := make([]float64, len(str)) + + for i, s := range str { + if v, err := strconv.ParseFloat(s, 64); err != nil { + return nil, err + } else { + floats[i] = v + } + } + + return floats, nil +} + +// parseFloat32ArrayParameter parses a string parameter containing array of values to []float32. +func parseFloat32ArrayParameter(param, delim string, required bool) ([]float32, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + floats := make([]float32, len(str)) + + for i, s := range str { + if v, err := strconv.ParseFloat(s, 32); err != nil { + return nil, err + } else { + floats[i] = float32(v) + } + } + + return floats, nil +} + + // parseInt64ArrayParameter parses a string parameter containing array of values to []int64. func parseInt64ArrayParameter(param, delim string, required bool) ([]int64, error) { if param == "" { diff --git a/samples/server/petstore/go-chi-server/go/api_pet.go b/samples/server/petstore/go-chi-server/go/api_pet.go index 2202804fb20..3483d83a337 100644 --- a/samples/server/petstore/go-chi-server/go/api_pet.go +++ b/samples/server/petstore/go-chi-server/go/api_pet.go @@ -132,7 +132,6 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - apiKeyParam := r.Header.Get("api_key") result, err := c.service.DeletePet(r.Context(), petIdParam, apiKeyParam) // If an error occurred, encode the error with the status code @@ -183,7 +182,6 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.GetPetById(r.Context(), petIdParam) // If an error occurred, encode the error with the status code if err != nil { @@ -230,7 +228,6 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - nameParam := r.FormValue("name") statusParam := r.FormValue("status") result, err := c.service.UpdatePetWithForm(r.Context(), petIdParam, nameParam, statusParam) @@ -255,7 +252,6 @@ func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - additionalMetadataParam := r.FormValue("additionalMetadata") fileParam, err := ReadFormFileToTempFile(r, "file") diff --git a/samples/server/petstore/go-chi-server/go/api_store.go b/samples/server/petstore/go-chi-server/go/api_store.go index 67a30090afb..a2badb302f4 100644 --- a/samples/server/petstore/go-chi-server/go/api_store.go +++ b/samples/server/petstore/go-chi-server/go/api_store.go @@ -80,7 +80,6 @@ func (c *StoreApiController) Routes() Routes { // DeleteOrder - Delete purchase order by ID func (c *StoreApiController) DeleteOrder(w http.ResponseWriter, r *http.Request) { orderIdParam := chi.URLParam(r, "orderId") - result, err := c.service.DeleteOrder(r.Context(), orderIdParam) // If an error occurred, encode the error with the status code if err != nil { @@ -112,7 +111,6 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.GetOrderById(r.Context(), orderIdParam) // If an error occurred, encode the error with the status code if err != nil { diff --git a/samples/server/petstore/go-chi-server/go/api_user.go b/samples/server/petstore/go-chi-server/go/api_user.go index a48ab1c454a..2fd697af177 100644 --- a/samples/server/petstore/go-chi-server/go/api_user.go +++ b/samples/server/petstore/go-chi-server/go/api_user.go @@ -180,7 +180,6 @@ func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *h // DeleteUser - Delete user func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { usernameParam := chi.URLParam(r, "username") - result, err := c.service.DeleteUser(r.Context(), usernameParam) // If an error occurred, encode the error with the status code if err != nil { @@ -195,7 +194,6 @@ func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { // GetUserByName - Get user by user name func (c *UserApiController) GetUserByName(w http.ResponseWriter, r *http.Request) { usernameParam := chi.URLParam(r, "username") - result, err := c.service.GetUserByName(r.Context(), usernameParam) // If an error occurred, encode the error with the status code if err != nil { @@ -239,7 +237,6 @@ func (c *UserApiController) LogoutUser(w http.ResponseWriter, r *http.Request) { // UpdateUser - Updated user func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) { usernameParam := chi.URLParam(r, "username") - userParam := User{} d := json.NewDecoder(r.Body) d.DisallowUnknownFields() diff --git a/samples/server/petstore/go-chi-server/go/routers.go b/samples/server/petstore/go-chi-server/go/routers.go index 5f3463d18c0..e93532903a5 100644 --- a/samples/server/petstore/go-chi-server/go/routers.go +++ b/samples/server/petstore/go-chi-server/go/routers.go @@ -135,8 +135,8 @@ func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error return file, nil } -// parseInt64Parameter parses a string parameter to an int64. -func parseInt64Parameter(param string, required bool) (int64, error) { +// parseFloatParameter parses a string parameter to an int64. +func parseFloatParameter(param string, bitSize int, required bool) (float64, error) { if param == "" { if required { return 0, errors.New(errMsgRequiredMissing) @@ -145,25 +145,42 @@ func parseInt64Parameter(param string, required bool) (int64, error) { return 0, nil } - return strconv.ParseInt(param, 10, 64) + return strconv.ParseFloat(param, bitSize) +} + +// parseFloat64Parameter parses a string parameter to an float64. +func parseFloat64Parameter(param string, required bool) (float64, error) { + return parseFloatParameter(param, 64, required) +} + +// parseFloat32Parameter parses a string parameter to an float32. +func parseFloat32Parameter(param string, required bool) (float32, error) { + val, err := parseFloatParameter(param, 32, required) + return float32(val), err +} + +// parseIntParameter parses a string parameter to an int64. +func parseIntParameter(param string, bitSize int, required bool) (int64, error) { + if param == "" { + if required { + return 0, errors.New(errMsgRequiredMissing) + } + + return 0, nil + } + + return strconv.ParseInt(param, 10, bitSize) +} + +// parseInt64Parameter parses a string parameter to an int64. +func parseInt64Parameter(param string, required bool) (int64, error) { + return parseIntParameter(param, 64, required) } // parseInt32Parameter parses a string parameter to an int32. func parseInt32Parameter(param string, required bool) (int32, error) { - if param == "" { - if required { - return 0, errors.New(errMsgRequiredMissing) - } - - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - if err != nil { - return -1, err - } - - return int32(val), nil + val, err := parseIntParameter(param, 32, required) + return int32(val), err } // parseBoolParameter parses a string parameter to a bool @@ -184,6 +201,55 @@ func parseBoolParameter(param string, required bool) (bool, error) { return bool(val), nil } +// parseFloat64ArrayParameter parses a string parameter containing array of values to []Float64. +func parseFloat64ArrayParameter(param, delim string, required bool) ([]float64, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + floats := make([]float64, len(str)) + + for i, s := range str { + if v, err := strconv.ParseFloat(s, 64); err != nil { + return nil, err + } else { + floats[i] = v + } + } + + return floats, nil +} + +// parseFloat32ArrayParameter parses a string parameter containing array of values to []float32. +func parseFloat32ArrayParameter(param, delim string, required bool) ([]float32, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + floats := make([]float32, len(str)) + + for i, s := range str { + if v, err := strconv.ParseFloat(s, 32); err != nil { + return nil, err + } else { + floats[i] = float32(v) + } + } + + return floats, nil +} + + // parseInt64ArrayParameter parses a string parameter containing array of values to []int64. func parseInt64ArrayParameter(param, delim string, required bool) ([]int64, error) { if param == "" { diff --git a/samples/server/petstore/go-server-required/go/api_pet.go b/samples/server/petstore/go-server-required/go/api_pet.go index 2202804fb20..3483d83a337 100644 --- a/samples/server/petstore/go-server-required/go/api_pet.go +++ b/samples/server/petstore/go-server-required/go/api_pet.go @@ -132,7 +132,6 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - apiKeyParam := r.Header.Get("api_key") result, err := c.service.DeletePet(r.Context(), petIdParam, apiKeyParam) // If an error occurred, encode the error with the status code @@ -183,7 +182,6 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.GetPetById(r.Context(), petIdParam) // If an error occurred, encode the error with the status code if err != nil { @@ -230,7 +228,6 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - nameParam := r.FormValue("name") statusParam := r.FormValue("status") result, err := c.service.UpdatePetWithForm(r.Context(), petIdParam, nameParam, statusParam) @@ -255,7 +252,6 @@ func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) { c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - additionalMetadataParam := r.FormValue("additionalMetadata") fileParam, err := ReadFormFileToTempFile(r, "file") diff --git a/samples/server/petstore/go-server-required/go/api_store.go b/samples/server/petstore/go-server-required/go/api_store.go index 67a30090afb..a2badb302f4 100644 --- a/samples/server/petstore/go-server-required/go/api_store.go +++ b/samples/server/petstore/go-server-required/go/api_store.go @@ -80,7 +80,6 @@ func (c *StoreApiController) Routes() Routes { // DeleteOrder - Delete purchase order by ID func (c *StoreApiController) DeleteOrder(w http.ResponseWriter, r *http.Request) { orderIdParam := chi.URLParam(r, "orderId") - result, err := c.service.DeleteOrder(r.Context(), orderIdParam) // If an error occurred, encode the error with the status code if err != nil { @@ -112,7 +111,6 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request c.errorHandler(w, r, &ParsingError{Err: err}, nil) return } - result, err := c.service.GetOrderById(r.Context(), orderIdParam) // If an error occurred, encode the error with the status code if err != nil { diff --git a/samples/server/petstore/go-server-required/go/api_user.go b/samples/server/petstore/go-server-required/go/api_user.go index a48ab1c454a..2fd697af177 100644 --- a/samples/server/petstore/go-server-required/go/api_user.go +++ b/samples/server/petstore/go-server-required/go/api_user.go @@ -180,7 +180,6 @@ func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *h // DeleteUser - Delete user func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { usernameParam := chi.URLParam(r, "username") - result, err := c.service.DeleteUser(r.Context(), usernameParam) // If an error occurred, encode the error with the status code if err != nil { @@ -195,7 +194,6 @@ func (c *UserApiController) DeleteUser(w http.ResponseWriter, r *http.Request) { // GetUserByName - Get user by user name func (c *UserApiController) GetUserByName(w http.ResponseWriter, r *http.Request) { usernameParam := chi.URLParam(r, "username") - result, err := c.service.GetUserByName(r.Context(), usernameParam) // If an error occurred, encode the error with the status code if err != nil { @@ -239,7 +237,6 @@ func (c *UserApiController) LogoutUser(w http.ResponseWriter, r *http.Request) { // UpdateUser - Updated user func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) { usernameParam := chi.URLParam(r, "username") - userParam := User{} d := json.NewDecoder(r.Body) d.DisallowUnknownFields() diff --git a/samples/server/petstore/go-server-required/go/routers.go b/samples/server/petstore/go-server-required/go/routers.go index 5f3463d18c0..e93532903a5 100644 --- a/samples/server/petstore/go-server-required/go/routers.go +++ b/samples/server/petstore/go-server-required/go/routers.go @@ -135,8 +135,8 @@ func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error return file, nil } -// parseInt64Parameter parses a string parameter to an int64. -func parseInt64Parameter(param string, required bool) (int64, error) { +// parseFloatParameter parses a string parameter to an int64. +func parseFloatParameter(param string, bitSize int, required bool) (float64, error) { if param == "" { if required { return 0, errors.New(errMsgRequiredMissing) @@ -145,25 +145,42 @@ func parseInt64Parameter(param string, required bool) (int64, error) { return 0, nil } - return strconv.ParseInt(param, 10, 64) + return strconv.ParseFloat(param, bitSize) +} + +// parseFloat64Parameter parses a string parameter to an float64. +func parseFloat64Parameter(param string, required bool) (float64, error) { + return parseFloatParameter(param, 64, required) +} + +// parseFloat32Parameter parses a string parameter to an float32. +func parseFloat32Parameter(param string, required bool) (float32, error) { + val, err := parseFloatParameter(param, 32, required) + return float32(val), err +} + +// parseIntParameter parses a string parameter to an int64. +func parseIntParameter(param string, bitSize int, required bool) (int64, error) { + if param == "" { + if required { + return 0, errors.New(errMsgRequiredMissing) + } + + return 0, nil + } + + return strconv.ParseInt(param, 10, bitSize) +} + +// parseInt64Parameter parses a string parameter to an int64. +func parseInt64Parameter(param string, required bool) (int64, error) { + return parseIntParameter(param, 64, required) } // parseInt32Parameter parses a string parameter to an int32. func parseInt32Parameter(param string, required bool) (int32, error) { - if param == "" { - if required { - return 0, errors.New(errMsgRequiredMissing) - } - - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - if err != nil { - return -1, err - } - - return int32(val), nil + val, err := parseIntParameter(param, 32, required) + return int32(val), err } // parseBoolParameter parses a string parameter to a bool @@ -184,6 +201,55 @@ func parseBoolParameter(param string, required bool) (bool, error) { return bool(val), nil } +// parseFloat64ArrayParameter parses a string parameter containing array of values to []Float64. +func parseFloat64ArrayParameter(param, delim string, required bool) ([]float64, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + floats := make([]float64, len(str)) + + for i, s := range str { + if v, err := strconv.ParseFloat(s, 64); err != nil { + return nil, err + } else { + floats[i] = v + } + } + + return floats, nil +} + +// parseFloat32ArrayParameter parses a string parameter containing array of values to []float32. +func parseFloat32ArrayParameter(param, delim string, required bool) ([]float32, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + floats := make([]float32, len(str)) + + for i, s := range str { + if v, err := strconv.ParseFloat(s, 32); err != nil { + return nil, err + } else { + floats[i] = float32(v) + } + } + + return floats, nil +} + + // parseInt64ArrayParameter parses a string parameter containing array of values to []int64. func parseInt64ArrayParameter(param, delim string, required bool) ([]int64, error) { if param == "" { From 81cafdc196674f38f15a9e617878247a829657b9 Mon Sep 17 00:00:00 2001 From: Ween Jiann <16207788+lwj5@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:39:53 +0800 Subject: [PATCH 125/131] [go] Fix: reservedWordsMappings not checked for reserved word (#15083) * Fix: reservedWordsMappings not checked for reserved word * Fix coding issue --- .../openapitools/codegen/languages/AbstractGoCodegen.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java index a72ca4a6f35..9e7c78f8db4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java @@ -145,8 +145,6 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege "float32", "float64") ); - importMapping = new HashMap<>(); - cliOptions.clear(); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Go package name (convention: lowercase).") .defaultValue("openapi")); @@ -225,7 +223,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege @Override protected boolean isReservedWord(String word) { - return word != null && reservedWords.contains(word); + return word != null && (reservedWords.contains(word) || reservedWordsMappings().containsKey(word)); } @Override @@ -407,7 +405,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege public String getSchemaType(Schema p) { String openAPIType = super.getSchemaType(p); String ref = p.get$ref(); - String type = null; + String type; if (ref != null && !ref.isEmpty()) { type = toModelName(openAPIType); From f8cb5fde9738be79219841aa2157e16eb479ef6a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 11 Apr 2023 17:43:39 +0800 Subject: [PATCH 126/131] Add tests for aspnetcore 6.0 useSwashBuckle option (#15176) * add test for aspnetcore 6.0 useSwashBuckle option * update samples * update petstore with more tests * add options * update samples * remove unused files --- .github/workflows/samples-dotnet.yaml | 3 + .../aspnetcore-6.0-useSwashBuckle.yaml | 11 + .../resources/3_0/aspnetcore/petstore.yaml | 29 ++ .../aspnetcore-3.0/.openapi-generator/FILES | 5 + .../src/Org.OpenAPITools/Models/Animal.cs | 142 +++++++ .../src/Org.OpenAPITools/Models/Cat.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/CatAllOf.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/Dog.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/DogAllOf.cs | 119 ++++++ .../wwwroot/openapi-original.json | 52 +++ .../aspnetcore-3.1/.openapi-generator/FILES | 5 + .../src/Org.OpenAPITools/Models/Animal.cs | 142 +++++++ .../src/Org.OpenAPITools/Models/Cat.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/CatAllOf.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/Dog.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/DogAllOf.cs | 119 ++++++ .../wwwroot/openapi-original.json | 52 +++ .../aspnetcore-5.0/.openapi-generator/FILES | 5 + .../src/Org.OpenAPITools/Models/Animal.cs | 142 +++++++ .../src/Org.OpenAPITools/Models/Cat.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/CatAllOf.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/Dog.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/DogAllOf.cs | 119 ++++++ .../wwwroot/openapi-original.json | 52 +++ .../.openapi-generator/FILES | 5 + .../src/Org.OpenAPITools/Models/Animal.cs | 51 +++ .../src/Org.OpenAPITools/Models/Cat.cs | 36 ++ .../src/Org.OpenAPITools/Models/CatAllOf.cs | 36 ++ .../src/Org.OpenAPITools/Models/Dog.cs | 36 ++ .../src/Org.OpenAPITools/Models/DogAllOf.cs | 36 ++ .../wwwroot/openapi-original.json | 52 +++ .../.openapi-generator/FILES | 5 + .../src/Org.OpenAPITools.Models/Animal.cs | 142 +++++++ .../src/Org.OpenAPITools.Models/Cat.cs | 119 ++++++ .../src/Org.OpenAPITools.Models/CatAllOf.cs | 119 ++++++ .../src/Org.OpenAPITools.Models/Dog.cs | 119 ++++++ .../src/Org.OpenAPITools.Models/DogAllOf.cs | 119 ++++++ .../wwwroot/openapi-original.json | 52 +++ .../.openapi-generator-ignore | 23 ++ .../.openapi-generator/FILES | 27 ++ .../.openapi-generator/VERSION | 1 + .../Org.OpenAPITools.sln | 22 ++ .../aspnetcore-6.0-useSwashBuckle/README.md | 43 +++ .../aspnetcore-6.0-useSwashBuckle/build.bat | 9 + .../aspnetcore-6.0-useSwashBuckle/build.sh | 8 + .../src/Org.OpenAPITools/.gitignore | 362 ++++++++++++++++++ .../Attributes/ValidateModelStateAttribute.cs | 61 +++ .../Authentication/ApiAuthentication.cs | 62 +++ .../Org.OpenAPITools/Controllers/FakeApi.cs | 38 ++ .../Org.OpenAPITools/Controllers/PetApi.cs | 136 +++++++ .../Org.OpenAPITools/Controllers/StoreApi.cs | 79 ++++ .../Org.OpenAPITools/Controllers/UserApi.cs | 129 +++++++ .../Converters/CustomEnumConverter.cs | 42 ++ .../Formatters/InputFormatterStream.cs | 32 ++ .../src/Org.OpenAPITools/Models/Animal.cs | 138 +++++++ .../Org.OpenAPITools/Models/ApiResponse.cs | 147 +++++++ .../src/Org.OpenAPITools/Models/Cat.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/CatAllOf.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/Category.cs | 134 +++++++ .../src/Org.OpenAPITools/Models/Dog.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/DogAllOf.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/Order.cs | 219 +++++++++++ .../src/Org.OpenAPITools/Models/Pet.cs | 224 +++++++++++ .../src/Org.OpenAPITools/Models/Tag.cs | 133 +++++++ .../src/Org.OpenAPITools/Models/User.cs | 218 +++++++++++ .../OpenApi/TypeExtensions.cs | 51 +++ .../Org.OpenAPITools/Org.OpenAPITools.csproj | 26 ++ .../Org.OpenAPITools/Org.OpenAPITools.nuspec | 20 + .../aspnetcore-6.0/.openapi-generator/FILES | 5 + .../src/Org.OpenAPITools/Models/Animal.cs | 142 +++++++ .../src/Org.OpenAPITools/Models/Cat.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/CatAllOf.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/Dog.cs | 119 ++++++ .../src/Org.OpenAPITools/Models/DogAllOf.cs | 119 ++++++ .../wwwroot/openapi-original.json | 52 +++ 75 files changed, 6530 insertions(+) create mode 100644 bin/configs/aspnetcore-6.0-useSwashBuckle.yaml create mode 100644 samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Animal.cs create mode 100644 samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Cat.cs create mode 100644 samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/CatAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Dog.cs create mode 100644 samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/DogAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Animal.cs create mode 100644 samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Cat.cs create mode 100644 samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/CatAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Dog.cs create mode 100644 samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/DogAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Animal.cs create mode 100644 samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Cat.cs create mode 100644 samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/CatAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Dog.cs create mode 100644 samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/DogAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Animal.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Cat.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/CatAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Dog.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/DogAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Animal.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Cat.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/CatAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Dog.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/DogAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator-ignore create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator/FILES create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator/VERSION create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/Org.OpenAPITools.sln create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/README.md create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/build.bat create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/build.sh create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/.gitignore create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Attributes/ValidateModelStateAttribute.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Formatters/InputFormatterStream.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Animal.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/ApiResponse.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Cat.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/CatAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Category.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Dog.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/DogAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Order.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Pet.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Tag.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/User.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/OpenApi/TypeExtensions.cs create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj create mode 100644 samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.nuspec create mode 100644 samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Animal.cs create mode 100644 samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Cat.cs create mode 100644 samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/CatAllOf.cs create mode 100644 samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Dog.cs create mode 100644 samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/DogAllOf.cs diff --git a/.github/workflows/samples-dotnet.yaml b/.github/workflows/samples-dotnet.yaml index c345dad2829..ea2d5b6d2cc 100644 --- a/.github/workflows/samples-dotnet.yaml +++ b/.github/workflows/samples-dotnet.yaml @@ -7,12 +7,14 @@ on: - 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/' - 'samples/server/petstore/aspnetcore-6.0/**' - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' + - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' pull_request: paths: - 'samples/client/petstore/csharp-netcore/**net6.0**/' - 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/' - 'samples/server/petstore/aspnetcore-6.0/**' - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' + - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' jobs: build: name: Build .Net projects @@ -30,6 +32,7 @@ jobs: - samples/server/petstore/aspnetcore-6.0 - samples/server/petstore/aspnetcore-6.0-pocoModels - samples/server/petstore/aspnetcore-6.0-project4Models + - samples/server/petstore/aspnetcore-6.0-useSwashBuckle steps: - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v3.0.3 diff --git a/bin/configs/aspnetcore-6.0-useSwashBuckle.yaml b/bin/configs/aspnetcore-6.0-useSwashBuckle.yaml new file mode 100644 index 00000000000..e0e873e8ec4 --- /dev/null +++ b/bin/configs/aspnetcore-6.0-useSwashBuckle.yaml @@ -0,0 +1,11 @@ +generatorName: aspnetcore +outputDir: samples/server/petstore/aspnetcore-6.0-useSwashBuckle +inputSpec: modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0 +additionalProperties: + packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}' + aspnetCoreVersion: "6.0" + userSecretsGuid: 'cb87e868-8646-48ef-9bb6-344b537d0d37' + useSwashBuckle: false + buildTarget: library + isLibrary: true diff --git a/modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml index c0ca877d6f9..1ba98052485 100644 --- a/modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml @@ -752,3 +752,32 @@ components: type: string message: type: string + Dog: + allOf: + - $ref: '#/components/schemas/Animal' + - type: object + properties: + breed: + type: string + Cat: + allOf: + - $ref: '#/components/schemas/Animal' + - type: object + properties: + declawed: + type: boolean + Animal: + type: object + discriminator: + propertyName: className + mapping: + DOG: '#/components/schemas/Dog' + CAT: '#/components/schemas/Cat' + required: + - className + properties: + className: + type: string + color: + type: string + default: red diff --git a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/FILES b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/FILES index 8dc5fd25605..f36d2528d09 100644 --- a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/FILES +++ b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/FILES @@ -14,8 +14,13 @@ src/Org.OpenAPITools/Dockerfile src/Org.OpenAPITools/Filters/BasePathFilter.cs src/Org.OpenAPITools/Filters/GeneratePathParamsValidationFilter.cs src/Org.OpenAPITools/Formatters/InputFormatterStream.cs +src/Org.OpenAPITools/Models/Animal.cs src/Org.OpenAPITools/Models/ApiResponse.cs +src/Org.OpenAPITools/Models/Cat.cs +src/Org.OpenAPITools/Models/CatAllOf.cs src/Org.OpenAPITools/Models/Category.cs +src/Org.OpenAPITools/Models/Dog.cs +src/Org.OpenAPITools/Models/DogAllOf.cs src/Org.OpenAPITools/Models/Order.cs src/Org.OpenAPITools/Models/Pet.cs src/Org.OpenAPITools/Models/Tag.cs diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Animal.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Animal.cs new file mode 100644 index 00000000000..01f525396dc --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Animal.cs @@ -0,0 +1,142 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using JsonSubTypes; +using Swashbuckle.AspNetCore.Annotations; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + [JsonConverter(typeof(JsonSubtypes), "ClassName")] + [SwaggerDiscriminator("ClassName")] + [JsonSubtypes.KnownSubType(typeof(Cat), "CAT")] + [SwaggerSubType(typeof(Cat), DiscriminatorValue = "CAT")] + [JsonSubtypes.KnownSubType(typeof(Dog), "DOG")] + [SwaggerSubType(typeof(Dog), DiscriminatorValue = "DOG")] + public partial class Animal : IEquatable + { + /// + /// Gets or Sets ClassName + /// + [Required] + [DataMember(Name="className", EmitDefaultValue=false)] + public string ClassName { get; set; } + + /// + /// Gets or Sets Color + /// + [DataMember(Name="color", EmitDefaultValue=false)] + public string Color { get; set; } = "red"; + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Animal {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append(" Color: ").Append(Color).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Animal)obj); + } + + /// + /// Returns true if Animal instances are equal + /// + /// Instance of Animal to be compared + /// Boolean + public bool Equals(Animal other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + ClassName == other.ClassName || + ClassName != null && + ClassName.Equals(other.ClassName) + ) && + ( + Color == other.Color || + Color != null && + Color.Equals(other.Color) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (ClassName != null) + hashCode = hashCode * 59 + ClassName.GetHashCode(); + if (Color != null) + hashCode = hashCode * 59 + Color.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Animal left, Animal right) + { + return Equals(left, right); + } + + public static bool operator !=(Animal left, Animal right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Cat.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Cat.cs new file mode 100644 index 00000000000..9bb95fe5a4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Cat.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Cat : Animal, IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Cat {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Cat)obj); + } + + /// + /// Returns true if Cat instances are equal + /// + /// Instance of Cat to be compared + /// Boolean + public bool Equals(Cat other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Cat left, Cat right) + { + return Equals(left, right); + } + + public static bool operator !=(Cat left, Cat right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/CatAllOf.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/CatAllOf.cs new file mode 100644 index 00000000000..ca2b213b0cf --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/CatAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class CatAllOf : IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((CatAllOf)obj); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(CatAllOf left, CatAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(CatAllOf left, CatAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Dog.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Dog.cs new file mode 100644 index 00000000000..ff3a582cc13 --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Dog.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Dog : Animal, IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Dog {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Dog)obj); + } + + /// + /// Returns true if Dog instances are equal + /// + /// Instance of Dog to be compared + /// Boolean + public bool Equals(Dog other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Dog left, Dog right) + { + return Equals(left, right); + } + + public static bool operator !=(Dog left, Dog right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/DogAllOf.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/DogAllOf.cs new file mode 100644 index 00000000000..6be8ff2fe4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/DogAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class DogAllOf : IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((DogAllOf)obj); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(DogAllOf left, DogAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(DogAllOf left, DogAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json index 0ccbb4c793c..53d1a8e9b10 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -1048,6 +1048,40 @@ "title" : "An uploaded response", "type" : "object" }, + "Dog" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Dog_allOf" + } ] + }, + "Cat" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Cat_allOf" + } ] + }, + "Animal" : { + "discriminator" : { + "mapping" : { + "DOG" : "#/components/schemas/Dog", + "CAT" : "#/components/schemas/Cat" + }, + "propertyName" : "className" + }, + "properties" : { + "className" : { + "type" : "string" + }, + "color" : { + "default" : "red", + "type" : "string" + } + }, + "required" : [ "className" ], + "type" : "object" + }, "updatePetWithForm_request" : { "properties" : { "name" : { @@ -1074,6 +1108,24 @@ } }, "type" : "object" + }, + "Dog_allOf" : { + "properties" : { + "breed" : { + "type" : "string" + } + }, + "type" : "object", + "example" : null + }, + "Cat_allOf" : { + "properties" : { + "declawed" : { + "type" : "boolean" + } + }, + "type" : "object", + "example" : null } }, "securitySchemes" : { diff --git a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/FILES b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/FILES index 8dc5fd25605..f36d2528d09 100644 --- a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/FILES +++ b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/FILES @@ -14,8 +14,13 @@ src/Org.OpenAPITools/Dockerfile src/Org.OpenAPITools/Filters/BasePathFilter.cs src/Org.OpenAPITools/Filters/GeneratePathParamsValidationFilter.cs src/Org.OpenAPITools/Formatters/InputFormatterStream.cs +src/Org.OpenAPITools/Models/Animal.cs src/Org.OpenAPITools/Models/ApiResponse.cs +src/Org.OpenAPITools/Models/Cat.cs +src/Org.OpenAPITools/Models/CatAllOf.cs src/Org.OpenAPITools/Models/Category.cs +src/Org.OpenAPITools/Models/Dog.cs +src/Org.OpenAPITools/Models/DogAllOf.cs src/Org.OpenAPITools/Models/Order.cs src/Org.OpenAPITools/Models/Pet.cs src/Org.OpenAPITools/Models/Tag.cs diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Animal.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Animal.cs new file mode 100644 index 00000000000..01f525396dc --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Animal.cs @@ -0,0 +1,142 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using JsonSubTypes; +using Swashbuckle.AspNetCore.Annotations; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + [JsonConverter(typeof(JsonSubtypes), "ClassName")] + [SwaggerDiscriminator("ClassName")] + [JsonSubtypes.KnownSubType(typeof(Cat), "CAT")] + [SwaggerSubType(typeof(Cat), DiscriminatorValue = "CAT")] + [JsonSubtypes.KnownSubType(typeof(Dog), "DOG")] + [SwaggerSubType(typeof(Dog), DiscriminatorValue = "DOG")] + public partial class Animal : IEquatable + { + /// + /// Gets or Sets ClassName + /// + [Required] + [DataMember(Name="className", EmitDefaultValue=false)] + public string ClassName { get; set; } + + /// + /// Gets or Sets Color + /// + [DataMember(Name="color", EmitDefaultValue=false)] + public string Color { get; set; } = "red"; + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Animal {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append(" Color: ").Append(Color).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Animal)obj); + } + + /// + /// Returns true if Animal instances are equal + /// + /// Instance of Animal to be compared + /// Boolean + public bool Equals(Animal other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + ClassName == other.ClassName || + ClassName != null && + ClassName.Equals(other.ClassName) + ) && + ( + Color == other.Color || + Color != null && + Color.Equals(other.Color) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (ClassName != null) + hashCode = hashCode * 59 + ClassName.GetHashCode(); + if (Color != null) + hashCode = hashCode * 59 + Color.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Animal left, Animal right) + { + return Equals(left, right); + } + + public static bool operator !=(Animal left, Animal right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Cat.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Cat.cs new file mode 100644 index 00000000000..9bb95fe5a4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Cat.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Cat : Animal, IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Cat {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Cat)obj); + } + + /// + /// Returns true if Cat instances are equal + /// + /// Instance of Cat to be compared + /// Boolean + public bool Equals(Cat other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Cat left, Cat right) + { + return Equals(left, right); + } + + public static bool operator !=(Cat left, Cat right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/CatAllOf.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/CatAllOf.cs new file mode 100644 index 00000000000..ca2b213b0cf --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/CatAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class CatAllOf : IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((CatAllOf)obj); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(CatAllOf left, CatAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(CatAllOf left, CatAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Dog.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Dog.cs new file mode 100644 index 00000000000..ff3a582cc13 --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Dog.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Dog : Animal, IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Dog {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Dog)obj); + } + + /// + /// Returns true if Dog instances are equal + /// + /// Instance of Dog to be compared + /// Boolean + public bool Equals(Dog other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Dog left, Dog right) + { + return Equals(left, right); + } + + public static bool operator !=(Dog left, Dog right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/DogAllOf.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/DogAllOf.cs new file mode 100644 index 00000000000..6be8ff2fe4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/DogAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class DogAllOf : IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((DogAllOf)obj); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(DogAllOf left, DogAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(DogAllOf left, DogAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json index 0ccbb4c793c..53d1a8e9b10 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -1048,6 +1048,40 @@ "title" : "An uploaded response", "type" : "object" }, + "Dog" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Dog_allOf" + } ] + }, + "Cat" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Cat_allOf" + } ] + }, + "Animal" : { + "discriminator" : { + "mapping" : { + "DOG" : "#/components/schemas/Dog", + "CAT" : "#/components/schemas/Cat" + }, + "propertyName" : "className" + }, + "properties" : { + "className" : { + "type" : "string" + }, + "color" : { + "default" : "red", + "type" : "string" + } + }, + "required" : [ "className" ], + "type" : "object" + }, "updatePetWithForm_request" : { "properties" : { "name" : { @@ -1074,6 +1108,24 @@ } }, "type" : "object" + }, + "Dog_allOf" : { + "properties" : { + "breed" : { + "type" : "string" + } + }, + "type" : "object", + "example" : null + }, + "Cat_allOf" : { + "properties" : { + "declawed" : { + "type" : "boolean" + } + }, + "type" : "object", + "example" : null } }, "securitySchemes" : { diff --git a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/FILES b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/FILES index 8dc5fd25605..f36d2528d09 100644 --- a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/FILES +++ b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/FILES @@ -14,8 +14,13 @@ src/Org.OpenAPITools/Dockerfile src/Org.OpenAPITools/Filters/BasePathFilter.cs src/Org.OpenAPITools/Filters/GeneratePathParamsValidationFilter.cs src/Org.OpenAPITools/Formatters/InputFormatterStream.cs +src/Org.OpenAPITools/Models/Animal.cs src/Org.OpenAPITools/Models/ApiResponse.cs +src/Org.OpenAPITools/Models/Cat.cs +src/Org.OpenAPITools/Models/CatAllOf.cs src/Org.OpenAPITools/Models/Category.cs +src/Org.OpenAPITools/Models/Dog.cs +src/Org.OpenAPITools/Models/DogAllOf.cs src/Org.OpenAPITools/Models/Order.cs src/Org.OpenAPITools/Models/Pet.cs src/Org.OpenAPITools/Models/Tag.cs diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Animal.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Animal.cs new file mode 100644 index 00000000000..01f525396dc --- /dev/null +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Animal.cs @@ -0,0 +1,142 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using JsonSubTypes; +using Swashbuckle.AspNetCore.Annotations; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + [JsonConverter(typeof(JsonSubtypes), "ClassName")] + [SwaggerDiscriminator("ClassName")] + [JsonSubtypes.KnownSubType(typeof(Cat), "CAT")] + [SwaggerSubType(typeof(Cat), DiscriminatorValue = "CAT")] + [JsonSubtypes.KnownSubType(typeof(Dog), "DOG")] + [SwaggerSubType(typeof(Dog), DiscriminatorValue = "DOG")] + public partial class Animal : IEquatable + { + /// + /// Gets or Sets ClassName + /// + [Required] + [DataMember(Name="className", EmitDefaultValue=false)] + public string ClassName { get; set; } + + /// + /// Gets or Sets Color + /// + [DataMember(Name="color", EmitDefaultValue=false)] + public string Color { get; set; } = "red"; + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Animal {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append(" Color: ").Append(Color).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Animal)obj); + } + + /// + /// Returns true if Animal instances are equal + /// + /// Instance of Animal to be compared + /// Boolean + public bool Equals(Animal other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + ClassName == other.ClassName || + ClassName != null && + ClassName.Equals(other.ClassName) + ) && + ( + Color == other.Color || + Color != null && + Color.Equals(other.Color) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (ClassName != null) + hashCode = hashCode * 59 + ClassName.GetHashCode(); + if (Color != null) + hashCode = hashCode * 59 + Color.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Animal left, Animal right) + { + return Equals(left, right); + } + + public static bool operator !=(Animal left, Animal right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Cat.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Cat.cs new file mode 100644 index 00000000000..9bb95fe5a4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Cat.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Cat : Animal, IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Cat {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Cat)obj); + } + + /// + /// Returns true if Cat instances are equal + /// + /// Instance of Cat to be compared + /// Boolean + public bool Equals(Cat other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Cat left, Cat right) + { + return Equals(left, right); + } + + public static bool operator !=(Cat left, Cat right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/CatAllOf.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/CatAllOf.cs new file mode 100644 index 00000000000..ca2b213b0cf --- /dev/null +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/CatAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class CatAllOf : IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((CatAllOf)obj); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(CatAllOf left, CatAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(CatAllOf left, CatAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Dog.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Dog.cs new file mode 100644 index 00000000000..ff3a582cc13 --- /dev/null +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Dog.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Dog : Animal, IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Dog {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Dog)obj); + } + + /// + /// Returns true if Dog instances are equal + /// + /// Instance of Dog to be compared + /// Boolean + public bool Equals(Dog other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Dog left, Dog right) + { + return Equals(left, right); + } + + public static bool operator !=(Dog left, Dog right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/DogAllOf.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/DogAllOf.cs new file mode 100644 index 00000000000..6be8ff2fe4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/DogAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class DogAllOf : IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((DogAllOf)obj); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(DogAllOf left, DogAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(DogAllOf left, DogAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json index 0ccbb4c793c..53d1a8e9b10 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -1048,6 +1048,40 @@ "title" : "An uploaded response", "type" : "object" }, + "Dog" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Dog_allOf" + } ] + }, + "Cat" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Cat_allOf" + } ] + }, + "Animal" : { + "discriminator" : { + "mapping" : { + "DOG" : "#/components/schemas/Dog", + "CAT" : "#/components/schemas/Cat" + }, + "propertyName" : "className" + }, + "properties" : { + "className" : { + "type" : "string" + }, + "color" : { + "default" : "red", + "type" : "string" + } + }, + "required" : [ "className" ], + "type" : "object" + }, "updatePetWithForm_request" : { "properties" : { "name" : { @@ -1074,6 +1108,24 @@ } }, "type" : "object" + }, + "Dog_allOf" : { + "properties" : { + "breed" : { + "type" : "string" + } + }, + "type" : "object", + "example" : null + }, + "Cat_allOf" : { + "properties" : { + "declawed" : { + "type" : "boolean" + } + }, + "type" : "object", + "example" : null } }, "securitySchemes" : { diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/FILES b/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/FILES index 9e47b8916d5..2d78823754e 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/FILES +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/.openapi-generator/FILES @@ -14,8 +14,13 @@ src/Org.OpenAPITools/Dockerfile src/Org.OpenAPITools/Filters/BasePathFilter.cs src/Org.OpenAPITools/Filters/GeneratePathParamsValidationFilter.cs src/Org.OpenAPITools/Formatters/InputFormatterStream.cs +src/Org.OpenAPITools/Models/Animal.cs src/Org.OpenAPITools/Models/ApiResponse.cs +src/Org.OpenAPITools/Models/Cat.cs +src/Org.OpenAPITools/Models/CatAllOf.cs src/Org.OpenAPITools/Models/Category.cs +src/Org.OpenAPITools/Models/Dog.cs +src/Org.OpenAPITools/Models/DogAllOf.cs src/Org.OpenAPITools/Models/Order.cs src/Org.OpenAPITools/Models/Pet.cs src/Org.OpenAPITools/Models/Tag.cs diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Animal.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Animal.cs new file mode 100644 index 00000000000..c7a6ae09eaa --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Animal.cs @@ -0,0 +1,51 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using JsonSubTypes; +using Swashbuckle.AspNetCore.Annotations; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + [JsonConverter(typeof(JsonSubtypes), "ClassName")] + [SwaggerDiscriminator("ClassName")] + [JsonSubtypes.KnownSubType(typeof(Cat), "CAT")] + [SwaggerSubType(typeof(Cat), DiscriminatorValue = "CAT")] + [JsonSubtypes.KnownSubType(typeof(Dog), "DOG")] + [SwaggerSubType(typeof(Dog), DiscriminatorValue = "DOG")] + public partial class Animal + { + /// + /// Gets or Sets ClassName + /// + [Required] + [DataMember(Name="className", EmitDefaultValue=false)] + public string ClassName { get; set; } + + /// + /// Gets or Sets Color + /// + [DataMember(Name="color", EmitDefaultValue=false)] + public string Color { get; set; } = "red"; + + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Cat.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Cat.cs new file mode 100644 index 00000000000..537c0f7f714 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Cat.cs @@ -0,0 +1,36 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Cat : Animal + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/CatAllOf.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/CatAllOf.cs new file mode 100644 index 00000000000..26eaeb38167 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/CatAllOf.cs @@ -0,0 +1,36 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class CatAllOf + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Dog.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Dog.cs new file mode 100644 index 00000000000..f1a52695233 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Dog.cs @@ -0,0 +1,36 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Dog : Animal + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/DogAllOf.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/DogAllOf.cs new file mode 100644 index 00000000000..c4029b4d981 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/DogAllOf.cs @@ -0,0 +1,36 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class DogAllOf + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json index 0ccbb4c793c..53d1a8e9b10 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -1048,6 +1048,40 @@ "title" : "An uploaded response", "type" : "object" }, + "Dog" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Dog_allOf" + } ] + }, + "Cat" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Cat_allOf" + } ] + }, + "Animal" : { + "discriminator" : { + "mapping" : { + "DOG" : "#/components/schemas/Dog", + "CAT" : "#/components/schemas/Cat" + }, + "propertyName" : "className" + }, + "properties" : { + "className" : { + "type" : "string" + }, + "color" : { + "default" : "red", + "type" : "string" + } + }, + "required" : [ "className" ], + "type" : "object" + }, "updatePetWithForm_request" : { "properties" : { "name" : { @@ -1074,6 +1108,24 @@ } }, "type" : "object" + }, + "Dog_allOf" : { + "properties" : { + "breed" : { + "type" : "string" + } + }, + "type" : "object", + "example" : null + }, + "Cat_allOf" : { + "properties" : { + "declawed" : { + "type" : "boolean" + } + }, + "type" : "object", + "example" : null } }, "securitySchemes" : { diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/FILES b/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/FILES index fe403832ad9..6d74d26da32 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/FILES +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/.openapi-generator/FILES @@ -2,9 +2,14 @@ Org.OpenAPITools.sln README.md build.bat build.sh +src/Org.OpenAPITools.Models/Animal.cs src/Org.OpenAPITools.Models/ApiResponse.cs +src/Org.OpenAPITools.Models/Cat.cs +src/Org.OpenAPITools.Models/CatAllOf.cs src/Org.OpenAPITools.Models/Category.cs src/Org.OpenAPITools.Models/Converters/CustomEnumConverter.cs +src/Org.OpenAPITools.Models/Dog.cs +src/Org.OpenAPITools.Models/DogAllOf.cs src/Org.OpenAPITools.Models/Order.cs src/Org.OpenAPITools.Models/Org.OpenAPITools.Models.csproj src/Org.OpenAPITools.Models/Pet.cs diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Animal.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Animal.cs new file mode 100644 index 00000000000..01f525396dc --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Animal.cs @@ -0,0 +1,142 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using JsonSubTypes; +using Swashbuckle.AspNetCore.Annotations; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + [JsonConverter(typeof(JsonSubtypes), "ClassName")] + [SwaggerDiscriminator("ClassName")] + [JsonSubtypes.KnownSubType(typeof(Cat), "CAT")] + [SwaggerSubType(typeof(Cat), DiscriminatorValue = "CAT")] + [JsonSubtypes.KnownSubType(typeof(Dog), "DOG")] + [SwaggerSubType(typeof(Dog), DiscriminatorValue = "DOG")] + public partial class Animal : IEquatable + { + /// + /// Gets or Sets ClassName + /// + [Required] + [DataMember(Name="className", EmitDefaultValue=false)] + public string ClassName { get; set; } + + /// + /// Gets or Sets Color + /// + [DataMember(Name="color", EmitDefaultValue=false)] + public string Color { get; set; } = "red"; + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Animal {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append(" Color: ").Append(Color).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Animal)obj); + } + + /// + /// Returns true if Animal instances are equal + /// + /// Instance of Animal to be compared + /// Boolean + public bool Equals(Animal other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + ClassName == other.ClassName || + ClassName != null && + ClassName.Equals(other.ClassName) + ) && + ( + Color == other.Color || + Color != null && + Color.Equals(other.Color) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (ClassName != null) + hashCode = hashCode * 59 + ClassName.GetHashCode(); + if (Color != null) + hashCode = hashCode * 59 + Color.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Animal left, Animal right) + { + return Equals(left, right); + } + + public static bool operator !=(Animal left, Animal right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Cat.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Cat.cs new file mode 100644 index 00000000000..9bb95fe5a4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Cat.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Cat : Animal, IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Cat {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Cat)obj); + } + + /// + /// Returns true if Cat instances are equal + /// + /// Instance of Cat to be compared + /// Boolean + public bool Equals(Cat other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Cat left, Cat right) + { + return Equals(left, right); + } + + public static bool operator !=(Cat left, Cat right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/CatAllOf.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/CatAllOf.cs new file mode 100644 index 00000000000..ca2b213b0cf --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/CatAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class CatAllOf : IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((CatAllOf)obj); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(CatAllOf left, CatAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(CatAllOf left, CatAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Dog.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Dog.cs new file mode 100644 index 00000000000..ff3a582cc13 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Dog.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Dog : Animal, IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Dog {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Dog)obj); + } + + /// + /// Returns true if Dog instances are equal + /// + /// Instance of Dog to be compared + /// Boolean + public bool Equals(Dog other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Dog left, Dog right) + { + return Equals(left, right); + } + + public static bool operator !=(Dog left, Dog right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/DogAllOf.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/DogAllOf.cs new file mode 100644 index 00000000000..6be8ff2fe4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/DogAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class DogAllOf : IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((DogAllOf)obj); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(DogAllOf left, DogAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(DogAllOf left, DogAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json index 0ccbb4c793c..53d1a8e9b10 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -1048,6 +1048,40 @@ "title" : "An uploaded response", "type" : "object" }, + "Dog" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Dog_allOf" + } ] + }, + "Cat" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Cat_allOf" + } ] + }, + "Animal" : { + "discriminator" : { + "mapping" : { + "DOG" : "#/components/schemas/Dog", + "CAT" : "#/components/schemas/Cat" + }, + "propertyName" : "className" + }, + "properties" : { + "className" : { + "type" : "string" + }, + "color" : { + "default" : "red", + "type" : "string" + } + }, + "required" : [ "className" ], + "type" : "object" + }, "updatePetWithForm_request" : { "properties" : { "name" : { @@ -1074,6 +1108,24 @@ } }, "type" : "object" + }, + "Dog_allOf" : { + "properties" : { + "breed" : { + "type" : "string" + } + }, + "type" : "object", + "example" : null + }, + "Cat_allOf" : { + "properties" : { + "declawed" : { + "type" : "boolean" + } + }, + "type" : "object", + "example" : null } }, "securitySchemes" : { diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator-ignore b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator/FILES b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator/FILES new file mode 100644 index 00000000000..94dce5508ef --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator/FILES @@ -0,0 +1,27 @@ +Org.OpenAPITools.sln +README.md +build.bat +build.sh +src/Org.OpenAPITools/.gitignore +src/Org.OpenAPITools/Attributes/ValidateModelStateAttribute.cs +src/Org.OpenAPITools/Authentication/ApiAuthentication.cs +src/Org.OpenAPITools/Controllers/FakeApi.cs +src/Org.OpenAPITools/Controllers/PetApi.cs +src/Org.OpenAPITools/Controllers/StoreApi.cs +src/Org.OpenAPITools/Controllers/UserApi.cs +src/Org.OpenAPITools/Converters/CustomEnumConverter.cs +src/Org.OpenAPITools/Formatters/InputFormatterStream.cs +src/Org.OpenAPITools/Models/Animal.cs +src/Org.OpenAPITools/Models/ApiResponse.cs +src/Org.OpenAPITools/Models/Cat.cs +src/Org.OpenAPITools/Models/CatAllOf.cs +src/Org.OpenAPITools/Models/Category.cs +src/Org.OpenAPITools/Models/Dog.cs +src/Org.OpenAPITools/Models/DogAllOf.cs +src/Org.OpenAPITools/Models/Order.cs +src/Org.OpenAPITools/Models/Pet.cs +src/Org.OpenAPITools/Models/Tag.cs +src/Org.OpenAPITools/Models/User.cs +src/Org.OpenAPITools/OpenApi/TypeExtensions.cs +src/Org.OpenAPITools/Org.OpenAPITools.csproj +src/Org.OpenAPITools/Org.OpenAPITools.nuspec diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator/VERSION new file mode 100644 index 00000000000..ba8a874deab --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/.openapi-generator/VERSION @@ -0,0 +1 @@ +6.6.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/Org.OpenAPITools.sln b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/Org.OpenAPITools.sln new file mode 100644 index 00000000000..c2bc3876420 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/Org.OpenAPITools.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27428.2043 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools", "src\Org.OpenAPITools\Org.OpenAPITools.csproj", "{3C799344-F285-4669-8FD5-7ED9B795D5C5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3C799344-F285-4669-8FD5-7ED9B795D5C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C799344-F285-4669-8FD5-7ED9B795D5C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C799344-F285-4669-8FD5-7ED9B795D5C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C799344-F285-4669-8FD5-7ED9B795D5C5}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/README.md b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/README.md new file mode 100644 index 00000000000..06ddde516ac --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/README.md @@ -0,0 +1,43 @@ +# Org.OpenAPITools - ASP.NET Core 6.0 Server + +This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + +## Upgrade NuGet Packages + +NuGet packages get frequently updated. + +To upgrade this solution to the latest version of all NuGet packages, use the dotnet-outdated tool. + + +Install dotnet-outdated tool: + +``` +dotnet tool install --global dotnet-outdated-tool +``` + +Upgrade only to new minor versions of packages + +``` +dotnet outdated --upgrade --version-lock Major +``` + +Upgrade to all new versions of packages (more likely to include breaking API changes) + +``` +dotnet outdated --upgrade +``` + + +## Run + +Linux/OS X: + +``` +sh build.sh +``` + +Windows: + +``` +build.bat +``` diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/build.bat b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/build.bat new file mode 100644 index 00000000000..cd65518e428 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/build.bat @@ -0,0 +1,9 @@ +:: Generated by: https://openapi-generator.tech +:: + +@echo off + +dotnet restore src\Org.OpenAPITools +dotnet build src\Org.OpenAPITools +echo Now, run the following to start the project: dotnet run -p src\Org.OpenAPITools\Org.OpenAPITools.csproj --launch-profile web. +echo. diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/build.sh b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/build.sh new file mode 100644 index 00000000000..afbeddb8378 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/build.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# +# Generated by: https://openapi-generator.tech +# + +dotnet restore src/Org.OpenAPITools/ && \ + dotnet build src/Org.OpenAPITools/ && \ + echo "Now, run the following to start the project: dotnet run -p src/Org.OpenAPITools/Org.OpenAPITools.csproj --launch-profile web" diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/.gitignore b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/.gitignore new file mode 100644 index 00000000000..1ee53850b84 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/.gitignore @@ -0,0 +1,362 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Attributes/ValidateModelStateAttribute.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Attributes/ValidateModelStateAttribute.cs new file mode 100644 index 00000000000..3ed1bc5b5ab --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Attributes/ValidateModelStateAttribute.cs @@ -0,0 +1,61 @@ +using System.ComponentModel.DataAnnotations; +using System.Reflection; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Controllers; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Mvc.ModelBinding; + +namespace Org.OpenAPITools.Attributes +{ + /// + /// Model state validation attribute + /// + public class ValidateModelStateAttribute : ActionFilterAttribute + { + /// + /// Called before the action method is invoked + /// + /// + public override void OnActionExecuting(ActionExecutingContext context) + { + // Per https://blog.markvincze.com/how-to-validate-action-parameters-with-dataannotation-attributes/ + var descriptor = context.ActionDescriptor as ControllerActionDescriptor; + if (descriptor != null) + { + foreach (var parameter in descriptor.MethodInfo.GetParameters()) + { + object args = null; + if (context.ActionArguments.ContainsKey(parameter.Name)) + { + args = context.ActionArguments[parameter.Name]; + } + + ValidateAttributes(parameter, args, context.ModelState); + } + } + + if (!context.ModelState.IsValid) + { + context.Result = new BadRequestObjectResult(context.ModelState); + } + } + + private void ValidateAttributes(ParameterInfo parameter, object args, ModelStateDictionary modelState) + { + foreach (var attributeData in parameter.CustomAttributes) + { + var attributeInstance = parameter.GetCustomAttribute(attributeData.AttributeType); + + var validationAttribute = attributeInstance as ValidationAttribute; + if (validationAttribute != null) + { + var isValid = validationAttribute.IsValid(args); + if (!isValid) + { + modelState.AddModelError(parameter.Name, validationAttribute.FormatErrorMessage(parameter.Name)); + } + } + } + } + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs new file mode 100644 index 00000000000..85be8593fce --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Authentication/ApiAuthentication.cs @@ -0,0 +1,62 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc.Filters; + +namespace Org.OpenAPITools.Authentication +{ + /// + /// A requirement that an ApiKey must be present. + /// + public class ApiKeyRequirement : IAuthorizationRequirement + { + /// + /// Get the list of api keys + /// + public IReadOnlyList ApiKeys { get; } + + /// + /// Get the policy name, + /// + public string PolicyName { get; } + + /// + /// Create a new instance of the class. + /// + /// + /// + public ApiKeyRequirement(IEnumerable apiKeys, string policyName) + { + ApiKeys = apiKeys?.ToList() ?? new List(); + PolicyName = policyName; + } + } + + /// + /// Enforce that an api key is present. + /// + public class ApiKeyRequirementHandler : AuthorizationHandler + { + /// + protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, ApiKeyRequirement requirement) + { + SucceedRequirementIfApiKeyPresentAndValid(context, requirement); + return Task.CompletedTask; + } + + private void SucceedRequirementIfApiKeyPresentAndValid(AuthorizationHandlerContext context, ApiKeyRequirement requirement) + { + + if (context.Resource is AuthorizationFilterContext authorizationFilterContext) + { + var apiKey = authorizationFilterContext.HttpContext.Request.Headers["api_key"].FirstOrDefault(); + if (requirement.PolicyName == "api_key" && apiKey != null && requirement.ApiKeys.Any(requiredApiKey => apiKey == requiredApiKey)) + { + context.Succeed(requirement); + } + } + + } + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs new file mode 100644 index 00000000000..07c44c86143 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -0,0 +1,38 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Http; +using Org.OpenAPITools.Attributes; +using Org.OpenAPITools.Models; + +namespace Org.OpenAPITools.Controllers +{ + /// + /// + /// + [ApiController] + public abstract class FakeApiController : ControllerBase + { + /// + /// fake endpoint to test parameter example (object) + /// + /// + /// successful operation + [HttpGet] + [Route("/v2/fake/parameter_example_test")] + [ValidateModelState] + public abstract IActionResult FakeParameterExampleTest([FromQuery (Name = "data")][Required()]Pet data); + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs new file mode 100644 index 00000000000..8cd072efb95 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -0,0 +1,136 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Http; +using Org.OpenAPITools.Attributes; +using Org.OpenAPITools.Models; + +namespace Org.OpenAPITools.Controllers +{ + /// + /// + /// + [ApiController] + public abstract class PetApiController : ControllerBase + { + /// + /// Add a new pet to the store + /// + /// Pet object that needs to be added to the store + /// successful operation + /// Invalid input + [HttpPost] + [Route("/v2/pet")] + [Consumes("application/json", "application/xml")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(Pet))] + public abstract IActionResult AddPet([FromBody]Pet pet); + + /// + /// Deletes a pet + /// + /// Pet id to delete + /// + /// Invalid pet value + [HttpDelete] + [Route("/v2/pet/{petId}")] + [ValidateModelState] + public abstract IActionResult DeletePet([FromRoute (Name = "petId")][Required]long petId, [FromHeader]string apiKey); + + /// + /// Finds Pets by status + /// + /// Multiple status values can be provided with comma separated strings + /// Status values that need to be considered for filter (deprecated) + /// successful operation + /// Invalid status value + [HttpGet] + [Route("/v2/pet/findByStatus")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(List))] + public abstract IActionResult FindPetsByStatus([FromQuery (Name = "status")][Required()]List status); + + /// + /// Finds Pets by tags + /// + /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + /// Tags to filter by + /// successful operation + /// Invalid tag value + [HttpGet] + [Route("/v2/pet/findByTags")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(List))] + [Obsolete] + public abstract IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required()]List tags); + + /// + /// Find pet by ID + /// + /// Returns a single pet + /// ID of pet to return + /// successful operation + /// Invalid ID supplied + /// Pet not found + [HttpGet] + [Route("/v2/pet/{petId}")] + [Authorize(Policy = "api_key")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(Pet))] + public abstract IActionResult GetPetById([FromRoute (Name = "petId")][Required]long petId); + + /// + /// Update an existing pet + /// + /// Pet object that needs to be added to the store + /// successful operation + /// Invalid ID supplied + /// Pet not found + /// Validation exception + [HttpPut] + [Route("/v2/pet")] + [Consumes("application/json", "application/xml")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(Pet))] + public abstract IActionResult UpdatePet([FromBody]Pet pet); + + /// + /// Updates a pet in the store with form data + /// + /// ID of pet that needs to be updated + /// Updated name of the pet + /// Updated status of the pet + /// Invalid input + [HttpPost] + [Route("/v2/pet/{petId}")] + [Consumes("application/x-www-form-urlencoded")] + [ValidateModelState] + public abstract IActionResult UpdatePetWithForm([FromRoute (Name = "petId")][Required]long petId, [FromForm (Name = "name")]string name, [FromForm (Name = "status")]string status); + + /// + /// uploads an image + /// + /// ID of pet to update + /// Additional data to pass to server + /// file to upload + /// successful operation + [HttpPost] + [Route("/v2/pet/{petId}/uploadImage")] + [Consumes("multipart/form-data")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(ApiResponse))] + public abstract IActionResult UploadFile([FromRoute (Name = "petId")][Required]long petId, [FromForm (Name = "additionalMetadata")]string additionalMetadata, IFormFile file); + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs new file mode 100644 index 00000000000..3ec0d549c4a --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -0,0 +1,79 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Http; +using Org.OpenAPITools.Attributes; +using Org.OpenAPITools.Models; + +namespace Org.OpenAPITools.Controllers +{ + /// + /// + /// + [ApiController] + public abstract class StoreApiController : ControllerBase + { + /// + /// Delete purchase order by ID + /// + /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + /// ID of the order that needs to be deleted + /// Invalid ID supplied + /// Order not found + [HttpDelete] + [Route("/v2/store/order/{orderId}")] + [ValidateModelState] + public abstract IActionResult DeleteOrder([FromRoute (Name = "orderId")][Required]string orderId); + + /// + /// Returns pet inventories by status + /// + /// Returns a map of status codes to quantities + /// successful operation + [HttpGet] + [Route("/v2/store/inventory")] + [Authorize(Policy = "api_key")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(Dictionary))] + public abstract IActionResult GetInventory(); + + /// + /// Find purchase order by ID + /// + /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + /// ID of pet that needs to be fetched + /// successful operation + /// Invalid ID supplied + /// Order not found + [HttpGet] + [Route("/v2/store/order/{orderId}")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(Order))] + public abstract IActionResult GetOrderById([FromRoute (Name = "orderId")][Required][Range(1, 5)]long orderId); + + /// + /// Place an order for a pet + /// + /// order placed for purchasing the pet + /// successful operation + /// Invalid Order + [HttpPost] + [Route("/v2/store/order")] + [Consumes("application/json")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(Order))] + public abstract IActionResult PlaceOrder([FromBody]Order order); + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs new file mode 100644 index 00000000000..2de74542f79 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -0,0 +1,129 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Http; +using Org.OpenAPITools.Attributes; +using Org.OpenAPITools.Models; + +namespace Org.OpenAPITools.Controllers +{ + /// + /// + /// + [ApiController] + public abstract class UserApiController : ControllerBase + { + /// + /// Create user + /// + /// This can only be done by the logged in user. + /// Created user object + /// successful operation + [HttpPost] + [Route("/v2/user")] + [Authorize(Policy = "api_key")] + [Consumes("application/json")] + [ValidateModelState] + public abstract IActionResult CreateUser([FromBody]User user); + + /// + /// Creates list of users with given input array + /// + /// List of user object + /// successful operation + [HttpPost] + [Route("/v2/user/createWithArray")] + [Authorize(Policy = "api_key")] + [Consumes("application/json")] + [ValidateModelState] + public abstract IActionResult CreateUsersWithArrayInput([FromBody]List user); + + /// + /// Creates list of users with given input array + /// + /// List of user object + /// successful operation + [HttpPost] + [Route("/v2/user/createWithList")] + [Authorize(Policy = "api_key")] + [Consumes("application/json")] + [ValidateModelState] + public abstract IActionResult CreateUsersWithListInput([FromBody]List user); + + /// + /// Delete user + /// + /// This can only be done by the logged in user. + /// The name that needs to be deleted + /// Invalid username supplied + /// User not found + [HttpDelete] + [Route("/v2/user/{username}")] + [Authorize(Policy = "api_key")] + [ValidateModelState] + public abstract IActionResult DeleteUser([FromRoute (Name = "username")][Required]string username); + + /// + /// Get user by user name + /// + /// The name that needs to be fetched. Use user1 for testing. + /// successful operation + /// Invalid username supplied + /// User not found + [HttpGet] + [Route("/v2/user/{username}")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(User))] + public abstract IActionResult GetUserByName([FromRoute (Name = "username")][Required]string username); + + /// + /// Logs user into the system + /// + /// The user name for login + /// The password for login in clear text + /// successful operation + /// Invalid username/password supplied + [HttpGet] + [Route("/v2/user/login")] + [ValidateModelState] + [ProducesResponseType(statusCode: 200, type: typeof(string))] + public abstract IActionResult LoginUser([FromQuery (Name = "username")][Required()][RegularExpression("^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")]string username, [FromQuery (Name = "password")][Required()]string password); + + /// + /// Logs out current logged in user session + /// + /// successful operation + [HttpGet] + [Route("/v2/user/logout")] + [Authorize(Policy = "api_key")] + [ValidateModelState] + public abstract IActionResult LogoutUser(); + + /// + /// Updated user + /// + /// This can only be done by the logged in user. + /// name that need to be deleted + /// Updated user object + /// Invalid user supplied + /// User not found + [HttpPut] + [Route("/v2/user/{username}")] + [Authorize(Policy = "api_key")] + [Consumes("application/json")] + [ValidateModelState] + public abstract IActionResult UpdateUser([FromRoute (Name = "username")][Required]string username, [FromBody]User user); + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs new file mode 100644 index 00000000000..00b75a3cc7c --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs @@ -0,0 +1,42 @@ +using System; +using System.ComponentModel; +using System.Globalization; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Converters +{ + /// + /// Custom string to enum converter + /// + public class CustomEnumConverter : TypeConverter + { + /// + /// Determine if we can convert a type to an enum + /// + /// + /// + /// + public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) + { + return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType); + } + + /// + /// Convert from a type value to an enum + /// + /// + /// + /// + /// + public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) + { + var s = value as string; + if (string.IsNullOrEmpty(s)) + { + return null; + } + + return JsonConvert.DeserializeObject(@"""" + value.ToString() + @""""); + } + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Formatters/InputFormatterStream.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Formatters/InputFormatterStream.cs new file mode 100644 index 00000000000..9c437b1919a --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Formatters/InputFormatterStream.cs @@ -0,0 +1,32 @@ +using System; +using System.IO; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc.Formatters; + +namespace Org.OpenAPITools.Formatters +{ + // Input Type Formatter to allow model binding to Streams + public class InputFormatterStream : InputFormatter + { + public InputFormatterStream() + { + SupportedMediaTypes.Add("application/octet-stream"); + SupportedMediaTypes.Add("image/jpeg"); + } + + protected override bool CanReadType(Type type) + { + if (type == typeof(Stream)) + { + return true; + } + + return false; + } + + public override Task ReadRequestBodyAsync(InputFormatterContext context) + { + return InputFormatterResult.SuccessAsync(context.HttpContext.Request.Body); + } + } +} \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Animal.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Animal.cs new file mode 100644 index 00000000000..fcc9a35520d --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Animal.cs @@ -0,0 +1,138 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using JsonSubTypes; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + [JsonConverter(typeof(JsonSubtypes), "ClassName")] + [JsonSubtypes.KnownSubType(typeof(Cat), "CAT")] + [JsonSubtypes.KnownSubType(typeof(Dog), "DOG")] + public class Animal : IEquatable + { + /// + /// Gets or Sets ClassName + /// + [Required] + [DataMember(Name="className", EmitDefaultValue=false)] + public string ClassName { get; set; } + + /// + /// Gets or Sets Color + /// + [DataMember(Name="color", EmitDefaultValue=false)] + public string Color { get; set; } = "red"; + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Animal {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append(" Color: ").Append(Color).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Animal)obj); + } + + /// + /// Returns true if Animal instances are equal + /// + /// Instance of Animal to be compared + /// Boolean + public bool Equals(Animal other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + ClassName == other.ClassName || + ClassName != null && + ClassName.Equals(other.ClassName) + ) && + ( + Color == other.Color || + Color != null && + Color.Equals(other.Color) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (ClassName != null) + hashCode = hashCode * 59 + ClassName.GetHashCode(); + if (Color != null) + hashCode = hashCode * 59 + Color.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Animal left, Animal right) + { + return Equals(left, right); + } + + public static bool operator !=(Animal left, Animal right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/ApiResponse.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/ApiResponse.cs new file mode 100644 index 00000000000..9932c3d79ef --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/ApiResponse.cs @@ -0,0 +1,147 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// Describes the result of uploading an image resource + /// + [DataContract] + public class ApiResponse : IEquatable + { + /// + /// Gets or Sets Code + /// + [DataMember(Name="code", EmitDefaultValue=true)] + public int Code { get; set; } + + /// + /// Gets or Sets Type + /// + [DataMember(Name="type", EmitDefaultValue=false)] + public string Type { get; set; } + + /// + /// Gets or Sets Message + /// + [DataMember(Name="message", EmitDefaultValue=false)] + public string Message { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class ApiResponse {\n"); + sb.Append(" Code: ").Append(Code).Append("\n"); + sb.Append(" Type: ").Append(Type).Append("\n"); + sb.Append(" Message: ").Append(Message).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((ApiResponse)obj); + } + + /// + /// Returns true if ApiResponse instances are equal + /// + /// Instance of ApiResponse to be compared + /// Boolean + public bool Equals(ApiResponse other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Code == other.Code || + + Code.Equals(other.Code) + ) && + ( + Type == other.Type || + Type != null && + Type.Equals(other.Type) + ) && + ( + Message == other.Message || + Message != null && + Message.Equals(other.Message) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Code.GetHashCode(); + if (Type != null) + hashCode = hashCode * 59 + Type.GetHashCode(); + if (Message != null) + hashCode = hashCode * 59 + Message.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(ApiResponse left, ApiResponse right) + { + return Equals(left, right); + } + + public static bool operator !=(ApiResponse left, ApiResponse right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Cat.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Cat.cs new file mode 100644 index 00000000000..faae4a77964 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Cat.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public class Cat : Animal, IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Cat {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Cat)obj); + } + + /// + /// Returns true if Cat instances are equal + /// + /// Instance of Cat to be compared + /// Boolean + public bool Equals(Cat other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Cat left, Cat right) + { + return Equals(left, right); + } + + public static bool operator !=(Cat left, Cat right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/CatAllOf.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/CatAllOf.cs new file mode 100644 index 00000000000..39cedeca0a5 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/CatAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public class CatAllOf : IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((CatAllOf)obj); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(CatAllOf left, CatAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(CatAllOf left, CatAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Category.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Category.cs new file mode 100644 index 00000000000..585afaebf2f --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Category.cs @@ -0,0 +1,134 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// A category for a pet + /// + [DataContract] + public class Category : IEquatable + { + /// + /// Gets or Sets Id + /// + [DataMember(Name="id", EmitDefaultValue=true)] + public long Id { get; set; } + + /// + /// Gets or Sets Name + /// + [RegularExpression("^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")] + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Category {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Category)obj); + } + + /// + /// Returns true if Category instances are equal + /// + /// Instance of Category to be compared + /// Boolean + public bool Equals(Category other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Id == other.Id || + + Id.Equals(other.Id) + ) && + ( + Name == other.Name || + Name != null && + Name.Equals(other.Name) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Id.GetHashCode(); + if (Name != null) + hashCode = hashCode * 59 + Name.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Category left, Category right) + { + return Equals(left, right); + } + + public static bool operator !=(Category left, Category right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Dog.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Dog.cs new file mode 100644 index 00000000000..db459e520a4 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Dog.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public class Dog : Animal, IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Dog {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Dog)obj); + } + + /// + /// Returns true if Dog instances are equal + /// + /// Instance of Dog to be compared + /// Boolean + public bool Equals(Dog other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Dog left, Dog right) + { + return Equals(left, right); + } + + public static bool operator !=(Dog left, Dog right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/DogAllOf.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/DogAllOf.cs new file mode 100644 index 00000000000..b30543c4332 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/DogAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public class DogAllOf : IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((DogAllOf)obj); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(DogAllOf left, DogAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(DogAllOf left, DogAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Order.cs new file mode 100644 index 00000000000..e9d93703049 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Order.cs @@ -0,0 +1,219 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// An order for a pets from the pet store + /// + [DataContract] + public class Order : IEquatable + { + /// + /// Gets or Sets Id + /// + [DataMember(Name="id", EmitDefaultValue=true)] + public long Id { get; set; } + + /// + /// Gets or Sets PetId + /// + [DataMember(Name="petId", EmitDefaultValue=true)] + public long PetId { get; set; } + + /// + /// Gets or Sets Quantity + /// + [DataMember(Name="quantity", EmitDefaultValue=true)] + public int Quantity { get; set; } + + /// + /// Gets or Sets ShipDate + /// + [DataMember(Name="shipDate", EmitDefaultValue=false)] + public DateTime ShipDate { get; set; } + + + /// + /// Order Status + /// + /// Order Status + [TypeConverter(typeof(CustomEnumConverter))] + [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] + public enum StatusEnum + { + + /// + /// Enum PlacedEnum for placed + /// + [EnumMember(Value = "placed")] + PlacedEnum = 1, + + /// + /// Enum ApprovedEnum for approved + /// + [EnumMember(Value = "approved")] + ApprovedEnum = 2, + + /// + /// Enum DeliveredEnum for delivered + /// + [EnumMember(Value = "delivered")] + DeliveredEnum = 3 + } + + /// + /// Order Status + /// + /// Order Status + [DataMember(Name="status", EmitDefaultValue=true)] + public StatusEnum Status { get; set; } + + /// + /// Gets or Sets Complete + /// + [DataMember(Name="complete", EmitDefaultValue=true)] + public bool Complete { get; set; } = false; + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Order {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" PetId: ").Append(PetId).Append("\n"); + sb.Append(" Quantity: ").Append(Quantity).Append("\n"); + sb.Append(" ShipDate: ").Append(ShipDate).Append("\n"); + sb.Append(" Status: ").Append(Status).Append("\n"); + sb.Append(" Complete: ").Append(Complete).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Order)obj); + } + + /// + /// Returns true if Order instances are equal + /// + /// Instance of Order to be compared + /// Boolean + public bool Equals(Order other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Id == other.Id || + + Id.Equals(other.Id) + ) && + ( + PetId == other.PetId || + + PetId.Equals(other.PetId) + ) && + ( + Quantity == other.Quantity || + + Quantity.Equals(other.Quantity) + ) && + ( + ShipDate == other.ShipDate || + ShipDate != null && + ShipDate.Equals(other.ShipDate) + ) && + ( + Status == other.Status || + + Status.Equals(other.Status) + ) && + ( + Complete == other.Complete || + + Complete.Equals(other.Complete) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Id.GetHashCode(); + + hashCode = hashCode * 59 + PetId.GetHashCode(); + + hashCode = hashCode * 59 + Quantity.GetHashCode(); + if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); + + hashCode = hashCode * 59 + Status.GetHashCode(); + + hashCode = hashCode * 59 + Complete.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Order left, Order right) + { + return Equals(left, right); + } + + public static bool operator !=(Order left, Order right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Pet.cs new file mode 100644 index 00000000000..c1981aa645f --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Pet.cs @@ -0,0 +1,224 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// A pet for sale in the pet store + /// + [DataContract] + public class Pet : IEquatable + { + /// + /// Gets or Sets Id + /// + [DataMember(Name="id", EmitDefaultValue=true)] + public long Id { get; set; } + + /// + /// Gets or Sets Category + /// + [DataMember(Name="category", EmitDefaultValue=false)] + public Category Category { get; set; } + + /// + /// Gets or Sets Name + /// + /// "doggie" + [Required] + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Gets or Sets PhotoUrls + /// + [Required] + [DataMember(Name="photoUrls", EmitDefaultValue=false)] + public List PhotoUrls { get; set; } + + /// + /// Gets or Sets Tags + /// + [DataMember(Name="tags", EmitDefaultValue=false)] + public List Tags { get; set; } + + + /// + /// pet status in the store + /// + /// pet status in the store + [TypeConverter(typeof(CustomEnumConverter))] + [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] + public enum StatusEnum + { + + /// + /// Enum AvailableEnum for available + /// + [EnumMember(Value = "available")] + AvailableEnum = 1, + + /// + /// Enum PendingEnum for pending + /// + [EnumMember(Value = "pending")] + PendingEnum = 2, + + /// + /// Enum SoldEnum for sold + /// + [EnumMember(Value = "sold")] + SoldEnum = 3 + } + + /// + /// pet status in the store + /// + /// pet status in the store + [DataMember(Name="status", EmitDefaultValue=true)] + public StatusEnum Status { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Pet {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Category: ").Append(Category).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PhotoUrls: ").Append(PhotoUrls).Append("\n"); + sb.Append(" Tags: ").Append(Tags).Append("\n"); + sb.Append(" Status: ").Append(Status).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Pet)obj); + } + + /// + /// Returns true if Pet instances are equal + /// + /// Instance of Pet to be compared + /// Boolean + public bool Equals(Pet other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Id == other.Id || + + Id.Equals(other.Id) + ) && + ( + Category == other.Category || + Category != null && + Category.Equals(other.Category) + ) && + ( + Name == other.Name || + Name != null && + Name.Equals(other.Name) + ) && + ( + PhotoUrls == other.PhotoUrls || + PhotoUrls != null && + other.PhotoUrls != null && + PhotoUrls.SequenceEqual(other.PhotoUrls) + ) && + ( + Tags == other.Tags || + Tags != null && + other.Tags != null && + Tags.SequenceEqual(other.Tags) + ) && + ( + Status == other.Status || + + Status.Equals(other.Status) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Id.GetHashCode(); + if (Category != null) + hashCode = hashCode * 59 + Category.GetHashCode(); + if (Name != null) + hashCode = hashCode * 59 + Name.GetHashCode(); + if (PhotoUrls != null) + hashCode = hashCode * 59 + PhotoUrls.GetHashCode(); + if (Tags != null) + hashCode = hashCode * 59 + Tags.GetHashCode(); + + hashCode = hashCode * 59 + Status.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Pet left, Pet right) + { + return Equals(left, right); + } + + public static bool operator !=(Pet left, Pet right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Tag.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Tag.cs new file mode 100644 index 00000000000..18d6e092e78 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Tag.cs @@ -0,0 +1,133 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// A tag for a pet + /// + [DataContract] + public class Tag : IEquatable + { + /// + /// Gets or Sets Id + /// + [DataMember(Name="id", EmitDefaultValue=true)] + public long Id { get; set; } + + /// + /// Gets or Sets Name + /// + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Tag {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Tag)obj); + } + + /// + /// Returns true if Tag instances are equal + /// + /// Instance of Tag to be compared + /// Boolean + public bool Equals(Tag other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Id == other.Id || + + Id.Equals(other.Id) + ) && + ( + Name == other.Name || + Name != null && + Name.Equals(other.Name) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Id.GetHashCode(); + if (Name != null) + hashCode = hashCode * 59 + Name.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Tag left, Tag right) + { + return Equals(left, right); + } + + public static bool operator !=(Tag left, Tag right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/User.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/User.cs new file mode 100644 index 00000000000..7d4aabd8251 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/User.cs @@ -0,0 +1,218 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// A User who is purchasing from the pet store + /// + [DataContract] + public class User : IEquatable + { + /// + /// Gets or Sets Id + /// + [DataMember(Name="id", EmitDefaultValue=true)] + public long Id { get; set; } + + /// + /// Gets or Sets Username + /// + [DataMember(Name="username", EmitDefaultValue=false)] + public string Username { get; set; } + + /// + /// Gets or Sets FirstName + /// + [DataMember(Name="firstName", EmitDefaultValue=false)] + public string FirstName { get; set; } + + /// + /// Gets or Sets LastName + /// + [DataMember(Name="lastName", EmitDefaultValue=false)] + public string LastName { get; set; } + + /// + /// Gets or Sets Email + /// + [DataMember(Name="email", EmitDefaultValue=false)] + public string Email { get; set; } + + /// + /// Gets or Sets Password + /// + [DataMember(Name="password", EmitDefaultValue=false)] + public string Password { get; set; } + + /// + /// Gets or Sets Phone + /// + [DataMember(Name="phone", EmitDefaultValue=false)] + public string Phone { get; set; } + + /// + /// User Status + /// + /// User Status + [DataMember(Name="userStatus", EmitDefaultValue=true)] + public int UserStatus { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class User {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Username: ").Append(Username).Append("\n"); + sb.Append(" FirstName: ").Append(FirstName).Append("\n"); + sb.Append(" LastName: ").Append(LastName).Append("\n"); + sb.Append(" Email: ").Append(Email).Append("\n"); + sb.Append(" Password: ").Append(Password).Append("\n"); + sb.Append(" Phone: ").Append(Phone).Append("\n"); + sb.Append(" UserStatus: ").Append(UserStatus).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((User)obj); + } + + /// + /// Returns true if User instances are equal + /// + /// Instance of User to be compared + /// Boolean + public bool Equals(User other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Id == other.Id || + + Id.Equals(other.Id) + ) && + ( + Username == other.Username || + Username != null && + Username.Equals(other.Username) + ) && + ( + FirstName == other.FirstName || + FirstName != null && + FirstName.Equals(other.FirstName) + ) && + ( + LastName == other.LastName || + LastName != null && + LastName.Equals(other.LastName) + ) && + ( + Email == other.Email || + Email != null && + Email.Equals(other.Email) + ) && + ( + Password == other.Password || + Password != null && + Password.Equals(other.Password) + ) && + ( + Phone == other.Phone || + Phone != null && + Phone.Equals(other.Phone) + ) && + ( + UserStatus == other.UserStatus || + + UserStatus.Equals(other.UserStatus) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Id.GetHashCode(); + if (Username != null) + hashCode = hashCode * 59 + Username.GetHashCode(); + if (FirstName != null) + hashCode = hashCode * 59 + FirstName.GetHashCode(); + if (LastName != null) + hashCode = hashCode * 59 + LastName.GetHashCode(); + if (Email != null) + hashCode = hashCode * 59 + Email.GetHashCode(); + if (Password != null) + hashCode = hashCode * 59 + Password.GetHashCode(); + if (Phone != null) + hashCode = hashCode * 59 + Phone.GetHashCode(); + + hashCode = hashCode * 59 + UserStatus.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(User left, User right) + { + return Equals(left, right); + } + + public static bool operator !=(User left, User right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/OpenApi/TypeExtensions.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/OpenApi/TypeExtensions.cs new file mode 100644 index 00000000000..b862226f2c1 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/OpenApi/TypeExtensions.cs @@ -0,0 +1,51 @@ +using System; +using System.Linq; +using System.Text; + +namespace Org.OpenAPITools.OpenApi +{ + /// + /// Replacement utilities from Swashbuckle.AspNetCore.SwaggerGen which are not in 5.x + /// + public static class TypeExtensions + { + /// + /// Produce a friendly name for the type which is unique. + /// + /// + /// + public static string FriendlyId(this Type type, bool fullyQualified = false) + { + var typeName = fullyQualified + ? type.FullNameSansTypeParameters().Replace("+", ".") + : type.Name; + + if (type.IsGenericType) + { + var genericArgumentIds = type.GetGenericArguments() + .Select(t => t.FriendlyId(fullyQualified)) + .ToArray(); + + return new StringBuilder(typeName) + .Replace($"`{genericArgumentIds.Count()}", string.Empty) + .Append($"[{string.Join(",", genericArgumentIds).TrimEnd(',')}]") + .ToString(); + } + + return typeName; + } + + /// + /// Determine the fully qualified type name without type parameters. + /// + /// + public static string FullNameSansTypeParameters(this Type type) + { + var fullName = type.FullName; + if (string.IsNullOrEmpty(fullName)) + fullName = type.Name; + var chopIndex = fullName.IndexOf("[[", StringComparison.Ordinal); + return (chopIndex == -1) ? fullName : fullName.Substring(0, chopIndex); + } + } +} \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj new file mode 100644 index 00000000000..2c3b91dd954 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -0,0 +1,26 @@ + + + A library generated from a OpenAPI doc + No Copyright + OpenAPI + net6.0 + true + true + 1.0.0 + Library + Org.OpenAPITools + Org.OpenAPITools + cb87e868-8646-48ef-9bb6-344b537d0d37 + Linux + ..\.. + + + + + + + + + + + diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.nuspec new file mode 100644 index 00000000000..b1d83a35961 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.nuspec @@ -0,0 +1,20 @@ + + + + $id$ + 1.0.0 + OpenAPI Library + OpenAPI + OpenAPI + https://www.apache.org/licenses/LICENSE-2.0.html + + false + A library generated from a OpenAPI doc + Summary of changes made in this release of the package. + No Copyright + Org.OpenAPITools + + diff --git a/samples/server/petstore/aspnetcore-6.0/.openapi-generator/FILES b/samples/server/petstore/aspnetcore-6.0/.openapi-generator/FILES index 9e47b8916d5..2d78823754e 100644 --- a/samples/server/petstore/aspnetcore-6.0/.openapi-generator/FILES +++ b/samples/server/petstore/aspnetcore-6.0/.openapi-generator/FILES @@ -14,8 +14,13 @@ src/Org.OpenAPITools/Dockerfile src/Org.OpenAPITools/Filters/BasePathFilter.cs src/Org.OpenAPITools/Filters/GeneratePathParamsValidationFilter.cs src/Org.OpenAPITools/Formatters/InputFormatterStream.cs +src/Org.OpenAPITools/Models/Animal.cs src/Org.OpenAPITools/Models/ApiResponse.cs +src/Org.OpenAPITools/Models/Cat.cs +src/Org.OpenAPITools/Models/CatAllOf.cs src/Org.OpenAPITools/Models/Category.cs +src/Org.OpenAPITools/Models/Dog.cs +src/Org.OpenAPITools/Models/DogAllOf.cs src/Org.OpenAPITools/Models/Order.cs src/Org.OpenAPITools/Models/Pet.cs src/Org.OpenAPITools/Models/Tag.cs diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Animal.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Animal.cs new file mode 100644 index 00000000000..01f525396dc --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Animal.cs @@ -0,0 +1,142 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using JsonSubTypes; +using Swashbuckle.AspNetCore.Annotations; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + [JsonConverter(typeof(JsonSubtypes), "ClassName")] + [SwaggerDiscriminator("ClassName")] + [JsonSubtypes.KnownSubType(typeof(Cat), "CAT")] + [SwaggerSubType(typeof(Cat), DiscriminatorValue = "CAT")] + [JsonSubtypes.KnownSubType(typeof(Dog), "DOG")] + [SwaggerSubType(typeof(Dog), DiscriminatorValue = "DOG")] + public partial class Animal : IEquatable + { + /// + /// Gets or Sets ClassName + /// + [Required] + [DataMember(Name="className", EmitDefaultValue=false)] + public string ClassName { get; set; } + + /// + /// Gets or Sets Color + /// + [DataMember(Name="color", EmitDefaultValue=false)] + public string Color { get; set; } = "red"; + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Animal {\n"); + sb.Append(" ClassName: ").Append(ClassName).Append("\n"); + sb.Append(" Color: ").Append(Color).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Animal)obj); + } + + /// + /// Returns true if Animal instances are equal + /// + /// Instance of Animal to be compared + /// Boolean + public bool Equals(Animal other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + ClassName == other.ClassName || + ClassName != null && + ClassName.Equals(other.ClassName) + ) && + ( + Color == other.Color || + Color != null && + Color.Equals(other.Color) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (ClassName != null) + hashCode = hashCode * 59 + ClassName.GetHashCode(); + if (Color != null) + hashCode = hashCode * 59 + Color.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Animal left, Animal right) + { + return Equals(left, right); + } + + public static bool operator !=(Animal left, Animal right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Cat.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Cat.cs new file mode 100644 index 00000000000..9bb95fe5a4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Cat.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Cat : Animal, IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Cat {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Cat)obj); + } + + /// + /// Returns true if Cat instances are equal + /// + /// Instance of Cat to be compared + /// Boolean + public bool Equals(Cat other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Cat left, Cat right) + { + return Equals(left, right); + } + + public static bool operator !=(Cat left, Cat right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/CatAllOf.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/CatAllOf.cs new file mode 100644 index 00000000000..ca2b213b0cf --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/CatAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class CatAllOf : IEquatable + { + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=true)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((CatAllOf)obj); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Declawed == other.Declawed || + + Declawed.Equals(other.Declawed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + + hashCode = hashCode * 59 + Declawed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(CatAllOf left, CatAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(CatAllOf left, CatAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Dog.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Dog.cs new file mode 100644 index 00000000000..ff3a582cc13 --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Dog.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class Dog : Animal, IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class Dog {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public new string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((Dog)obj); + } + + /// + /// Returns true if Dog instances are equal + /// + /// Instance of Dog to be compared + /// Boolean + public bool Equals(Dog other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(Dog left, Dog right) + { + return Equals(left, right); + } + + public static bool operator !=(Dog left, Dog right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/DogAllOf.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/DogAllOf.cs new file mode 100644 index 00000000000..6be8ff2fe4e --- /dev/null +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/DogAllOf.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://openapi-generator.tech + */ + +using System; +using System.Linq; +using System.Text; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Org.OpenAPITools.Converters; + +namespace Org.OpenAPITools.Models +{ + /// + /// + /// + [DataContract] + public partial class DogAllOf : IEquatable + { + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object obj) + { + if (obj is null) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((DogAllOf)obj); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf other) + { + if (other is null) return false; + if (ReferenceEquals(this, other)) return true; + + return + ( + Breed == other.Breed || + Breed != null && + Breed.Equals(other.Breed) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + var hashCode = 41; + // Suitable nullity checks etc, of course :) + if (Breed != null) + hashCode = hashCode * 59 + Breed.GetHashCode(); + return hashCode; + } + } + + #region Operators + #pragma warning disable 1591 + + public static bool operator ==(DogAllOf left, DogAllOf right) + { + return Equals(left, right); + } + + public static bool operator !=(DogAllOf left, DogAllOf right) + { + return !Equals(left, right); + } + + #pragma warning restore 1591 + #endregion Operators + } +} diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json index 0ccbb4c793c..53d1a8e9b10 100644 --- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -1048,6 +1048,40 @@ "title" : "An uploaded response", "type" : "object" }, + "Dog" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Dog_allOf" + } ] + }, + "Cat" : { + "allOf" : [ { + "$ref" : "#/components/schemas/Animal" + }, { + "$ref" : "#/components/schemas/Cat_allOf" + } ] + }, + "Animal" : { + "discriminator" : { + "mapping" : { + "DOG" : "#/components/schemas/Dog", + "CAT" : "#/components/schemas/Cat" + }, + "propertyName" : "className" + }, + "properties" : { + "className" : { + "type" : "string" + }, + "color" : { + "default" : "red", + "type" : "string" + } + }, + "required" : [ "className" ], + "type" : "object" + }, "updatePetWithForm_request" : { "properties" : { "name" : { @@ -1074,6 +1108,24 @@ } }, "type" : "object" + }, + "Dog_allOf" : { + "properties" : { + "breed" : { + "type" : "string" + } + }, + "type" : "object", + "example" : null + }, + "Cat_allOf" : { + "properties" : { + "declawed" : { + "type" : "boolean" + } + }, + "type" : "object", + "example" : null } }, "securitySchemes" : { From 448cbfd018f5710f3f3e29e7393fab5c26e1b220 Mon Sep 17 00:00:00 2001 From: Robert Schweizer Date: Wed, 12 Apr 2023 05:08:28 +0200 Subject: [PATCH 127/131] [python-nextgen] Limit allowed pydantic version range (#15189) Align the lower limits between pyproject.toml and setup.py. Set a common upper limit of <2, because version 2 brings breaking changes. --- .../src/main/resources/python-nextgen/pyproject.mustache | 2 +- .../src/main/resources/python-nextgen/requirements.mustache | 2 +- .../src/main/resources/python-nextgen/setup.mustache | 2 +- samples/client/echo_api/python-nextgen/pyproject.toml | 2 +- samples/client/echo_api/python-nextgen/requirements.txt | 2 +- samples/client/echo_api/python-nextgen/setup.py | 2 +- .../client/petstore/python-nextgen-aiohttp/pyproject.toml | 2 +- .../client/petstore/python-nextgen-aiohttp/requirements.txt | 2 +- .../openapi3/client/petstore/python-nextgen-aiohttp/setup.py | 2 +- samples/openapi3/client/petstore/python-nextgen/pyproject.toml | 2 +- .../openapi3/client/petstore/python-nextgen/requirements.txt | 2 +- samples/openapi3/client/petstore/python-nextgen/setup.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache index ce0db200000..1ab024d87f2 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache @@ -23,7 +23,7 @@ tornado = ">=4.2,<5" pem = ">= 19.3.0" pycryptodome = ">= 3.9.0" {{/hasHttpSignatureMethods}} -pydantic = ">= 1.10.5" +pydantic = "^1.10.5" aenum = ">=3.1.11" [tool.poetry.dev-dependencies] diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/requirements.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/requirements.mustache index b64659a0a91..e18a97e55fd 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/requirements.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/requirements.mustache @@ -1,7 +1,7 @@ python_dateutil >= 2.5.3 setuptools >= 21.0.0 urllib3 >= 1.25.3 -pydantic >= 1.10.2 +pydantic >= 1.10.5, < 2 aenum >= 3.1.11 {{#asyncio}} aiohttp >= 3.0.0 diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/setup.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/setup.mustache index 77760324f82..902163a1e1d 100644 --- a/modules/openapi-generator/src/main/resources/python-nextgen/setup.mustache +++ b/modules/openapi-generator/src/main/resources/python-nextgen/setup.mustache @@ -29,7 +29,7 @@ REQUIRES = [ "pem>=19.3.0", "pycryptodome>=3.9.0", {{/hasHttpSignatureMethods}} - "pydantic", + "pydantic >= 1.10.5, < 2", "aenum" ] diff --git a/samples/client/echo_api/python-nextgen/pyproject.toml b/samples/client/echo_api/python-nextgen/pyproject.toml index 954dc0de05a..0a22d86748b 100644 --- a/samples/client/echo_api/python-nextgen/pyproject.toml +++ b/samples/client/echo_api/python-nextgen/pyproject.toml @@ -13,7 +13,7 @@ python = "^3.7" urllib3 = ">= 1.25.3" python-dateutil = ">=2.8.2" -pydantic = ">= 1.10.5" +pydantic = "^1.10.5" aenum = ">=3.1.11" [tool.poetry.dev-dependencies] diff --git a/samples/client/echo_api/python-nextgen/requirements.txt b/samples/client/echo_api/python-nextgen/requirements.txt index b98ff3e6069..74ede174a0a 100644 --- a/samples/client/echo_api/python-nextgen/requirements.txt +++ b/samples/client/echo_api/python-nextgen/requirements.txt @@ -1,5 +1,5 @@ python_dateutil >= 2.5.3 setuptools >= 21.0.0 urllib3 >= 1.25.3 -pydantic >= 1.10.2 +pydantic >= 1.10.5, < 2 aenum >= 3.1.11 diff --git a/samples/client/echo_api/python-nextgen/setup.py b/samples/client/echo_api/python-nextgen/setup.py index 004666ab677..3915ce5c373 100644 --- a/samples/client/echo_api/python-nextgen/setup.py +++ b/samples/client/echo_api/python-nextgen/setup.py @@ -27,7 +27,7 @@ PYTHON_REQUIRES = ">=3.7" REQUIRES = [ "urllib3 >= 1.25.3", "python-dateutil", - "pydantic", + "pydantic >= 1.10.5, < 2", "aenum" ] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml index 981eebf3c59..6c4548406a1 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml @@ -16,7 +16,7 @@ python-dateutil = ">=2.8.2" aiohttp = ">= 3.8.4" pem = ">= 19.3.0" pycryptodome = ">= 3.9.0" -pydantic = ">= 1.10.5" +pydantic = "^1.10.5" aenum = ">=3.1.11" [tool.poetry.dev-dependencies] diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/requirements.txt b/samples/openapi3/client/petstore/python-nextgen-aiohttp/requirements.txt index 1365d507af1..8bb00c2c243 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/requirements.txt +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/requirements.txt @@ -1,6 +1,6 @@ python_dateutil >= 2.5.3 setuptools >= 21.0.0 urllib3 >= 1.25.3 -pydantic >= 1.10.2 +pydantic >= 1.10.5, < 2 aenum >= 3.1.11 aiohttp >= 3.0.0 diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/setup.py b/samples/openapi3/client/petstore/python-nextgen-aiohttp/setup.py index 9d2c0b75b55..d584a44727d 100644 --- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/setup.py +++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/setup.py @@ -29,7 +29,7 @@ REQUIRES = [ "aiohttp >= 3.0.0", "pem>=19.3.0", "pycryptodome>=3.9.0", - "pydantic", + "pydantic >= 1.10.5, < 2", "aenum" ] diff --git a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml index 82e111dd60f..b31e8940819 100644 --- a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml +++ b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml @@ -15,7 +15,7 @@ urllib3 = ">= 1.25.3" python-dateutil = ">=2.8.2" pem = ">= 19.3.0" pycryptodome = ">= 3.9.0" -pydantic = ">= 1.10.5" +pydantic = "^1.10.5" aenum = ">=3.1.11" [tool.poetry.dev-dependencies] diff --git a/samples/openapi3/client/petstore/python-nextgen/requirements.txt b/samples/openapi3/client/petstore/python-nextgen/requirements.txt index b98ff3e6069..74ede174a0a 100755 --- a/samples/openapi3/client/petstore/python-nextgen/requirements.txt +++ b/samples/openapi3/client/petstore/python-nextgen/requirements.txt @@ -1,5 +1,5 @@ python_dateutil >= 2.5.3 setuptools >= 21.0.0 urllib3 >= 1.25.3 -pydantic >= 1.10.2 +pydantic >= 1.10.5, < 2 aenum >= 3.1.11 diff --git a/samples/openapi3/client/petstore/python-nextgen/setup.py b/samples/openapi3/client/petstore/python-nextgen/setup.py index e1bff332d2b..10a96353933 100755 --- a/samples/openapi3/client/petstore/python-nextgen/setup.py +++ b/samples/openapi3/client/petstore/python-nextgen/setup.py @@ -28,7 +28,7 @@ REQUIRES = [ "python-dateutil", "pem>=19.3.0", "pycryptodome>=3.9.0", - "pydantic", + "pydantic >= 1.10.5, < 2", "aenum" ] From ff48f80379793ea18de03ffdca7e38cbfabc4403 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 12 Apr 2023 11:32:11 +0800 Subject: [PATCH 128/131] udpate vertx to newer version 3.5.2 (#15197) --- .../main/resources/Java/libraries/vertx/build.gradle.mustache | 2 +- .../src/main/resources/Java/libraries/vertx/pom.mustache | 2 +- samples/client/petstore/java/vertx-no-nullable/build.gradle | 2 +- samples/client/petstore/java/vertx-no-nullable/pom.xml | 2 +- samples/client/petstore/java/vertx/build.gradle | 2 +- samples/client/petstore/java/vertx/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 f92534f5699..34fed083474 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 @@ -32,7 +32,7 @@ ext { swagger_annotations_version = "1.5.21" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" - vertx_version = "3.4.2" + vertx_version = "3.5.2" junit_version = "4.13.2" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.6" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache index 5e487d12492..35592f629ea 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache @@ -292,7 +292,7 @@ UTF-8 - 3.4.2 + 3.5.2 1.6.6 2.13.4 2.13.4.2 diff --git a/samples/client/petstore/java/vertx-no-nullable/build.gradle b/samples/client/petstore/java/vertx-no-nullable/build.gradle index b93c988fcf6..e5042dc3c9d 100644 --- a/samples/client/petstore/java/vertx-no-nullable/build.gradle +++ b/samples/client/petstore/java/vertx-no-nullable/build.gradle @@ -32,7 +32,7 @@ ext { swagger_annotations_version = "1.5.21" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" - vertx_version = "3.4.2" + vertx_version = "3.5.2" junit_version = "4.13.2" jakarta_annotation_version = "1.3.5" } diff --git a/samples/client/petstore/java/vertx-no-nullable/pom.xml b/samples/client/petstore/java/vertx-no-nullable/pom.xml index e22b0ef38b6..520705c20e7 100644 --- a/samples/client/petstore/java/vertx-no-nullable/pom.xml +++ b/samples/client/petstore/java/vertx-no-nullable/pom.xml @@ -264,7 +264,7 @@ UTF-8 - 3.4.2 + 3.5.2 1.6.6 2.13.4 2.13.4.2 diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle index 0c19093b3d5..269c0b60e85 100644 --- a/samples/client/petstore/java/vertx/build.gradle +++ b/samples/client/petstore/java/vertx/build.gradle @@ -32,7 +32,7 @@ ext { swagger_annotations_version = "1.5.21" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" - vertx_version = "3.4.2" + vertx_version = "3.5.2" junit_version = "4.13.2" jackson_databind_nullable_version = "0.2.6" jakarta_annotation_version = "1.3.5" diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml index cb6fb45c527..a89e2636f1e 100644 --- a/samples/client/petstore/java/vertx/pom.xml +++ b/samples/client/petstore/java/vertx/pom.xml @@ -269,7 +269,7 @@ UTF-8 - 3.4.2 + 3.5.2 1.6.6 2.13.4 2.13.4.2 From 0b41ee1c78282711f0c4b6836f9d98ac16761ef3 Mon Sep 17 00:00:00 2001 From: Steven Goris <2930063+GoGoris@users.noreply.github.com> Date: Wed, 12 Apr 2023 05:38:09 +0200 Subject: [PATCH 129/131] Issue #15095: Improve gradle task documentation (#15193) Co-authored-by: Steven --- docs/plugins.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/plugins.md b/docs/plugins.md index f4586135cdb..dae527d4048 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -91,19 +91,19 @@ This gives access to the following tasks: | ---- | ----------- | | openApiGenerate | Generate code via Open API Tools Generator for Open API 2.0 or 3.x specification documents. | | openApiGenerators | Lists generators available via Open API Generators. | -| openApiMeta | Generates a new generator to be consumed via Open API Generator. | +| openApiMeta | Generates a new generator to be consumed via Open API Generator. | | openApiValidate | Validates an Open API 2.0 or 3.x specification document. | > The plugin implements the above tasks as project extensions of the same name. If you’d like to declare these tasks as dependencies to other tasks (using `dependsOn`), you’ll need a task reference. e.g.: > ```groovy -> compileJava.dependsOn tasks.openApiGenerate +> compileJava.dependsOn tasks.named("openApiGenerate") > ``` For full details of all options, see the [plugin README](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-gradle-plugin). ### Example -An example task for generating a kotlin client: +An example openApiGenerate task configuration for generating a kotlin client: ```groovy openApiGenerate { @@ -113,8 +113,10 @@ openApiGenerate { apiPackage = "org.openapi.example.api" invokerPackage = "org.openapi.example.invoker" modelPackage = "org.openapi.example.model" - configOptions = [ + configOptions.putAll([ dateLibrary: "java8" - ] + ]) } ``` + +*If you want to create separate tasks (for example when you have more than one api spec and require different parameters for each), this is how to do so in Gradle 7+: `tasks.register('taskName', org.openapitools.generator.gradle.plugin.tasks.GenerateTask) { ... }`.* From 0fff9642bf85e614a0a368a066f3c6cf23d732f6 Mon Sep 17 00:00:00 2001 From: Beppe Catanese <1771700+gcatanese@users.noreply.github.com> Date: Wed, 12 Apr 2023 10:12:38 +0200 Subject: [PATCH 130/131] Add blog Mustache templates with OpenAPI generator (#15198) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cdc17f7039f..36c9592d5f9 100644 --- a/README.md +++ b/README.md @@ -893,6 +893,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - 2022-04-06 - [Effective Software Development using OpenAPI Generator](https://apexlabs.ai/post/openapi-generator) by Ajil Oommen (Senior Flutter Developer) - 2022-05-13 - [A Path From an API To Client Libraries](https://www.youtube.com/watch?v=XC8oVn_efTw) by [Filip Srnec](https://www.devoxx.co.uk/talk/?id=11211) at Infobip - 2022-06-01 - [API First, using OpenAPI and Spring Boot](https://medium.com/xgeeks/api-first-using-openapi-and-spring-boot-2602c04bb0d3) by [Micael Estrázulas Vianna](https://estrazulas.medium.com/) +- 2022-06-12 - [Mustache templates with OpenAPI specs](https://medium.com/geekculture/mustache-templates-with-openapi-specs-f24711c67dec) by [Beppe Catanese](https://github.com/gcatanese) - 2022-07-01 - [Generate API contract using OpenAPI Generator Maven plugin](https://huongdanjava.com/generate-api-contract-using-openapi-generator-maven-plugin.html) by [Khanh Nguyen](https://huongdanjava.com/) - 2022-07-22 - [使用OpenAPI Generator Maven plugin开发api优先的java客户端和服务端代码](https://blog.roccoshi.top/2022/java/openapi-generator%E7%9A%84%E4%BD%BF%E7%94%A8/) by [Lincest](https://github.com/Lincest) - 2022-08-01 - [Tutorial: Etsy Open API v3 (ruby)](https://blog.tjoyal.dev/etsy-open-api-v3/) by [Thierry Joyal](https://github.com/tjoyal) From e852ceceefab32e9b70f6a5156c446a42d128415 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 12 Apr 2023 16:26:46 +0800 Subject: [PATCH 131/131] add lwj5 to go tech comm (#15199) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 36c9592d5f9..04585139c8c 100644 --- a/README.md +++ b/README.md @@ -1036,6 +1036,7 @@ Here is a list of template creators: * Erlang Server: @galaxie * F# (Giraffe) Server: @nmfisher * Go Server: @guohuang + * Go Server (refactored in 7.0.0): @lwj5 * Go (Echo) Server: @ph4r5h4d * Go (Gin) Server: @kemokemo * GraphQL Express Server: @renepardon @@ -1140,7 +1141,7 @@ If you want to join the committee, please kindly apply by sending an email to te | Elm | @eriktim (2018/09) | | Erlang | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10) | | F# | @nmfisher (2019/05) | -| Go | @antihax (2017/11) @grokify (2018/07) @kemokemo (2018/09) @jirikuncar (2021/01) @ph4r5h4d (2021/04) | +| Go | @antihax (2017/11) @grokify (2018/07) @kemokemo (2018/09) @jirikuncar (2021/01) @ph4r5h4d (2021/04) @lwj5 (2023/04) | | GraphQL | @renepardon (2018/12) | | Groovy | | | Haskell | |

        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�S_8V(Kk4s8-fHd{_Ej^_j#gqj-CGM^U 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